Commit Graph

1313 Commits

Author SHA1 Message Date
Naomi Aro c5221aae6a CC-5254 : Listener Status for SHOUTcast doesn't work 2013-06-24 17:24:43 -04:00
Martin Konecny 6498f43dad CC-5211:
Php Exception: Set large number as year in tracks Metadata

fixed
2013-06-06 17:02:01 -04:00
Martin Konecny 046039ece1 CC-5207:
media-monitor restart will reset the cuein/cueout value

-fixed
2013-06-05 16:14:14 -04:00
Martin Konecny 905dd08ed5 Use proper unit conventions for Kilo 2013-05-31 15:59:20 -04:00
Martin Konecny 82a71fdb61 CC-5199
aacencplus encoder is very low quality
2013-05-31 15:59:04 -04:00
Naomi 1fa0ee49d6 CC-5190 : Playlist: Copy playlist will lost cue in/out setting 2013-05-30 15:36:55 -04:00
denise 67e50354e9 CC-5189: Typo: Stream type's tooltip 2013-05-30 11:14:46 -04:00
denise f9645980a4 Updating .po files with new string added 2013-05-29 15:28:26 -04:00
Martin Konecny 50ece038c2 fix errors reported by Facebook's scheck
-controller dir
2013-05-28 17:45:09 -04:00
Naomi c57de650e8 CC-5172 : errors from setting cues in waveform editor not handled properly
Conflicts:
	airtime_mvc/application/models/Playlist.php
2013-05-23 13:01:38 -04:00
denise fb605ccb71 Renamed 'Open Playlist Editor' button to 'Open Media Builder' on Library page 2013-05-21 09:30:35 -04:00
denise 0f1a94532e CC-5157: [Beta user reported]Linked Show: Multiple warnings after multiple check/uncheck action
Fixed. Also had to prepare the warning message for localization.
2013-05-17 14:47:34 -04:00
denise 5bf91d513d CC-5127: Library -> Scheduled and Playlist columns needs better icon
Changed icon
Renamed Playlist to Playlist / Block
2013-05-17 11:42:48 -04:00
denise 5a86bd9ac4 CC-5149: Linked show: Regular show will be treat as linked show in some case
A new form was not getting sent to the user properly after a show creation
2013-05-15 15:47:45 -04:00
Martin Konecny b2c8cb0f9d Merge branch 'master' of dev.sourcefabric.org:airtime 2013-05-14 19:18:51 -04:00
Martin Konecny b287409bfb IM-629
-not using show_instnace_filter POST param correctly
2013-05-14 19:18:30 -04:00
Martin Konecny bb36556bb9 IM-629
-filter by using instance id instead of show id

Conflicts:
	airtime_mvc/application/models/Schedule.php
2013-05-14 19:18:08 -04:00
Naomi 7d5177d77d CC-5096 : Add "i" (info) icon to stream output type 2013-05-14 18:14:38 -04:00
denise e1d0dc9b95 Updated .po files 2013-05-14 16:08:21 -04:00
Naomi 0dd8138c2b CC-5131 : Please give user a message that Browser other than Chrome can't use waveform 2013-05-14 14:15:54 -04:00
denise 4ee7724149 CC-4864: I18N: Password reset page is not translated 2013-05-14 11:32:21 -04:00
Naomi d9b6a15fb6 CC-5139 : WaveForm: Click save will cause problem when setting crossfading between track and Smart block 2013-05-13 18:21:24 -04:00
Naomi 872f68505b CC-5108 Waveform Editor UI 2013-05-13 16:01:06 -04:00
Martin Konecny 2250d89cbd CC-5013:
Re-Added watched folder wont update

-fixed
2013-05-10 13:19:56 -04:00
Martin Konecny f5fa033207 better flow in dispatchMetadata function 2013-05-09 17:37:23 -04:00
denise 2e69b35d75 CC-5086: Calendar: Update show pops up instead of Add show after clicking a cell 2013-05-08 16:28:45 -04:00
Naomi 3fc6a0fbae Merge branch 'master' into CC-2301 2013-05-02 18:02:09 -04:00
Martin Konecny d902d38429 revert jsonEncode change not supported by older zend versions 2013-05-02 17:50:36 -04:00
Naomi bd1c1fa32f Merge branch 'master' into CC-2301 2013-05-02 16:59:47 -04:00
Martin Konecny ca22a25827 fix silly mistake with echoing json twice 2013-05-02 16:57:07 -04:00
Naomi 517bb7557a CC-2301 : testing default crossfade settings 2013-05-02 16:15:21 -04:00
Naomi 92ef0608d6 Merge branch 'master' into CC-2301 2013-05-01 11:04:14 -04:00
denise 0362f24a4e CC-5076: Calendar -> Context menu -> Remove all content doesn't remove content from linked instances 2013-05-01 10:30:51 -04:00
Naomi 0db557a570 CC-2301 : fades editor saving offset to database for playlists and smart blocks. 2013-04-30 15:32:43 -04:00
Naomi 2e03e1982f CC-2301 : changing more CRLF files 2013-04-29 18:11:11 -04:00
Naomi b2a490ac47 CC-2301 : working on creating a crossfade method for waveforms. 2013-04-29 18:09:12 -04:00
Naomi 410d298272 CC-2301 : creating an offset column to help create crossfades in the playlist.
changing default fade to be a separate default fade in/out
2013-04-29 16:55:08 -04:00
denise 71526a94cc Merge branch 'cc-4961-show-linking'
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
2013-04-29 15:35:16 -04:00
denise de8f7b0ff7 CC-4961: Show linking 2013-04-29 15:27:14 -04:00
Martin Konecny acfc72f422 use sendJson, instead of manually disabling layouts + encoding data 2013-04-26 18:06:07 -04:00
Martin Konecny 3a931f27bf CC-4417: Opus codec support 2013-04-26 17:54:29 -04:00
denise 0f1383d541 CC-4961: Show linking 2013-04-25 09:00:37 -04:00
Martin Konecny 0e3b4da52f clear unused function 2013-04-24 15:17:06 -04:00
Martin Konecny 243dda60f8 remove useless comment 2013-04-19 20:25:26 -04:00
Martin Konecny fd78ad29bf cleanup of function names 2013-04-19 20:24:05 -04:00
Martin Konecny f39f9329cc CC-4992:
Decouple pypo from Airtime install

-first commit
2013-04-19 20:10:51 -04:00
Martin Konecny 018ec9231e don't print out anything extra after printing json 2013-04-18 16:20:34 -04:00
Martin Konecny 479e69de12 CC-5009:
Use Silan to silently update track length in the background

-done
2013-04-18 15:40:33 -04:00
Naomi 13c8e5f146 CC-2301 : showing waveform cue/fade editors inside of a jquery dialog box. 2013-04-16 14:37:08 -04:00
denise cfee74693b CC-4961: Show linking
moved move-show to calendar service
2013-04-05 17:44:30 -04:00
Martin Konecny 4595aab694 Merge branch '2.3.x' 2013-04-05 15:33:48 -04:00
Martin Konecny d1f655d79d CC-5038: Silan error: list index out of range
-fixed
2013-04-05 15:32:44 -04:00
Martin Konecny fcbac2a044 Merge branch '2.3.x' into devel 2013-04-04 15:15:19 -04:00
Martin Konecny 301115c035 CC-5039: Encoded forward slash causing lots of apache error logs
-fixed: data should have been sent as POST rather than GET
2013-04-04 15:12:52 -04:00
Martin Konecny d1e72cfeea Merge branch '2.3.x' into devel 2013-04-03 17:12:28 -04:00
Martin Konecny a748b05125 CC-5040:
All API actions need to have consistent return value

-temp fix. Correct fix will require ensuring api_client always sends
XmlHttpRequest
2013-04-03 17:11:36 -04:00
denise 81dbb17922 CC-4961: Show linking
-moved show deletion into show service
2013-04-03 11:46:46 -04:00
denise ab10ae68a2 CC-5036: Add back edit show instance functionality 2013-04-01 14:42:35 -04:00
denise 731b86b36c Added back editing a repeating show instance feature 2013-03-27 16:25:39 -04:00
denise e259639d1a Removed scheduleController private variable, currentUser
Removed showService private variable, currentUser
2013-03-27 09:02:49 -04:00
Martin Konecny ee617c8a70 Merge branch '2.3.x' into devel
Conflicts:
	airtime_mvc/application/controllers/UserController.php
2013-03-26 16:34:11 -04:00
Martin Konecny d9646994e9 remove airtime-demo specific code 2013-03-26 16:33:14 -04:00
Martin Konecny 5dc0a4477b disable deletion of users 2013-03-26 16:10:42 -04:00
denise 418bf0b5ff Created calendar service and moved the context menu creation there 2013-03-26 16:03:53 -04:00
Martin Konecny b1160afeab cleanup 2013-03-22 18:05:49 -04:00
Martin Konecny d12f793578 remove potential password change exploit in airtime-demo 2013-03-22 18:05:34 -04:00
denise 6766d208aa CC-4961: Show linking
Removed logic out of edit-show action
Created new SchedulerService
Fixed overlapping show bug
2013-03-21 16:31:05 -04:00
denise a7601d290f CC-4961: Show linking
Refactored services
Removed ShowDaysService and ShowInstanceService
Combined all show actions into one ShowService
2013-03-21 10:05:11 -04:00
denise bae9f1202a CC-4961: Show linking
Removed unused schedule controller actions
Fix bug where changing a show to repeat deletes the original show's content
2013-03-19 10:09:28 -04:00
denise 896e03d76b CC-4961: Show linking
Refactoring all services thus far
2013-03-15 16:56:22 -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
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 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 cc69418215 Merge branch '2.3.x' into devel 2013-03-05 16:21:22 -05:00
Martin Konecny ae503121d8 CC-4984: Exception for replaygain
-fixed
2013-02-28 18:26:15 -05:00
Martin Konecny e08732fba7 CC-4975: airtime-silan cmd error
-fixed
2013-02-25 19:45:26 -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 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
denise ec159131a8 Merge branch '2.3.x' into devel 2013-02-13 16:09:53 -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 4ff1e8e78a CC-4932: Library -> Update Scheduled column on 'Cancel current show' action
-fixed
2013-02-13 11:29:43 -05:00
denise 8124d096d0 Removed log message 2013-02-07 15:56:35 -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 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 909f2c95c4 XSS exploit prevention - audio preview 2013-02-05 17:24:39 -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 e2472f1f5d CC-4913: System -> Media Folder: Exception happens when media folder's path contains '<' 2013-02-04 16:21:56 -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
Martin Konecny 93ec4c001b Merge branch '2.3.x' into devel
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/models/StoredFile.php
2013-02-02 21:07:34 -05:00
denise 8309593a0f CC-4904: Library -> Sort by status doesn't work
- added 2 columns to cc_files (is_scheduled, is_playlist)
- split library status column into two columns (scheduled, playlist)
- is_scheduled gets updated when a track plays out, or when a file gets added/removed from/to a show
- is_playlist gets updated when a file gets added/removed from/to a playlist/block, when a playlist/block gets deleted, or when a playlist/block's contents is cleared
2013-02-01 17:47:07 -05:00
denise 384298f680 CC-4109: Playlist Builder: Add a button to remove all the items in the current editing playlist 2013-02-01 12:06:01 -05:00
denise d4e89df94e CC-4895: Remove all json die() statements from code 2013-01-31 14:06:45 -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
denise 595429e6e5 CC-4897: XSS exploit on library page
-fixed
2013-01-30 11:51:27 -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 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 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 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 091f5ff49f CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
-we know what month will be the initial view for the user.
-Provide this data ahead of time.
2013-01-24 12:13:55 -05:00
Martin Konecny 548b73db42 CC-4873: Airtime takes 7 seconds to load 32K (very small) from db
-remove an unnecessary roundtrip to server
2013-01-23 18:31:45 -05:00
Martin Konecny 5d56341757 baseUrl is set incorrectly for previewing tracks 2013-01-21 19:32:00 -05:00
James dfa392d914 CC-4868: Replay gain modifier is not setting the correct value
- fixed
2013-01-18 17:29:38 -05:00
denise e0efaea0c9 CC-4867: Library -> Audio preview doesnt work with airtime in subdirectory
-fixed
2013-01-18 17:10:52 -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 94a87a0b2e Smart block tooltip content breaks when language setting is not english 2013-01-17 16:19:35 -05:00
denise 796099b413 CC-4860: Library -> Context Menu -> Can't download files
-fixed
2013-01-17 13:37:32 -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 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 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
denise 8ea3aca3a0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-14 14:07:55 -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
James 1666a04451 CC-4826: Please re-push the liquidsoap queue if updating Replay Gain settings
- done
2013-01-14 11:28:48 -05:00
denise 8362860904 Block expansion ajax url was missing baseUrl 2013-01-11 14:11:01 -05:00
James dcf3526000 CC-4384: Remove annoying usage of $CC_CONFIG
- done
2013-01-10 18:09:00 -05:00
James 55fa8b8dc1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-01-10 14:52:45 -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 2797809c74 CC-4786: Refresh page when language setting changes
-done
2013-01-10 13:55:52 -05:00