Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
12615 commits 3 branches 0 tags 405 MiB
Commit graph

704 commits

Author SHA1 Message Date
denise
2d09ba3a16 CC-4863: I18N:System -> Listener status: string is not translated 2013-05-14 11:50:01 -04:00
Naomi
2ba743a436 CC-5132 : Playlist Editor: Add file before Smart Block will cause exception 2013-05-13 12:23:05 -04:00
Naomi
f64e99176e CC-510: Cue Editor: Please enable to preview the current cue in/out settings. 2013-05-07 12:46:44 -04:00
Naomi
75e4e0c9b6 CC-2301 : only showing waveform buttons if the browser supports the audio api. 2013-05-03 14:42:42 -04:00
Naomi
517bb7557a CC-2301 : testing default crossfade settings 2013-05-02 16:15:21 -04:00
Naomi
2b5a8b0d4b CC-2301 : fixing changed function name after merging with master. 2013-05-01 11:41:07 -04:00
Naomi
2a1ac0ddb9 CC-2301 : updating playlist offsets in playlist builder to reflect crossfade overlaps. 2013-04-30 16:27:31 -04:00
Naomi
0db557a570 CC-2301 : fades editor saving offset to database for playlists and smart blocks. 2013-04-30 15:32:43 -04:00
Naomi
410d298272 CC-2301 : creating an offset column to help create crossfades in the playlist. 
changing default fade to be a separate default fade in/out
 2013-04-29 16:55:08 -04:00
Naomi
8fea97d580 CC-2301 : fade editor now loads currently set fades. Fixing some bugs in the waveform editor. 2013-04-25 17:10:37 -04:00
Naomi
179621d687 CC-2301 : fades editor is loading now with a leftoffset for the second track and the cues for both tracks. 2013-04-24 14:15:07 -04:00
Naomi
04a0d9c54e CC-2301 : waveform editor 
current cues being set.
 2013-04-17 18:00:16 -04:00
Naomi
13c8e5f146 CC-2301 : showing waveform cue/fade editors inside of a jquery dialog box. 2013-04-16 14:37:08 -04:00
Martin Konecny
8bec9dea55 Merge branch '2.3.x' into 2.3.x-saas 2013-02-20 14:41:55 -05:00
denise
d1301ff676 CC-4954: Please make Library page remember the status per user 
-done
 2013-02-19 10:58:48 -05:00
denise
74291cc248 Merge branch 'cc-3627-close-playlist' into devel 2013-02-13 17:57:41 -05:00
denise
ec159131a8 Merge branch '2.3.x' into devel 2013-02-13 16:09:53 -05:00
denise
6bbb603bcd CC-3627: PlaylistBuilder->Playlist Panel -> it would be very handy to have "Close playlist" functionality 2013-02-13 16:05:11 -05:00
denise
50bfcb7eb8 XSS exploit prevention 
- Calendar -> show content
 2013-02-05 15:37:00 -05:00
denise
63439c276d Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-05 10:56:54 -05:00
denise
74bc485b4b XSS exploit prevention 
- Calendar - Show Contents
- Playlist tooltip in Library page
- Adding track to a show
- Widgets
- Playlist/Webstream title and description
- Smart block expansion
 2013-02-05 10:56:38 -05:00
Martin Konecny
60d6f5585b CC-4913: System -> Media Folder: Exception happens when media folder's path contains '<' 2013-02-04 16:27:09 -05:00
Martin Konecny
c398ce930b Merge branch '2.3.x' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
 2013-02-04 16:22:35 -05:00
denise
b45f71e8f9 CC-4897: XSS exploit on library page 2013-02-04 12:44:14 -05:00
Martin Konecny
93ec4c001b Merge branch '2.3.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/models/StoredFile.php
 2013-02-02 21:07:34 -05:00
denise
384298f680 CC-4109: Playlist Builder: Add a button to remove all the items in the current editing playlist 2013-02-01 12:06:01 -05:00
Martin Konecny
0a198ae424 Merge branch '2.3.x' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/models/User.php
 2013-01-30 18:31:45 -05:00
Martin Konecny
b15c4569eb CC-4894: Need to filter output for potential XSS exploits 
-fixed few areas
 2013-01-29 15:17:29 -05:00
Martin Konecny
210336d20a Merge branch 'devel' into 2.3.x-saas 2013-01-18 17:14:11 -05:00
denise
280c4a81ad CC-4859: I18N: "AND" and "OR" for Smartblock's criteria need to be translated. 
-fixed
 2013-01-18 17:04:39 -05:00
Martin Konecny
f8208a355c Merge branch 'devel' into 2.3.x-saas 2013-01-18 12:22:45 -05:00
denise
6acc5696f9 Save button on edit user settings was not translating 2013-01-17 14:34:18 -05:00
Martin Konecny
8b12f692cd CC-4854: Remove SaaS checking from codebase 
-fixed
 2013-01-16 14:31:43 -05:00
Martin Konecny
dbaf7d9b4b Merge branch 'devel' into 2.3.x-saas 2013-01-16 13:41:27 -05:00
Martin Konecny
bd3d12bd26 CC-4849: 2.3.x-saas: Empty page for Support feedback 
-fixed
 2013-01-16 12:34:20 -05:00
denise
712df8b12d Removed extra style element 2013-01-16 11:10:23 -05:00
Daniel James
5f12bc713d Bumped copyright date to 2013 2013-01-16 12:24:45 +00:00
Martin Konecny
c57e19983c -fix merge mistakes from devel 2013-01-15 14:06:02 -05:00
Martin Konecny
8cd6bd9aa4 Merge branch 'devel' into 2.3.x-saas 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/forms/AddShowWhen.php
	airtime_mvc/application/forms/GeneralPreferences.php
	airtime_mvc/application/forms/LiveStreamingPreferences.php
	airtime_mvc/application/forms/SoundcloudPreferences.php
	airtime_mvc/application/forms/SupportSettings.php
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
	airtime_mvc/application/views/scripts/form/preferences_general.phtml
	airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
	airtime_mvc/application/views/scripts/form/support-setting.phtml
	airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
	python_apps/api_clients/api_client.py
	python_apps/pypo/listenerstat.py
 2013-01-15 13:44:44 -05:00
Martin Konecny
0dfd8acf7a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 16:00:46 -05:00
Martin Konecny
fae3f3a03f CC-2184: Hardcoded CSS path should be relative path instead 
-Make '/' the default root
 2013-01-14 16:00:38 -05:00
denise
9603e7c2fd CC-4830: I18N: System -> Streams: "dB" for Replay Gain Modifier is not translated 
-fixed
 2013-01-14 14:30:59 -05:00
denise
a129b0b081 CC-4472: User password verify or clear text display. 
-done with password verify
 2013-01-10 17:51:25 -05:00
James
55fa8b8dc1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-10 14:52:45 -05:00
denise
2797809c74 CC-4786: Refresh page when language setting changes 
-done
 2013-01-10 13:55:52 -05:00
James
048ee05030 CC-4821: Add option to disable ReplayGain 
- done
 2013-01-10 13:49:41 -05:00
denise
1572955d07 CC-4810: Add language setting to login page 
-done
 2013-01-09 18:03:23 -05:00
denise
db62b538dd CC-4816: Timezones should be a user preference 
-done
 2013-01-09 13:38:38 -05:00
denise
03da2aee80 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 17:51:58 -05:00
denise
3b2b275c30 CC-4809: Listen popup UI breaks with localization 
-fixed
 2013-01-08 17:51:42 -05:00