Commit Graph

1171 Commits

Author SHA1 Message Date
denise 525b2dcb33 CC-4895: Remove all json die() statements from code
- removed json_encode
2013-02-07 15:41:47 -05:00
denise 0ed5d18e95 CC-4920: Now Playling js error
-fixed
2013-02-06 13:25:48 -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 8309593a0f CC-4904: Library -> Sort by status doesn't work
- added 2 columns to cc_files (is_scheduled, is_playlist)
- split library status column into two columns (scheduled, playlist)
- is_scheduled gets updated when a track plays out, or when a file gets added/removed from/to a show
- is_playlist gets updated when a file gets added/removed from/to a playlist/block, when a playlist/block gets deleted, or when a playlist/block's contents is cleared
2013-02-01 17:47:07 -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
denise 3bc2876f27 CC-4903: Library -> Show/hide columns -> Status Column needs label
-fixed
2013-01-31 11:41:00 -05:00
denise e1c69ebca2 CC-4902: Library -> Status column does not update when you add a file to a show
-fixed
2013-01-31 11:28:54 -05:00
denise cf2ed25bfb CC-4900: Indicate in the library if a webstream is scheduled in the future or belongs to a playlist
-done
2013-01-30 16:53:59 -05:00
denise 4f5d7869d8 Removed html from Library/contents-feed and StoredFile model
Added new Library column to indicate if a file is scheduled in the future or belongs to a playlist/smart block
2013-01-30 15:38:25 -05:00
denise 043fbd1dfb CC-4886: Warn if track is part of a playlist when deleting from library.
-done
2013-01-30 10:55:24 -05:00
denise 9d99b8ae90 CC-4887: Show whether track is scheduled in the future on Library page 2013-01-30 10:33:26 -05:00
drigato c45440482a CC-4887: Show whether track is scheduled in the future on Library page 2013-01-30 08:57:59 -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
denise 1873022a13 CC-4876: Default interface language setting does not appear to affect text or drop-down menu on login page?
-fixed
2013-01-25 11:21:34 -05:00
Martin Konecny 56c61d4ab7 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
-minor cleanup of function init
2013-01-24 14:09:14 -05:00
Martin Konecny 2f3a30b580 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
-we know what month will be the initial view for the user.
-Provide this data ahead of time via ajax request
2013-01-24 12:52:24 -05:00
Martin Konecny 091f5ff49f CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
-we know what month will be the initial view for the user.
-Provide this data ahead of time.
2013-01-24 12:13:55 -05:00
Martin Konecny 548b73db42 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
-remove an unnecessary roundtrip to server
2013-01-23 18:31:45 -05:00
denise 1e57309e66 CC-4692: Update jquery.jplayer.min.js to version 2.2 2013-01-23 12:19:07 -05:00
drigato c13188d0e1 Added Czech and Brazilian Portuguese language options 2013-01-21 14:56:27 -05:00
denise b818f1d46e CC-4866: Library -> Edit metadata -> table does not redraw after
-fixed
2013-01-18 16:40:31 -05:00
denise c4b1346f4e CC-4865: Password reset -> Cancel -> url is missing base directory
-fixed
2013-01-18 15:54:56 -05:00
denise 2d76d76e2d Removed console.log 2013-01-18 14:49:13 -05:00
denise f7e8fd33fd CC-4848: Streaming server passwords should be hidden with dots, once entered
-fixed
2013-01-16 14:36:56 -05:00
Martin Konecny 4e0d644d8b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 17:16:01 -05:00
Martin Konecny e22a573d8a CC-2184: Hardcoded CSS path should be relative path instead
-missed some paths
2013-01-14 17:15:53 -05:00
denise 692c1a1c9e CC-4838: I18N: HTML contents of Print preview for Playout History need to be translated
-fixed
2013-01-14 17:01:50 -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
James ed2e25fb29 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 14:49:22 -05:00
James 0eb5fb51b6 CC-4836: Playlist length is wrong because wrong cue out setting.
- fixed
2013-01-14 14:49:06 -05:00
Martin Konecny ba66746a00 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 14:07:55 -05:00
Martin Konecny 3a70a371be CC-4751: Calendar: Add/Remove contents won't trig status update of shows
-fix problem when baseurl changed
2013-01-14 14:07:32 -05:00
denise 1e6b0fe6ae CC-4833: I18N: Alert message "Please select a cursor posion from timeline." in Now playing page is not translated
-fixed
2013-01-14 13:47:41 -05:00
Martin Konecny 97eeafb142 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-11 15:38:06 -05:00
Martin Konecny 2bbdb01495 CC-4751: Calendar: Add/Remove contents won't trig status update of shows
-fixed
2013-01-11 15:37:58 -05:00
denise 224bcf0c2b CC-4793: System -> User: Sometimes the user type's tips turns out "undefined"
-fixed
2013-01-11 15:12:41 -05:00
denise 8362860904 Block expansion ajax url was missing baseUrl 2013-01-11 14:11:01 -05:00
denise f80f0dddd7 Listenerstat ajax call was missing baseUrl 2013-01-11 13:18:57 -05:00
Martin Konecny c11edea253 CC-4802: Preferences -> Soundcloud settings: Sub-options can be checked before major one
-fixed
2013-01-11 13:13:36 -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
denise 86f57cb953 CC-4820: I18N: Date and Time picker of Record/rebroadcast show is not translated
-fixed
2013-01-10 16:30:04 -05:00
denise 4673f11d76 Default language to english when cookie is not set 2013-01-10 15:06:45 -05:00
denise 6fe8006612 Jquery cookie plugin 2013-01-10 14:57:47 -05:00
denise 9f857433fa CC-4817: I18N: "Playlist Shuffled" is not listed for translation
-fixed
2013-01-10 14:22:25 -05:00
denise dffe932223 Added missing base directory to urls 2013-01-10 13:58:11 -05:00
denise 2797809c74 CC-4786: Refresh page when language setting changes
-done
2013-01-10 13:55:52 -05:00
denise 1100baefbc CC-4823: Locale cookie doesn't get set after user logs in
-fixed
2013-01-10 10:37:30 -05:00
denise 20f7544552 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-09 18:03:39 -05:00
denise 1572955d07 CC-4810: Add language setting to login page
-done
2013-01-09 18:03:23 -05:00