Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,673 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

3976 Commits

Author SHA1 Message Date
denise 9a893aea49 Fixed some typos 2013-02-07 17:13:04 -05:00
denise 93017b8477 Added Greek datatables and plupload language files 
Added Greek to locale db table
 2013-02-07 16:43:24 -05:00
denise a37e032494 Adding Greek po file 2013-02-07 16:23:20 -05:00
denise 8124d096d0 Removed log message 2013-02-07 15:56:35 -05:00
Martin Konecny c39b99da6c CC-4839: Nginx doesn't allow liquidsoap to check uploaded file, which blocks uploading any file 
-fixed
 2013-02-07 15:42:06 -05:00
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
denise 5f3f2cd97c CC-4881: Cue in time can be greater than Cue out time in some situations 
-fixed
 2013-01-28 16:46:11 -05:00
denise f1215c10fd CC-4882: Scheduled item does not take into account cue_out - cue_in time 
-fixed
 2013-01-28 14:21:11 -05:00
Martin Konecny 2ef8604c31 remove unnecessary code 2013-01-25 16:23:12 -05:00
denise d0a4141ae4 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-25 12:44:37 -05:00
denise a6f4805e1a CC-4879: Pop-up HTML Audio Player still seems to be changing spaces to %20 and so on... 
-fixed
 2013-01-25 12:44:20 -05:00
Martin Konecny a16e8d05aa -don't push new schedule until end of request 2013-01-25 12:33:27 -05:00
denise 0cf8526f87 CC-4878"Send support feedback" button at initial login tries to load "http://showbuilder" and was missing the local host IP. 
-fixed
 2013-01-25 11:51:56 -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 c3f2bf57de CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
-further optimization by looking at the preferred time scale
 2013-01-24 14:02:50 -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 ef806b8357 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-24 12:14:12 -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
denise f4f6f9043a Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-24 12:00:47 -05:00
denise 1e336fa2d7 CC-4875: use a reference when iterating over show events 2013-01-24 12:00:31 -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 78f617cacb CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
- put makeFullCalendarEvent inline with loop
- removed unnecessary epoch time conversion
 2013-01-23 17:33:34 -05:00
denise 7ab7236d5d Merge branch '2.3.x' into devel 2013-01-23 16:31:42 -05:00
denise adaab6ba96 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
-added a 5 second grace period for checking if shows are partially filled
 2013-01-23 16:31:20 -05:00
denise 9714b44d7f CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 2013-01-23 16:27:26 -05:00
denise 2069da64c1 Merge branch '2.3.x' into devel 2013-01-23 16:19:00 -05:00
denise 9fd3b43bb2 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db 
Made improvement by accessing db just once to determine if each show instance is full or not
 2013-01-23 16:12:16 -05:00
denise 1e57309e66 CC-4692: Update jquery.jplayer.min.js to version 2.2 2013-01-23 12:19:07 -05:00
denise 77b0c21192 Small refactor 2013-01-22 10:39:20 -05:00
drigato ac6c279bef Removed extra '/' is audio preview url 2013-01-21 20:20:29 -05:00
drigato c13188d0e1 Added Czech and Brazilian Portuguese language options 2013-01-21 14:56:27 -05:00
Daniel James f0a1c9983d First commit of Brazilian Portuguese localization, thanks to Luciano De Fazio! 2013-01-21 11:16:40 +00:00
James dfa392d914 CC-4868: Replay gain modifier is not setting the correct value 
- fixed
 2013-01-18 17:29:38 -05:00
denise b9c7ea1184 CC-4869: Default fades greater than 99 seconds won't allow you to drag item into block/playlist 
-fixed
 2013-01-18 17:22:54 -05:00
denise e0efaea0c9 CC-4867: Library -> Audio preview doesnt work with airtime in subdirectory 
-fixed
 2013-01-18 17:10:52 -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
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 ad0879996d CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect. 
-use existing function to convert seconds to time format
 2013-01-18 14:35:17 -05:00
denise 22ecc3f1fc CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect. 
-fixed
 2013-01-18 14:28:45 -05:00
James ed7b22118c Merge branch 'silan-script' into devel 2013-01-18 11:54:10 -05:00
James f70ca93b53 CC-4841: Silan script 
done
 2013-01-18 11:53:26 -05:00
denise 0d3962f34e Updating German po file 2013-01-18 10:55:37 -05:00
denise a3477106cf CC-4734: French - UI breaks in several places 
-fixed
 2013-01-18 10:39:06 -05:00
james e2b83a0c8c CC-4857: Playlist length will increase every time I duplicate it. 
- fixed
 2013-01-17 22:20:28 -05:00
denise 94a87a0b2e Smart block tooltip content breaks when language setting is not english 2013-01-17 16:19:35 -05:00
denise 76cd86ada8 Small change to Russian po file 2013-01-17 14:52:01 -05:00
denise 6acc5696f9 Save button on edit user settings was not translating 2013-01-17 14:34:18 -05:00
denise 57629b4eac Changed path to locale directory from absolute to relative 2013-01-17 14:31:40 -05:00
denise 796099b413 CC-4860: Library -> Context Menu -> Can't download files 
-fixed
 2013-01-17 13:37:32 -05:00
james 5283757cc6 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-16 16:38:44 -05:00
james 3f2ab9bb4e CC-4847: Listener Stats page shows misleading error when the Icecast admin password has not been entered 
- done
 2013-01-16 16:38:24 -05:00
cliff.wang d7e40710f4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-16 16:33:30 -05:00
cliff.wang e05d99e16f Update Chinese translation 2013-01-16 16:33:16 -05:00
denise e4c2f43d9e CC-4855: System->Preferences->Fade in/out settings: Number's format is incorrect. 
-fixed
 2013-01-16 15:40:50 -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
denise 9cb4633823 CC-4850: Upgrade Scripts -> Add default timezone and locale for each user in cc_pref 
-fallback to default settings if user setting is not set
 2013-01-16 12:42:58 -05:00
denise b7fb7a4166 Removed English-US language option 2013-01-16 11:49:04 -05:00
Daniel James 5f12bc713d Bumped copyright date to 2013 2013-01-16 12:24:45 +00:00
denise 2791c5fcc5 Updating fr_FR .po files 2013-01-15 17:05:57 -05:00
Martin Konecny 84373391de Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-15 15:37:39 -05:00
Martin Konecny 973a415164 -fix installation error 2013-01-15 15:37:26 -05:00
denise aef19aadbe Updating es_ES .po files 2013-01-15 15:31:38 -05:00
cliff.wang 52bd3d17d7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-15 14:40:52 -05:00
cliff.wang e51a53671b Update Chiness translation file 2013-01-15 14:40:36 -05:00
James 08b52fceca Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-15 13:54:56 -05:00
James 8226105b2f - translation(Korean) 2013-01-15 13:54:40 -05:00
denise bbedce2951 Changed default base directory in airtime.conf and api_client.cfg 2013-01-15 13:47:35 -05:00
James bb2f9316af CC-4841: Silan script 
- temp commit
 2013-01-15 11:16:50 -05:00
cliff.wang 3f1bbade52 Update Chinese translation files 2013-01-15 11:00:24 -05:00
denise dc5cac9834 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-15 10:41:45 -05:00
denise 146326c406 Updating .po files with new messages 2013-01-15 10:41:03 -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
James 175dbcbabc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 17:09:03 -05:00
James ea70357920 - remove logging 2013-01-14 17:08:47 -05:00
denise a85b394d63 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 17:02:05 -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
James 8c19384d32 - CRLF fix 2013-01-14 16:21:02 -05:00
James 9ae3559305 Merge branch 'cc-4384-remove-table-calling-with-cc-config' into devel 
Conflicts:
	airtime_mvc/application/Bootstrap.php
 2013-01-14 16:19:51 -05:00
James 5a97fb69f2 CC-4384: Remove annoying usage of $CC_CONFIG 
- done
 2013-01-14 16:16:14 -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
James a55bc9973c - temp commit 2013-01-14 14:43:02 -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 7b4693e5f9 CC-4831: I18N: Error message of background settings when creating a show is not translated 
-fixed
 2013-01-14 14:13:32 -05:00
Martin Konecny ba66746a00 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 14:07:55 -05:00
denise 8ea3aca3a0 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
James cf09175ff1 CC-4796: Listener Stat: Authentication exception happens but no warning message on UI. 
- done
 2013-01-14 13:57:32 -05:00
James 891e993cd1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 13:56:24 -05:00
James d4124f916d CC-4796: Listener Stat: Authentication exception happens but no warning message on UI. 
- done
 2013-01-14 13:56:00 -05:00
denise 2c3e79e842 CC-4832: I18N: Tool tip for show is partially filled in Calendar page is not translated 
-fixed
 2013-01-14 13:53:27 -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
denise 83be01d0d0 CC-4835: I18N: "Copy of ..." from Duplicating playlist would better be translated 
-fixed
 2013-01-14 13:42:17 -05:00
denise f067b952db CC-4829: Password Verify does not work on Lucid 
-code cleanup
 2013-01-14 12:17:33 -05:00
denise 83a450565e CC-4829: Password Verify does not work on Lucid 
-fixed
 2013-01-14 12:07:17 -05:00