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

4513 Commits

Author SHA1 Message Date
denise 4bdd89f747 CC-4961: Show linking 
Fixed edit show start/end time bug
 2013-03-18 12:34:27 -04:00
denise 896e03d76b CC-4961: Show linking 
Refactoring all services thus far
 2013-03-15 16:56:22 -04:00
denise 5735baf237 CC-4961: Show linking 
Made progress on ShowInstanceService
 2013-03-13 11:08:16 -04:00
denise f9f4e4f1fb CC-4961: Show linking 
Made some progress on show editing
 2013-03-12 18:01:12 -04:00
denise 438200425a CC-4961: Show linking 2013-03-12 11:33:32 -04:00
denise c721b81a13 CC-4961: Show linking 
Refactoring
 2013-03-12 10:30:31 -04:00
denise 7347be35b1 Created a new service for show days 
Created a new user service
Started refactoring edit show action
 2013-03-11 16:18:40 -04:00
denise 1cc823ef0e Inital edit show reconfiguration changes 2013-03-08 17:10:35 -05:00
denise 116d98a81b Removed comment 2013-03-08 16:10:07 -05:00
denise d8ced29dd0 Refactored adding show forms to the view 2013-03-08 16:08:43 -05:00
denise 8415dfdf6f Add comments 2013-03-08 12:18:24 -05:00
denise 5111f74494 Created function to set the next populate until date for repeating shows 2013-03-08 12:17:55 -05:00
denise 9be6b82d97 Fixed rebroadcast date bug 2013-03-08 12:06:45 -05:00
denise 846e940f82 Merge branch 'cc-4961-show-linking' of dev.sourcefabric.org:airtime into cc-4961-show-linking 
Conflicts:
	airtime_mvc/application/services/ScheduleService.php
	airtime_mvc/application/services/ShowInstanceService.php
	airtime_mvc/application/services/ShowService.php
 2013-03-08 11:24:54 -05:00
denise 4a86da5f87 Created function to create repeating show instances 
Created function to create rebroadcast show instances
 2013-03-08 11:19:03 -05:00
Martin Konecny 5ceeb88899 Merge branch '2.3.x' into devel 2013-03-06 13:46:01 -05:00
Martin Konecny 7ca178295f CC-4993: airtime-check-system reports airtime-liquidsoap as down 
-fixed
 2013-03-06 13:43:22 -05:00
denise af622eb4b8 CC-4961: Show linking 
Refactored some more show instance creation functions
 2013-03-06 09:58:35 -05:00
denise c29e11fa0f Created empty showInstance service. 
Split populateShowUntil into 2 new functions: getPopulateDateUntil, and getShowDays
 2013-03-06 09:58:35 -05:00
denise d497cfa857 Created show service 2013-03-06 09:58:35 -05:00
denise 99c07272fd - Moved all form validation to it's own function in schedule service 
- Moved show creation to it's own function in schedule service
 2013-03-06 09:58:35 -05:00
drigato bdab294fce Added comments to Schedule Service 2013-03-06 09:58:35 -05:00
denise d08f6cf3e1 CC-4961: Show linking 
-initial schedule service experimentation
 2013-03-06 09:58:35 -05:00
Martin Konecny 0ef1a5ffda CC-4976: Cannot select Ogg/Vorbis output stream after selecting SHOUTcast then selecting Icecast 
-fixed
 2013-03-05 18:19:08 -05:00
Martin Konecny cc69418215 Merge branch '2.3.x' into devel 2013-03-05 16:21:22 -05:00
Martin Konecny d7d1170ee1 CC-5003: 
Some tracks are being cut off before fully playout out

-fixed
 2013-03-04 18:52:51 -05:00
Martin Konecny 00d577fd5b CC-4985: Ensure files deleted via the UI are deleted from stor directory. 
-temporary fix. We know rabbitmq received the message, but we don't know
if media-monitor actually acted on it.
 2013-03-04 15:22:09 -05:00
Martin Konecny ae503121d8 CC-4984: Exception for replaygain 
-fixed
 2013-02-28 18:26:15 -05:00
Martin Konecny 943538ed9d Revert "CC-4980: Create graphic with 4 switches for Airtime Dashboard" 
This reverts commit baf693d1a9.
 2013-02-27 14:35:35 -05:00
Vladimir baf693d1a9 CC-4980: Create graphic with 4 switches for Airtime Dashboard 2013-02-27 17:36:43 +01:00
denise c7203aa40d CC-4961: Show linking 
Refactored some more show instance creation functions
 2013-02-26 17:41:35 -05:00
denise 8c8a7d11e1 Created empty showInstance service. 
Split populateShowUntil into 2 new functions: getPopulateDateUntil, and getShowDays
 2013-02-26 13:21:39 -05:00
denise 2717c0845b Created show service 2013-02-26 10:20:02 -05:00
Martin Konecny e08732fba7 CC-4975: airtime-silan cmd error 
-fixed
 2013-02-25 19:45:26 -05:00
denise 9f0baba4f8 - Moved all form validation to it's own function in schedule service 
- Moved show creation to it's own function in schedule service
 2013-02-25 17:31:43 -05:00
drigato 3e49421221 Added comments to Schedule Service 2013-02-25 09:15:03 -05:00
denise 22f52ca195 CC-4961: Show linking 
-initial schedule service experimentation
 2013-02-21 17:57:56 -05:00
denise 176e78632f Added a comment about referring to the wiki when adding a new datatable column 2013-02-19 16:43:47 -05:00
denise c8d7d23d62 CC-4963: Add cue in and cue out to smart block criteria list 
Done
 2013-02-19 16:38:58 -05:00
denise 959839e180 Renamed criteriaTypes to libraryColumnTypes for library advanced search 2013-02-19 15:09:24 -05:00
denise 32fc5eb758 CC-4951: Add cue in and cue out to library filter columns 
Configured advanced search for these columns
 2013-02-19 14:44:32 -05:00
denise 8bdf3508b0 CC-4951: Add cue in and cue out to library filter columns 
Done
 2013-02-19 13:38:35 -05:00
denise 49dc3140a8 CC-4962: Library -> Library and playlist editor have different heights sometimes 
Fixed: needed to set height when we open the playlist editor
 2013-02-19 11:59:17 -05:00
denise 9113853e41 Removed logging messages from Library controller, index action 2013-02-19 11:51:26 -05:00
denise c0c6ac5d75 CC-4954: Please make Library page remember the status per user 
- it was only working if there was a playlist object set
- fixed so it works even if there isnt
 2013-02-19 11:37:22 -05:00
denise 14f1d5572f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-02-19 10:59:03 -05:00
denise d1301ff676 CC-4954: Please make Library page remember the status per user 
-done
 2013-02-19 10:58:48 -05:00
Naomi 542553bbc1 Merge branch '2.3.x' into devel 2013-02-15 17:05:36 -05:00
Naomi 9a2b8af7b1 Revert "CC-4955: Datatables saves its parameters twice on every page load" 
This reverts commit 39ec07e71c.
 2013-02-15 16:50:43 -05:00
Naomi f2773fcb01 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-15 16:32:43 -05:00
Naomi fe611e7c6a CC-4957 : Replay Gain undefined error, json response not being sent back properly. 2013-02-15 16:32:05 -05:00
Martin Konecny 09baf3a47d remove unecessary file + better error handling 2013-02-15 14:19:04 -05:00
Martin Konecny 39ec07e71c CC-4955: Datatables saves its parameters twice on every page load 
-fixed
 2013-02-15 14:18:32 -05:00
Martin Konecny 4f3ea3f406 Update ColReorder Datatables plugin 2013-02-14 17:48:32 -05:00
Martin Konecny b30f67b24b CC-4950: builder-feed is called twice on NowPlaying screen load 2013-02-14 15:49:38 -05:00
denise e2e45b0160 CC-4948: Library -> library loses have its width when window is resized 
-fixed
 2013-02-14 15:34:11 -05:00
denise 1a36953d82 CC-4898: Pressing "Enter" from anywhere on the edit metadata popup should automatically Save and close the popup 
-fixed
 2013-02-14 14:52:48 -05:00
Martin Konecny 58740d6b41 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-14 13:33:27 -05:00
Martin Konecny b3ab84db2e add minified datatables.js and upgrade from 1.9.1 to 1.9.4 2013-02-14 13:33:18 -05:00
denise 9e0d14a8a7 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-14 13:31:39 -05:00
denise 1b5b7ae1f7 Stopped refetching calendar events when calendar is resized 2013-02-14 13:31:22 -05:00
Martin Konecny 9086c55281 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-14 12:58:40 -05:00
Martin Konecny bb7e56e39e CC-4943: Raspberry Pi optimization: don't create new background AJAX request until the previous one has returned 
-fixed
 2013-02-14 12:58:31 -05:00
Daniel James 06dbcfbcf8 Shorten Greek translation of 'Scheduled Play' (CC-4947) 2013-02-14 17:18:45 +00:00
denise cd5f1149af CC-4924: Calendar: "View Recorded File Metadata" for record show still uses old Metadata Editor 
-fixed
 2013-02-14 11:43:29 -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 04ed640756 CC-3885: Deleted open playlist is not closed until a new item is added to it 
-fixed
 2013-02-13 15:44:52 -05:00
denise 76cb04e296 CC-4538: Cannot edit title or change time of repeating show if first instance has ended 
- fixed by populating the edit show form with the next repeating show that is not in the past
 2013-02-13 11:55:27 -05:00
denise eb38503d6e CC-4946: Now Playing -> Apache error when empty show starts 
-we were trying to update the is_scheduled flag on a non-schedule item
 2013-02-13 11:51:25 -05:00
denise 4ff1e8e78a CC-4932: Library -> Update Scheduled column on 'Cancel current show' action 
-fixed
 2013-02-13 11:29:43 -05:00
denise 50613dd9a8 CC-4907: Library -> Adding items to show doesn't add the correct item sometimes 
-fixed
 2013-02-12 17:21:21 -05:00
denise 30c47df93d Audio preview wasn't working in Firefox when airtime is not in document root 2013-02-11 15:56:21 -05:00
denise 2c1fa283da CC-4941: Dynamic Smart Block ignores the silan check 
-fixed for playlists that contain dynamic blocks
 2013-02-11 14:17:18 -05:00
denise 51ade73e85 CC-4941: Dynamic Smart Block ignores the silan check 
-fixed
 2013-02-11 13:45:51 -05:00
denise 3c73535f70 Convert clip length seconds to interval format before inserting into cc_playlistcontents / cc_blockcontents 2013-02-11 12:37:20 -05:00
denise 6071dea839 CC-4940: Playlist editor in Library ignores cue points set by silence detection when displaying item time 
-small fix on where to set clip length
 2013-02-11 12:32:20 -05:00
denise 69054806c4 CC-4940: Playlist editor in Library ignores cue points set by silence detection when displaying item time 
- fixed by setting length to cue_out - cue_in when tracks get added to playlist/block
 2013-02-11 12:24:06 -05:00
denise e8bde50909 CC-4939: All webstreams in a playlist will have 0 length in Schedule 
- set cuein and cueout of playlist item if it is a webstream
 2013-02-11 11:17:00 -05:00
Daniel James 5f9f342e07 Added strings to Greek localization 2013-02-08 11:14:19 +00:00
Daniel James 192db754ea Fixed typos in US localization 2013-02-08 11:11:20 +00:00
Daniel James 654cc6233f Improved British localization 2013-02-08 11:05:48 +00:00
Daniel James 8232244faa Improved Greek localization with extra strings, thanks Kat! 2013-02-08 10:31:20 +00:00
Daniel James 2c9d208db8 Added bug report address to Greek translation 2013-02-08 10:17:15 +00:00
Daniel James 8bdf50c0e8 Fixed translation of 'Settings' 2013-02-08 10:14:22 +00:00
denise 2315e3473d CC-4935: Smart Block -> Error when saving sometimes 
-fixed
 2013-02-07 17:33:11 -05:00
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
denise 67706bede9 CC-4834: Problem about "Share" button in the "Listen" Panel 
-fixed
 2013-01-14 11:56:46 -05:00
James 1666a04451 CC-4826: Please re-push the liquidsoap queue if updating Replay Gain settings 
- done
 2013-01-14 11:28:48 -05:00
cliff.wang d10ab95fdd Update Chinese translation files 2013-01-14 10:39:10 -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 1c0d8abd4c CC-4807: Names of languages need to be localized 
-done
 2013-01-11 14:44:14 -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 89274e43b3 fix spelling mistake 2013-01-11 13:17:08 -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
James dcf3526000 CC-4384: Remove annoying usage of $CC_CONFIG 
- done
 2013-01-10 18:09:00 -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 954b65fa41 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-10 14:58:02 -05:00
denise 6fe8006612 Jquery cookie plugin 2013-01-10 14:57:47 -05:00
James 55fa8b8dc1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-10 14:52:45 -05:00
denise b2d709052e Modified show is partially filled icon 2013-01-10 14:26:39 -05:00
Martin Konecny e0b71568b7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-10 14:24:51 -05:00
Martin Konecny 0e217dfb38 CC-4798: Need a 'show is partially filled' icon 2013-01-10 14:24:43 -05:00
denise 9f857433fa CC-4817: I18N: "Playlist Shuffled" is not listed for translation 
-fixed
 2013-01-10 14:22:25 -05:00
denise a0be1c647e CC-4786: Refresh page when language setting changes 
-configure localization and reinitiliaze edit user form after the user locale is set
 2013-01-10 14:01:03 -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
James 048ee05030 CC-4821: Add option to disable ReplayGain 
- done
 2013-01-10 13:49:41 -05:00
denise c20ed7ebad Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-10 12:04:44 -05:00
denise 690a6d2654 Removed user id from cc_pref keystr value 2013-01-10 12:04:27 -05:00
James 4bf9ab60d9 CC-4819: Tracks length in Scheduler is 0.0 all the time 
- fixed in better way
 2013-01-10 11:49:02 -05:00
denise 0aeea61006 CC-4822: Cannot preview playlist 
-fixed
 2013-01-10 10:52:39 -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
james 594a38da16 CC-4770: Playlist's length doesn't counts Webstream and Smartblock in 
- the bug was introduced by CC-4668
- fixed
 2013-01-09 22:53:29 -05:00
james 3a72302a3c CC-4819: Tracks length in Scheduler is 0.0 all the time 
- fixed
 2013-01-09 22:19:39 -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
Martin Konecny a5e7c0197f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-09 15:52:45 -05:00
Martin Konecny 58fc8ecee7 CC-4766: Invalid date appears during setting show's time and date 2013-01-09 15:52:35 -05:00
cliff.wang 2dc7d35f57 Update Chinese translation files 2013-01-09 15:32:18 -05:00
denise 7866b8a0cb Small fix to select box sizes 2013-01-09 15:11:22 -05:00
denise db62b538dd CC-4816: Timezones should be a user preference 
-done
 2013-01-09 13:38:38 -05:00
denise f887ca3d8d CC-4813: Users -> Do not save username on User Management page 
-fixed
 2013-01-09 13:25:18 -05:00
denise 26ab0fb468 CC-4809: Listen popup UI breaks with localization 
-added comment
 2013-01-08 17:56:05 -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
James 6e7f45e615 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 17:32:39 -05:00
James 1263c04621 CC-4796: Listener Stat: Authentication exception happens but no warning message on UI 
- done
 2013-01-08 17:32:27 -05:00
denise 22e4811b22 Add gettext wrapper function to string missing it 2013-01-08 16:51:11 -05:00
denise 9755ea6a20 CC-4814: System->Streams: Tool tips' content of output stream's admin user field is not listed in airtime.po file 
-fixed
 2013-01-08 16:47:00 -05:00
denise 87bfc81ca0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 15:53:33 -05:00
denise 6097196dd7 CC-4813: Users -> Do not save username on User Management page 
-fixed
 2013-01-08 15:52:56 -05:00
James 6d48e1faf0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 15:52:33 -05:00
James adda497bbb CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start 
- fixed
 2013-01-08 15:52:11 -05:00
Martin Konecny 1ee90ed9b9 CC-4790: Media Monitor: Re-added files won't show up in Library 
-fixed
 2013-01-08 15:42:35 -05:00
Martin Konecny 0612a595c9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 15:14:42 -05:00
Martin Konecny 178abcfada CC-4785: Zend errors on page not found 
-partially fixed
 2013-01-08 15:14:33 -05:00
denise a7992c291e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 15:09:55 -05:00
denise 3de33bc3e3 CC-4811: Move the edit user form to its own page 
-done
 2013-01-08 15:09:35 -05:00
Martin Konecny c632ad00f9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 12:37:53 -05:00
Martin Konecny add51bd735 -update plupload from 1.5beta to 1.5.4 2013-01-08 12:37:37 -05:00
James 45e3fccae2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 12:31:22 -05:00
James b580a7be73 CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start 
- fixed
 2013-01-08 12:31:14 -05:00
cliff.wang 8ce646fcc7 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-08 11:58:40 -05:00
cliff.wang 2078a4ffa3 Updated Simple Chinese language files 2013-01-08 11:57:47 -05:00
denise bf2e5c6f32 Fixed Typo in user rights 2013-01-08 11:57:05 -05:00
denise f308305df8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-07 18:18:59 -05:00
denise a65e72941f CC-4805: Localization -> Changing default language changes datatables and add media language setting 
-fixed
 2013-01-07 18:18:40 -05:00
James de980d21ea Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-07 18:15:12 -05:00
James 6e241fd3ec CC-4512: Allow changing stream "Offline" message via Web UI 
- fixed
 2013-01-07 18:14:57 -05:00
denise e9a86b7bcf CC-4799: Calendar -> Show empty and show partially filled icons need qtips 
-fixed
 2013-01-07 17:26:40 -05:00
denise 1f1b408c6e CC-4803: Calendar -> Soundcloud id is always null 
-fixed
 2013-01-07 17:21:35 -05:00
denise cffad91840 CC-4800: Soundcloud icon qtips do not work and have wrong colour scheme 
-fixed
 2013-01-07 15:23:51 -05:00
denise 67df511ab8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-07 14:12:39 -05:00
denise 251e1a52d6 Removed a function no longer in use 2013-01-07 14:12:31 -05:00
James 51425d451f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-07 13:49:09 -05:00
James ecbff94f11 CC-4795: Library -> Playlist: Cannot add Smart Block into Playlist 
- fixed
 2013-01-07 13:48:51 -05:00
denise 19e1c9bd9e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-07 12:41:45 -05:00
denise 82da4dcfe8 CC-4599: Calendar: Add an icon to indicate show is not fully booked 
-done but a new icon is needed
 2013-01-07 12:41:28 -05:00
James 0542e713ed CC-4794: Library: Please disable "Duplicate playlist" option for Smart Block's context menu 
- fixed
 2013-01-07 12:20:07 -05:00
Daniel James 771b9b9412 Fixed whitespace in Preferences page between 'Timezone' and colon 2013-01-07 11:41:29 +00:00
Daniel James a2c1b9c699 Clarify label on default interface language preference 2013-01-07 11:05:38 +00:00
Daniel James 053418d7ac Added missing colon to the end of 'Language' 2013-01-07 10:42:16 +00:00
denise 8142427668 Small formatting fix 2013-01-04 18:18:58 -05:00
denise 5d361db730 Small localization(Spanish) change 2013-01-04 18:17:03 -05:00
denise 3c969b0aef Removed useless code 2013-01-04 18:16:47 -05:00
denise 02a1199386 CC-4734: French - UI breaks in several places 2013-01-04 17:27:58 -05:00
denise fc4ccb4798 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.mo
 2013-01-04 17:21:46 -05:00
denise 495fd7da1a CC-4734: French - UI breaks in several places 
-fixed
 2013-01-04 17:19:09 -05:00
James a145dcda06 - localization(Korean) fix 2013-01-04 14:47:17 -05:00
Daniel James f3f753cf60 Janitorial fixes to .po and .mo files 2013-01-04 17:55:01 +00:00
Daniel James c5f1d4a568 Removed bogus extra comma 2013-01-04 17:30:51 +00:00
denise 02ac909430 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-04 11:39:04 -05:00
Martin Konecny cf860bfe3c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-04 11:40:40 -05:00
Martin Konecny 10efbee530 CC-4784: Load CSS before javascript 
-fixed
 2013-01-04 11:40:32 -05:00
denise 32fd92c892 CC-4787: Edit User: Don't save username field 
-fixed
 2013-01-04 11:38:49 -05:00
denise 7e1efe5d96 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-04 11:00:36 -05:00
denise 596e103d96 CC-4763: Alignment error for User settings UI in Firefox 
-fixed
 2013-01-04 11:00:21 -05:00
James 63c847080f CC-4732: Ask for admin username + password in Stream Settings page 
- CRLF
 2013-01-03 18:02:19 -05:00
James 5d76bb2d17 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-03 18:00:33 -05:00
James ae7b6fe092 CC-4732: Ask for admin username + password in Stream Settings page 
- done
 2013-01-03 17:58:50 -05:00
denise 64116c7bff CC-4779: Library -> Metadata tooltip -> Some words get wrapped in different languages 
-fixed
 2013-01-03 16:56:04 -05:00
denise 7ea649e063 CC-4783: Username on the edit user form should be readonly 
-done
 2013-01-03 16:27:05 -05:00
denise c11032111e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-03 16:19:20 -05:00
denise e2c87ed8b6 CC-4781: Store localization settings on a per-user basis 
-done
 2013-01-03 16:19:02 -05:00
James 1f7e0ce042 CC-4782: Replay Gain modifier adds horizontal scroll bar when set to +10dB 
- fixed
 2013-01-03 14:58:29 -05:00
James 0f4ddc904f CC-4756: System -> Streams: "Addtional Options" is not expandable when connection error happens 
- fixed
 2013-01-03 14:54:07 -05:00
James a1837366be Merge branch 'cc-3018-silence-detection' into devel 2013-01-03 14:08:21 -05:00
James b8f80866cf CC-3018: Automatically strip out silence from audio tracks 
- done
 2013-01-03 14:02:06 -05:00
denise 59f3826055 CC-4725: Have a "share" button on the popup player 
-done
 2013-01-03 13:13:27 -05:00
denise e9bd63b163 Updated German .po file 2013-01-03 11:22:45 -05:00
denise 1d6150b1a5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-02 16:27:56 -05:00
denise cd252d357d CC-4777: Edit Metadata: Remove second title 
-done
 2013-01-02 16:27:35 -05:00
Martin Konecny d41c248435 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-02 16:24:12 -05:00
Martin Konecny f7bcc8a4ed Merge branch 'patch-2' of https://github.com/havban/Airtime into devel 2013-01-02 16:24:04 -05:00
denise c05f465047 CC-4772: L10N -> Korean: "Scheduled Play" in the Dashboard is not translated in Korean version 
-fixed
 2013-01-02 16:20:09 -05:00
Martin Konecny 25df87d2e5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-02 16:09:39 -05:00
Martin Konecny d6eb043899 CC-4765: Webstream of AAC type can't be previewed 
-fixed
 2013-01-02 16:09:32 -05:00
denise 3f7a1189f4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-02 16:08:58 -05:00
denise 44ab27ad7d CC-4773: L10N: Some strings is not listed in airtime.po 
-added missing file extension error message to plupload language files
 2013-01-02 16:08:38 -05:00
denise 05eee37f20 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-02 16:04:37 -05:00
denise 88f2f1e4a7 CC-4773: L10N: Some strings is not listed in airtime.po 
-fixed
 2013-01-02 16:04:19 -05:00
cliff.wang cdb3ec468a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-02 12:15:05 -05:00
cliff.wang 306282521a Add Chinese pulp upload translation file 2013-01-02 12:14:22 -05:00
denise a725148832 CC-4775: Add option for Italian language in preferences 
-done
 2013-01-02 12:10:16 -05:00
denise 0ab56c831d Updated header info of Chinese .po file 2013-01-02 12:01:26 -05:00
denise 994cbce503 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-02 11:50:34 -05:00
denise 93ea912d54 CC-4774: Add option for Chinese in preferences 
-done
 2013-01-02 11:50:10 -05:00
James 3cad875d0c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-02 11:43:14 -05:00
James dcdbc3160d CC-4769: Duplicate Playlist: Fade in/out setting doesn't get copied correctly 
- fixed
 2013-01-02 11:41:33 -05:00
denise f8cbd27da3 CC-4746: Russian - UI breaks in several places 
-fixed
 2013-01-02 11:29:41 -05:00
denise 0dc602ad8e CC-4746: Russian - UI breaks in several places 
-fixed
 2013-01-02 11:17:24 -05:00
denise c0cba93355 CC-4749: Spanish: UI breaks with localization 
-fixed
 2013-01-02 10:56:51 -05:00
James 5e42695718 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-12-28 16:20:21 -05:00
James 1dfe99224c CC-4754: Replay gain modifier 
- adding text
 2012-12-28 16:18:47 -05:00
James f26778ee72 CC-4757: Duplicate playlist 
- done
- we still need a icon for context menu
 2012-12-28 16:17:58 -05:00
cliff.wang 69ff8f3acd Add Simple Chinese language files 2012-12-28 11:11:53 -05:00
James 6e77f2637a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-12-28 10:59:03 -05:00
james 4aae3ba51b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-12-27 22:59:05 -05:00
james cf38e2c596 CC-4754: Replay gain modifier 
- done
 2012-12-27 22:58:41 -05:00
Martin Konecny 0596d1c391 Merge branch 'cc-4759-add-aac-stream-in-support' into devel 
Conflicts:
	python_apps/media-monitor2/media/monitor/pure.py
 2012-12-27 17:29:25 -05:00
Martin Konecny ee8dde07c8 add support for AAC input streams 2012-12-27 17:18:47 -05:00
james c0665e4748 CC-4754: Replay gain modifier 
- Initial commit
 2012-12-27 00:36:11 -05:00
denise a4008aaef3 CC-4721: Library -> Context Menu -> 'Add to smart block' option only takes affect once the open smart block has been saved 2012-12-19 15:01:53 -05:00
denise 274b1f7562 CC-4743: Make user rights description localizable 2012-12-17 16:53:43 -05:00
denise adae81bffa CC-4747: Add User page -> Typo on form labels 2012-12-17 16:53:18 -05:00
denise 0324d48e06 CC-4747: Add User page -> Typo on form labels 2012-12-17 16:52:08 -05:00
denise 854537f387 CC-4745: Add Russian language option to preferences 2012-12-17 14:33:14 -05:00
denise bd18039785 CC-4744: Edit user form needs styling 
-done
 2012-12-17 14:12:27 -05:00
Daniel James a2d0f98a62 Added Russian localization files 2012-12-14 09:54:42 +00:00
denise 8b76bd0373 CC-2258: Describe rights for each user type on the user page 
Modified user rights descriptions
 2012-12-13 15:29:29 -05:00
denise 8125337c4a Changed the opacity of user rights tipsy tooltip 2012-12-13 12:58:26 -05:00
denise 076a1c56cb CC-2258: Describe rights for each user type on the user page 2012-12-13 12:29:02 -05:00
denise 2bebe7f025 Modified jquery tipsy css 2012-12-11 18:08:37 -05:00
denise 854eccfb76 CC-4736: Let non-admin users update their user info 
Adding jquery tipsy plugin
 2012-12-11 11:30:59 -05:00
denise f12547dfb4 CC-4736: Let non-admin users update their user info 
new form
 2012-12-10 16:56:25 -05:00
denise dd5882984e CC-4736: Let non-admin users update their user info 
-done but needs design
 2012-12-10 16:55:44 -05:00
denise e6cc0c3417 Corrections to French .po file: recompiled .mo file 2012-12-10 11:28:27 -05:00
denise 713c3e82e4 Corrections to French .po file 2012-12-10 11:22:59 -05:00
Febiansyah Hidayat 5e9d5bd71a Update airtime_mvc/public/js/airtime/preferences/streamsetting.js 
Update statement to remove "disabled" attribute to be compatible with chrome and firefox browser.

Perform commit in devel branc as requested in: https://github.com/sourcefabric/Airtime/pull/21#issuecomment-11144375
 2012-12-08 09:25:19 +09:00
James e5edfd15f2 - Korean Lang pack fix 2012-12-05 17:43:29 -05:00
James efa5f6ff6c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-12-05 13:29:48 -05:00
James e1e8160e53 CC-4737: Listener stats should take up the full screen 
- fixed
 2012-12-05 13:29:29 -05:00
denise 402950211a CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page 
-removed redundant 'Ok' button
 2012-12-05 13:23:58 -05:00
denise adb966a734 CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page 
-cancel button does not reload the page anymore
 2012-12-05 13:21:18 -05:00
denise 8e6dd6f862 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-12-05 13:16:40 -05:00
denise 062740ef81 CC-4735: Library: Edit metadata selection should be a popup instead of going to a new page 
-done
 2012-12-05 13:16:25 -05:00
Daniel James 343c0922a2 Added United States and Great Britain localizations 2012-12-05 11:43:34 +00:00
denise 1846f17bbc CC-4731: Cannot save support feedback settings 2012-12-04 16:21:45 -05:00
denise 844246df3a CC-4730: Support Feedback: Errors are displayed when they shouldn't be 2012-12-04 15:30:56 -05:00
denise ee086fe43a CC-4730: Support Feedback: Errors are displayed when they shouldn't be 2012-12-04 14:46:06 -05:00
denise fde74105de CC-4729: Register dialog is missing title 2012-12-04 14:33:45 -05:00
denise e69bd74d6e -adding german translation files for datatables and plupload plugins 2012-12-04 12:14:35 -05:00
denise 7c046bd0cc -adding spanish translation file for plupload plugin 2012-12-04 12:14:01 -05:00
denise a10f8276db -added spanish .po, and.mo files 
-added spanish translation files for datatables and plupload
 2012-12-04 12:08:23 -05:00
denise 83ae677301 -added german, and spanish locales into locale table 2012-12-04 12:07:29 -05:00
Daniel James d33e93da2e Added initial German localization 2012-12-04 13:22:25 +00:00
Daniel James 6a0d669100 Added language and copyright header to French translation 2012-12-04 12:57:01 +00:00
denise 4515ac2aef - added french .po file 
- added french translations for datatables and plupload plugins
 2012-12-03 18:15:08 -05:00
denise 89e0458500 CC-4728: Support Feedback save action does not use ajax 
-done
 2012-12-03 17:15:47 -05:00
denise ab55bb73bb CC-4683: System -> Preference: Save button is old style 
-support feedback form also had old button style
 2012-12-03 14:51:21 -05:00
denise 155f1eae11 CC-4683: System -> Preference: Save button is old style 
-done
 2012-12-03 11:57:01 -05:00
denise 127d0187b7 CC-4706: Calendar -> Context menu -> Show content does not work 
-fixed
 2012-12-03 11:45:06 -05:00
Daniel James e54f8db7d6 Added copyright and contact headers to gettext files 2012-12-03 14:36:47 +00:00
Martin Konecny b474035d76 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/common/DateHelper.php
	airtime_mvc/public/js/airtime/library/library.js
 2012-11-30 18:01:02 -05:00
martin 70511746d0 Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/public/js/airtime/library/library.js
 2012-11-30 17:58:00 -05:00
denise 2f0c6b702a CC-1960: Internationalize Airtime / Support translations 
- created locale table
- create locale model
- set default locale in pref table
 2012-11-29 18:21:03 -05:00
denise 81c9b4d862 CC-1960: Internationalize Airtime / Support translations 
-added a template po file for translations
 2012-11-29 11:47:11 -05:00
denise dfc7bbbd5a CC-1960: Internationalize Airtime / Support translations 
-small change to en_CA po file
 2012-11-29 11:32:25 -05:00
denise 0e3525180e CC-1960: Internationalize Airtime / Support translations 
-added default locale into cc_pref
 2012-11-29 10:57:59 -05:00
denise 260c6aea59 Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime 2012-11-29 10:50:01 -05:00
denise 7a4e871495 Merge branch 'devel' into cc-1960-internationalize-airtime 2012-11-29 10:47:17 -05:00
denise b50ed74fe9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-29 10:46:35 -05:00
James 4ad9e28e14 CC-1960: Internationalize Airtime / Support translations 
- korean lang pack
 2012-11-29 10:31:13 -05:00
denise b674cb9b01 CC-1960: Internationalize Airtime / Support translations 
-revised .po file
 2012-11-28 16:54:29 -05:00
denise 542434d9f0 CC-1960: Internationalize Airtime / Support translations 
-got rid of spaces at beginning of strings
-removed empty string translations
-overwrote Zend_Validate_Between object error messages
 2012-11-28 16:16:39 -05:00
denise 9689c75bed CC-1960: Internationalize Airtime / Support translations 
-added i18n to serverbrowser.js
-fixed small typo in SmartBlockCriteria.php
 2012-11-28 11:54:22 -05:00
denise e475c2e99e CC-1960: Internationalize Airtime / Support translations 
-overwrote zend from stringLength validator
 2012-11-27 17:28:27 -05:00
denise ac0e1d07be Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime 2012-11-27 17:11:43 -05:00
denise 9acfb6c181 CC-1960: Internationalize Airtime / Support translations 
- overwrote default zend form error messages
 2012-11-27 17:11:29 -05:00
James 1196c1c07c Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime 2012-11-27 15:56:04 -05:00
James 8acc8fce76 CC-1960: Internationalize Airtime / Support translations 
- fixed close button on show add form
 2012-11-27 15:55:32 -05:00
denise 37ce75f686 Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime 2012-11-27 15:52:14 -05:00
denise 22bfc45497 CC-1960: Internationalize Airtime / Support translations 
-defined translations for show builder datatable
 2012-11-27 15:51:50 -05:00
James 1ce448b50b Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime 2012-11-27 13:35:09 -05:00
James 7cc4c88f2f CC-1960: Internationalize Airtime / Support translations 
- css change for close icon
 2012-11-27 13:34:54 -05:00
denise 42d535a922 CC-1960: Internationalize Airtime / Support translations 
-unlocalized some strings
 2012-11-27 12:33:43 -05:00
denise c4062f7770 CC-1960: Internationalize Airtime / Support translations 
-fixed javascript strings
 2012-11-27 12:31:21 -05:00
denise 0a642fc717 CC-1960: Internationalize Airtime / Support translations 2012-11-27 12:23:16 -05:00
denise d2ed927e65 CC-1960: Internationalize Airtime / Support translations 
-playout history datatable was missing translation table
 2012-11-27 12:17:59 -05:00
denise 36c6edcff1 CC-1960: Internationalize Airtime / Support translations 
-addded gettext wrapper to string missing it
 2012-11-27 12:10:32 -05:00
denise f86cd7d474 CC-1960: Internationalize Airtime / Support translations 
-fixed typos
 2012-11-27 12:03:38 -05:00
denise b9b387fcd0 CC-1960: Internationalize Airtime / Support translations 
-fixed typos
 2012-11-27 11:59:55 -05:00
denise 3b124e6f5d CC-4668: Blocks/Playlists: Length includes deleted tracks 
-saving block length was including files that do not exist
 2012-11-26 15:05:27 -05:00
denise ae15a47bc5 CC-1960: Internationalize Airtime / Support translations 
-added .po file
 2012-11-26 14:22:15 -05:00
denise af70f241d2 CC-1960: Internationalize Airtime / Support translations 
-updated. po  file
 2012-11-26 14:19:13 -05:00
denise ddb6289c87 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-23 16:54:39 -05:00
denise 04f6ae5c1a CC-4607: Library: Please make the 'Add x items' following mouse's point 
-fixed
 2012-11-23 16:53:51 -05:00
denise b677130a3f CC-1960Internationalize Airtime / Support translations 
-added gettext wrapper to strings missing it
-timepicker close button was not getting translated -fixed
 2012-11-23 16:39:41 -05:00
martin 5ba964c783 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-23 14:03:51 -05:00
martin 75adf9b6a1 CC-4701: same webstream played twice in a row does not work. 
-fixed
 2012-11-23 14:03:31 -05:00
denise c6a5db4a78 CC-1960: Internationalize Airtime / Support translations 
-dashboard was missing a translation - fixed
 2012-11-23 10:48:44 -05:00
denise 4804685dfd CC-1960: Internationalize Airtime / Support translations 
-navigation bar was not showing localized text -fixed
 2012-11-22 18:15:54 -05:00
denise dd0e71efcc CC-1960: Internationalize Airtime / Support translations 
-added gettext wrapper function to all strings missing it
-i18n of jquery timepicker and datepicker
-i18n of jquery datatables columnFilter input place holder labels
 2012-11-22 17:32:24 -05:00
James da6013b523 CC-4717: Lintian warnings from devel branch 
- fixed
 2012-11-22 15:14:55 -05:00
James 87d0383533 CC-4703: Now Playing duration column ignores any cue point set 
- fixed
 2012-11-22 14:37:57 -05:00
denise 96b87d23e0 CC-1960: Internationalize Airtime / Support translations 
-added i18n for plupload
 2012-11-22 14:37:54 -05:00
Martin Konecny 2fa8f05c3c Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-22 11:40:55 -05:00
Martin Konecny 3a1945a818 CC-4702Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule 
-fixed
 2012-11-22 11:40:44 -05:00
James acf2ffc9d5 CC-4707: Webstream: Preview for Webstream in Scheduler is forbidden 
- fixed
 2012-11-22 11:18:42 -05:00
denise 9a1a7b2e97 CC-1960: Internationalize Airtime / Support translations 
-added locale directory structure under airtime_mvc
 2012-11-22 11:09:24 -05:00
Daniel James a819b20f55 Moved Flot license information into LICENSE_3RD_PARTY and debian/copyright files 2012-11-22 15:37:08 +00:00
James 8483439551 CC-4709: 
Exception happens when DJ try to click a Webstream not belongs to himself

- fixed
 2012-11-22 10:29:40 -05:00
James dcc9a192d1 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-22 10:15:35 -05:00
denise c0e49b69e2 Merge branch 'devel' into cc-1960-internationalize-airtime 2012-11-21 17:17:53 -05:00
denise 2172ee82d3 Merge branch '2.2.x' into devel 2012-11-21 17:17:32 -05:00
denise 993d3fda7b CC-1960: Internationalize Airtime / Support translations 
-set locale based on user's preference
 2012-11-21 16:41:54 -05:00
denise 2a4e4c6405 CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs. 
-fixed
 2012-11-21 14:17:46 -05:00
denise 7a9f01458c CC-1960: Internationalize Airtime / Support translations 
-fixed langauge label on preferences page
 2012-11-21 12:46:52 -05:00
denise 25ddd083bc CC-1960: Internationalize Airtime / Support translations 
-added language option in preferences
 2012-11-21 12:44:50 -05:00
denise c344282e4d CC-1960: Internationalize Airtime / Support translations 
-rescan watched folder button was missing
 2012-11-21 11:57:41 -05:00
denise 10b6dd202e Merge branch 'devel' into cc-1960-internationalize-airtime 
Conflicts:
	airtime_mvc/public/js/airtime/playlist/smart_blockbuilder.js
 2012-11-21 11:44:40 -05:00
denise f88a7bdb31 Merge branch '2.2.x' into devel 2012-11-21 10:54:17 -05:00
denise df6d199b60 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-21 10:52:52 -05:00
denise 48253b8d14 CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs. 
-fixed
 2012-11-21 10:19:21 -05:00
James 4242fecd34 CC-4615: Now Playing page: Fail to get soundcloud file id in Schedule 
- fixed
 2012-11-20 18:03:13 -05:00
denise 10cd31fa56 CC-1960: Internationalize Airtime / Support translations 
- channged all js strings with embedded variables to use sprintf
 2012-11-20 17:42:26 -05:00
denise 9762511693 Merge branch 'cc-1960-internationalize-airtime' of dev.sourcefabric.org:airtime into cc-1960-internationalize-airtime 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LocaleController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/application/views/scripts/playlist/playlist.phtml
	airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
 2012-11-20 16:56:18 -05:00
Martin Konecny 9abd7fa431 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-20 16:48:17 -05:00
denise 06c3dcb69e CC-1960: Internationalize Airtime / Support translations 
-added jquery.i18n library
 2012-11-20 16:43:42 -05:00
denise e9b9f63630 CC-1960: Internationalize Airtime / Support translations 
-added english translation file for datatables
 2012-11-20 16:42:06 -05:00
denise f40d1f8dd4 CC-1960: Internationalize Airtime / Support translations 
-enabled i18n for datatables, colVis, columnFilter, and fullCalendar
-fixed typos in full-calendar-functions.js
 2012-11-20 16:40:02 -05:00
James 8d9fa1976e Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-20 16:39:04 -05:00
James 3c1f80de68 CC-4658: Smart Block: Unable to drag songs into block directly 
- fixed
 2012-11-20 16:38:43 -05:00
Martin Konecny fe44d23b74 CC-4715: Better management of tracks that are shorter than they claim to be. 2012-11-20 16:31:27 -05:00
Rudi Grinberg 3a682aeada cc-4585: fixed + added logging 2012-11-20 15:25:41 -05:00
Rudi Grinberg 7124cbe04d fixed bug where hidden files would be shown in library 2012-11-20 15:18:41 -05:00
Rudi Grinberg 20855c73b5 refactoring + fix typo 2012-11-20 15:10:38 -05:00
James d69faef560 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-20 15:05:20 -05:00
James 4737232b21 CC-2401: Shuffle option in playlists 
- add delayed removing of success message
 2012-11-20 15:05:09 -05:00
denise 57fdab0ddf CC-1960: Internationalize Airtime / Support translations 
-added i18n jquery library
-created a Locale controller that returns a js dictionary of translations needed in js
-added jquery i18n wrapper function to all strings in js
 2012-11-20 11:33:37 -05:00
denise b801235c99 CC-1960: Internationalize Airtime / Support translations 
-added gettext function to strings in layout/scripts
 2012-11-20 11:33:37 -05:00
denise 43a797058c -extra quote typo 2012-11-20 11:33:37 -05:00
denise a76b9b305f CC-1960: Internationalize Airtime / Support translations 
-added gettext wrapper to all strings in models
 2012-11-20 11:33:37 -05:00
denise 2ce530c5bd CC-1960: Internationalize Airtime / Support translations 
- fix to some controller strings
 2012-11-20 11:33:37 -05:00
denise 9958d8da9f CC-1960: Internationalize Airtime / Support translations 
-added gettext wrapper function to all strings in layout, and common
 2012-11-20 11:33:37 -05:00
denise 8338152876 CC-1960: Internationalize Airtime / Support translations 
-added gettext wrapper function to all navigation strings
 2012-11-20 11:33:37 -05:00
denise 5adadc2e91 CC-1960: Internationalize Airtime / Support translations 
- added gettext wrapper function to all strings in controllers
 2012-11-20 11:33:37 -05:00
denise e5f67c8b05 CC-1960: Internationalize Airtime / Support translations 
-added gettext wrapper functions for all strings in view/scripts, and forms
 2012-11-20 11:33:37 -05:00
Rudi Grinberg a69ff167d4 mass string change to _ 2012-11-20 11:33:37 -05:00
Rudi Grinberg 15741bdfa9 renamed links 2012-11-20 11:29:56 -05:00
Martin Konecny fed39077c0 Merge branch '2.2.x' into devel 2012-11-20 11:21:29 -05:00
denise e0b19cc2d1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-20 11:17:03 -05:00
denise 8c49540d3d CC-1960: Internationalize Airtime / Support translations 
-added i18n jquery library
-created a Locale controller that returns a js dictionary of translations needed in js
-added jquery i18n wrapper function to all strings in js
 2012-11-20 11:16:10 -05:00
Martin Konecny 9c612d17a3 CC-4694: Apache/Zend error only specific to some users 2012-11-19 18:41:31 -05:00
denise 97e94269c5 CC-1960: Internationalize Airtime / Support translations 
-added gettext function to strings in layout/scripts
 2012-11-16 13:59:51 -05:00
denise 3f3b939ebe -extra quote typo 2012-11-15 17:28:18 -05:00
Martin Konecny 7efa7169ca CC-4700: Return mime type of streams instead of null 
-fixed
 2012-11-15 16:41:46 -05:00
denise ef626a71b1 CC-1960: Internationalize Airtime / Support translations 
-added gettext wrapper to all strings in models
 2012-11-15 15:52:51 -05:00
denise d7495c6937 CC-1960: Internationalize Airtime / Support translations 
- fix to some controller strings
 2012-11-15 14:05:36 -05:00
denise 4f40efa376 CC-1960: Internationalize Airtime / Support translations 
-added gettext wrapper function to all strings in layout, and common
 2012-11-15 13:49:44 -05:00
denise 5ba9df9e90 CC-1960: Internationalize Airtime / Support translations 
-added gettext wrapper function to all navigation strings
 2012-11-15 13:24:30 -05:00
denise 105325994f CC-1960: Internationalize Airtime / Support translations 
- added gettext wrapper function to all strings in controllers
 2012-11-15 12:55:45 -05:00
denise d83a96a8ec CC-4699: Library -> 'File Import in Progress' is missing loading icon 
-fixed
 2012-11-15 12:14:25 -05:00
Martin Konecny d1a22fe7ca CC-4677: Improve Smart block repeat description 
-fixed
 2012-11-15 11:30:56 -05:00
denise b173b6dda4 CC-1960: Internationalize Airtime / Support translations 
-added gettext wrapper functions for all strings in view/scripts, and forms
 2012-11-15 10:59:06 -05:00
James 2b2a1db055 CC-2401: Shuffle option in playlists 
- done
 2012-11-13 17:32:10 -05:00
Rudi Grinberg f0e2d5d295 mass string change to _ 2012-11-13 15:37:24 -05:00
Rudi Grinberg 925afcc64c renamed links 2012-11-13 15:10:07 -05:00
denise 33e4d6154d CC-4693: Preferences: Bottom save button is not aligned 
-fixed
 2012-11-12 14:43:44 -05:00
denise a727f2bb1e CC-4638: Stream Settings -> Apache error when setting master source port to same port Airtime is running on 
-fixed
 2012-11-12 14:28:50 -05:00
denise c0e54c64cd CC-4685: System -> User: Unique username error 
-fixed
 2012-11-12 12:29:07 -05:00
denise 0a0cf70046 CC-4687: System -> Stream: Cannot expand/shrink Stream 1/2/3 settings after clicking Save 
-fixed
 2012-11-12 12:06:22 -05:00
denise ef8f8dfa75 CC-4688: System -> Preferences: Please expand the Soundcloud settings if warning for wrong settings exists 
-fixed
 2012-11-12 11:45:26 -05:00
James 6145f9bcad Merge branch '2.2.x' into devel 2012-11-08 17:28:23 -05:00
James 33b2520c14 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-08 17:27:28 -05:00
James 628e6bed37 CC-4689: Live Stream: The 1st song of a show won't play if there is another show have live stream assigned and finished right before 
- fixed
 2012-11-08 17:26:55 -05:00
James 7300b608cf Merge branch 'cc-4661-listener-statistics' into devel 
Conflicts:
	python_apps/api_clients/api_client.py
 2012-11-07 17:20:12 -05:00
James 9112a8d0b1 CC-4661: Listener Statistics 
- enhancement on flot
- data point reduction
 2012-11-07 16:26:31 -05:00
denise bd482a0a75 CC-4583: Use AJAX calls instead of refreshing entire page 
-fixed
 2012-11-07 15:17:47 -05:00
denise ccd6447696 - install failed due to wrong metadata key 
- wrong controller action called
 2012-11-07 12:05:20 -05:00
denise b817684972 Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/PreferenceController.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/bootstrap/bootstrap.js
 2012-11-07 11:21:36 -05:00
Martin Konecny fd3305bc4c SAAS-289: Remove all isSaaS checks 
-done
 2012-11-06 17:10:47 -05:00
denise 29c7e58643 CC-4679: Library: Deleting Webstream leaves the SAVE button 
-fixed
 2012-11-06 16:49:36 -05:00
denise f623445b0d Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-06 16:34:19 -05:00
denise bf4f5fd699 CC-4607: Library: Please make the 'Add x items' following mouse's point 
-fixed
 2012-11-06 16:34:06 -05:00
James 504d9968f1 CC-4639: 
Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit

- fixed the bug where airtime hangs when repeat is checked but 0 files that
meet criteria
- fixed dynamic block bug where it didn't generate correct list
 2012-11-06 16:32:00 -05:00
James 9712e64a69 CC-4661: Listener Statistics 
- bug fix and removing unnecessary code
 2012-11-06 14:52:35 -05:00
denise c605c97268 CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks 
-disabled this option from context menu
 2012-11-06 14:33:34 -05:00
denise a1a7396ec9 CC-4455: "Add to current smart block" context menu action should be disabled for dynamic smart blocks 
-disabled this button in the library toolbar if dynamic blocks are open
 2012-11-06 14:29:26 -05:00
denise e262d48eec CC-4675: Preferences: Error messages are hidden 
-fixed
 2012-11-06 12:17:45 -05:00
denise de89686d48 CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference 
-added comments
 2012-11-06 12:03:49 -05:00
denise 2cbba60037 CC-4673: Smart Block: Exception happens when create a smart block with 5 criteria 
-fixed
 2012-11-06 11:54:24 -05:00
denise a99191f4bd CC-4669: Smart Blocks: Dynamic length of less than 1 hour shows 0.0 
-fixed
 2012-11-06 11:14:40 -05:00
James 8e69e50eea Merge branch 'cc-4661-listener-statistics' of dev.sourcefabric.org:airtime into cc-4661-listener-statistics 
Conflicts:
	airtime_mvc/application/models/ListenerStat.php
 2012-11-06 11:06:58 -05:00
denise 6ef646124e CC-4668: Blocks/Playlists: Length includes deleted tracks 
-fixed
 2012-11-06 10:58:25 -05:00
James 2e79e8421c CC-4661: Listener Statistics 
- better legend for multiple series of data
- consistant number of ticks on x-axis
 2012-11-06 10:54:52 -05:00
Martin Konecny 4218a7f30d CC-4661: Listener Statistics 
-factor out mountname into it's own table
 2012-11-05 15:48:56 -05:00
Martin Konecny 080c3ec944 CC-4661: Listener Statistics 
-factor out mountname into it's own table
 2012-11-05 15:38:35 -05:00
denise 90a93e9a6c CC-4664: Playlist/Block preview: Tracks deleted from library still get played 
-fixed
 2012-11-05 13:58:11 -05:00
denise 78e731f717 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-05 12:03:59 -05:00
denise 8fda0ba610 CC-4625: On tablet you cannot create a playlist, smart block or webstream 
-attempt #2
 2012-11-05 12:03:46 -05:00
denise c051e0671d CC-4625: On tablet you cannot create a playlist, smart block or webstream 
-attempt #2
 2012-11-05 12:00:37 -05:00
Martin Konecny d467abe509 Merge branch 'cc-4585' of https://github.com/rgrinberg/Airtime into devel 2012-11-05 11:27:34 -05:00
denise a201d6f2da CC-4666: Showbuilder page is dead 
-fixed. result of a bad merge
 2012-11-05 11:15:26 -05:00
Rudi Grinberg bd3cf543bf made param useless in listAllFiles since its now safe to pass all files to MM 2012-11-05 11:11:05 -05:00
Rudi Grinberg 1c628bd831 renamed displayable to visible 2012-11-05 10:57:18 -05:00
Rudi Grinberg acf954f637 changed hidden check to displayable check 2012-11-05 10:55:54 -05:00
Rudi Grinberg 6e89fdab30 changed file existence checks to displayable 2012-11-05 10:14:49 -05:00
Rudi Grinberg b6341e44b3 removed pointless code duplication 2012-11-05 10:12:03 -05:00
Rudi Grinberg 34248921fc refactored code to use displayable 2012-11-05 10:09:34 -05:00
Rudi Grinberg aa9a6691f2 added a single test for checking if a file should be shown or not 2012-11-05 10:08:29 -05:00
Rudi Grinberg 311c88a8a2 added check for hidden in buildEntry 2012-11-05 09:54:00 -05:00
Rudi Grinberg a62e64969d Removed commented method 2012-11-05 09:49:49 -05:00
Rudi Grinberg 00a4e45491 added check for hidden in buildEntry 2012-11-05 09:47:16 -05:00
Rudi Grinberg 800f8b9ded added criteria to remmove hidden files in blocks 2012-11-05 09:40:58 -05:00
Rudi Grinberg 4522fa94b2 added clause to exclude hidden files from getShowListContent 2012-11-05 09:30:21 -05:00
Rudi Grinberg e01a61208d Merge remote-tracking branch 'sf/2.2.x' into cc-4585 2012-11-05 09:19:20 -05:00
Rudi Grinberg 7e03333496 changed deletion by the user to be setting the file to be hidden instead 2012-11-03 01:33:13 -04:00
Rudi Grinberg 9c4f2e3298 refactored addWatchedDir to use early return style 2012-11-03 01:16:57 -04:00
Rudi Grinberg 5d3aa68c72 written method to unhide all files in a music dir 2012-11-03 01:09:36 -04:00
Martin Konecny 12009e95fc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
 2012-11-02 20:18:33 -04:00
Martin Konecny 9609a4e220 Merge branch 'cc-4652' of https://github.com/rgrinberg/Airtime into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
 2012-11-02 20:16:54 -04:00
James a93b588a09 Merge branch 'cc-4661-listener-statistics' of dev.sourcefabric.org:airtime into cc-4661-listener-statistics 2012-11-02 18:25:23 -04:00
James 74fe958cad CC-4661: Listener Statistics 
- changes for different mount names
 2012-11-02 18:25:08 -04:00
Martin Konecny 34d0ee5954 CC-4661: Listener Statistics 
-add mount point names
 2012-11-02 18:04:32 -04:00
Martin Konecny 6438b54a5f CC-4661: Listener Statistics 
-backend part working
 2012-11-02 17:50:43 -04:00
denise 106b18bf30 CC-4637: Media Library: Item will be removed from Playlist if it's removed from Library 
-fixed
 2012-11-02 17:49:32 -04:00
James 8b70136dd6 CC-4661: Listener Statistics 
- db change commit
 2012-11-02 17:44:06 -04:00
James 3af3cd5870 CC-4661: Listener Statistics 
- frontend part
 2012-11-02 17:00:38 -04:00
denise 2854dd40e0 CC-4663: Smart Blocks -> Deleting a track in smart block from library gives error 
-fixed
-tracks with undefined mime type were not handled properly
 2012-11-02 16:54:49 -04:00
James 7f27e5ff3f - ListenerStat Model 2012-11-02 16:28:13 -04:00
Rudi Grinberg 2ae3c0ac03 Line wrapping 2012-11-02 16:06:12 -04:00
Rudi Grinberg 1111fd8163 align 2012-11-02 16:04:47 -04:00
Rudi Grinberg ac9b47f5e2 made rescanWatchDirectoryAction more concise 2012-11-02 16:02:05 -04:00
Rudi Grinberg 5cb83909d8 Merge remote-tracking branch 'sf/2.2.x' into cc-4585 2012-11-02 16:00:09 -04:00
denise 796274e4ef CC-4642: Default Fade preference should be in seconds and tenths, rather than millionths 
-fixed
 2012-11-02 15:51:36 -04:00
Rudi Grinberg aec11feba5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-02 14:59:02 -04:00
denise ba1f6ed054 CC-4374: Nowplayling page: Cannot remove tracks from recording show 
-fixed by disallowing dragging into recording shows
 2012-11-02 13:24:47 -04:00
denise 135aadf16b Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/views/scripts/library/library.phtml
	airtime_mvc/public/js/airtime/showbuilder/builder.js
	airtime_mvc/public/js/airtime/showbuilder/main_builder.js
 2012-11-02 12:28:21 -04:00
denise 715a21acb2 CC-4625: On tablet you cannot create a playlist, smart block or webstream 
-upgraded bootstrap-dropdown.js to v2.2.1
 2012-11-02 11:59:36 -04:00
Martin Konecny 3478797744 cc-4661: new database tables for listener stats 2012-11-02 11:32:02 -04:00
denise a937df30ad Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-02 10:48:16 -04:00
denise cc208da2fb CC-4536: Smart block criteria use AND logic, but additional modifiers use OR logic, without labels to show the difference 
-added labels
 2012-11-02 10:48:08 -04:00
James feb6c9d6f5 CC-4636: Exception happens when trying to remove user that have created some smart block 
- doing delete cascade on cc_block on deleting users
 2012-11-01 17:45:28 -04:00