Commit graph

3971 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
969e34aba1 CC-4930: Calendar -> Recorded shows have 'show partially filled' icon
-fixed
2013-02-07 12:22:32 -05:00
Daniel James
2935670455 Refined Brazilian Portuguese localization, thanks to Luciano De Fazio! 2013-02-07 10:21:45 +00:00
denise
7cf45afd16 Changed 'Polish' to 'Polski' 2013-02-06 17:03:01 -05:00
denise
532ea09eed Added Polish datatables and plupload translation files
Added Polish to upgrade script and default data
2013-02-06 16:46:12 -05:00
Martin Konecny
d028e00cdb Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-06 16:30:11 -05:00
Martin Konecny
7bc4151741 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-02-06 16:29:41 -05:00
Martin Konecny
3c0d7955b5 Merge branch 'devel' of https://github.com/sematuszewski/Airtime into devel 2013-02-06 16:29:34 -05:00
Martin Konecny
38c75791f2 Merge branch 'devel' of https://github.com/sematuszewski/Airtime into 2.3.x 2013-02-06 16:29:20 -05:00
denise
ad334d9e74 CC-4926: System-> Preference: Please limit the default fade value less than 60
- added a range validator of 0 - 59.9 on default fade
2013-02-06 15:44:52 -05:00
denise
ba4cb16171 CC-4925: Changing User permissions to a higher level ends up with show editing problems
-typo
2013-02-06 14:35:39 -05:00
denise
55970a4b20 CC-4925: Changing User permissions to a higher level ends up with show editing problems
- added check to ensure user is not an admin before assigning the 'dj-edit-show' action
2013-02-06 14:32:13 -05:00
denise
634a6991ce CC-4865: Password reset -> Cancel -> url is missing base directory
-removed extra '/'
2013-02-06 13:44:10 -05:00
denise
0ed5d18e95 CC-4920: Now Playling js error
-fixed
2013-02-06 13:25:48 -05:00
denise
517a58bc43 CC-4919: Library -> Search: Exception happens when switching back to simple search with some illegal input in Advanced Search
-fixed
2013-02-06 12:36:04 -05:00
denise
8e82db1bc7 CC-4921: Now Playing: Cannot insert items into current playing show
-filler time in cc_schedule was not setting cue_in and cue_out
-since we made those colunns not null and removed a default value, we always have to set a value
2013-02-05 17:57:21 -05:00
denise
909f2c95c4 XSS exploit prevention - audio preview 2013-02-05 17:24:39 -05:00
denise
8db71eac52 CC-4914: Update is_scheduled after tracks play out
-done
2013-02-05 16:52:25 -05:00
denise
50bfcb7eb8 XSS exploit prevention
- Calendar -> show content
2013-02-05 15:37:00 -05:00
Sebastian Matuszewski
cff865ef55 Polish locale update (full - 100%)
Polish locale full version.
2013-02-05 20:02:55 +01:00
denise
23c29455d9 Modified schema.xml - made cue_in and cue_out required columns in cc_scheuled and removed default values 2013-02-05 13:18:25 -05:00
denise
b5eededd05 New French po file 2013-02-05 11:14:53 -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
e2472f1f5d CC-4913: System -> Media Folder: Exception happens when media folder's path contains '<' 2013-02-04 16:21:56 -05:00
denise
b45f71e8f9 CC-4897: XSS exploit on library page 2013-02-04 12:44:14 -05:00
denise
20a3f674b4 CC-4897: XSS exploit on library page
-fixed where this was happening on Calendar - show content
2013-02-04 12:12:57 -05:00
denise
d63865625d Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-04 11:06:53 -05:00
denise
1f0b9fa5dc CC-4897: XSS exploit on library page 2013-02-04 11:06:46 -05:00
Marcin Tym-Czarnocki
2ac66e81b0 Polish locale update (full - 100%)
Contribution of radioaktywne.pl (Lucy Pałys & Marcin Tym-Czarnocki)
2013-02-03 20:44:20 +01: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
Sebastian Matuszewski
0eb6b596ad Polish locale update (not full - 75%) 2013-02-01 00:02:01 +01:00
denise
d4e89df94e CC-4895: Remove all json die() statements from code 2013-01-31 14:06:45 -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
Martin Konecny
216b580395 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-30 14:40:47 -05:00
Martin Konecny
52d96241da CC-4754: Replay gain modifier
-fix regression
2013-01-30 14:40:29 -05:00
Martin Konecny
cc5acf3c9e improved logging for boolean vars 2013-01-30 14:34:06 -05:00
denise
595429e6e5 CC-4897: XSS exploit on library page
-fixed
2013-01-30 11:51:27 -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
694c54f272 Merge branch 'cc-4887-show-whether-track-is-scheduled-in-the-future-on-Library-page' into devel 2013-01-30 10:35:29 -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
denise
d4742577c9 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-30 10:20:27 -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