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

4163 Commits

Author SHA1 Message Date
denise 3d61a18261 CC-5082: Repeating shows "disappear" when switching calendar to next month 
Small fix. Was treating object as an array
 2013-05-01 14:42:53 -04:00
denise ded8ceb86b CC-5082: Repeating shows "disappear" when switching calendar to next month 
We were trying to call a function on an object that was not set
 2013-05-01 14:40:33 -04:00
Naomi 2b5a8b0d4b CC-2301 : fixing changed function name after merging with master. 2013-05-01 11:41:07 -04:00
denise 5ba5864d8c CC-5078: Wrong start time if dragging dynamic smart block into a show 2013-05-01 11:29:32 -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 f82659d582 CC-2301 : stopping playlist editor to make sure audio isn't stuck playing in the background. 2013-04-30 17:03:40 -04:00
Naomi 2a1ac0ddb9 CC-2301 : updating playlist offsets in playlist builder to reflect crossfade overlaps. 2013-04-30 16:27:31 -04:00
denise ff2fde0173 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-04-30 15:54:20 -04:00
denise ec2f36efa8 CC-5077: Calendar -> Context menu -> Show Content -> shows incorrect time filled on edited repeat instances 
- We weren't updating the time_filled column in cc_show_instances when creating the new show
 2013-04-30 15:54:04 -04:00
Naomi 2462e4f144 CC-2301 : CRLF fix. 2013-04-30 15:34:20 -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
Martin Konecny decb12f6b8 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-04-30 15:00:45 -04:00
Martin Konecny de4934a317 ensure that uploaded file is UTF-8 encoded 2013-04-30 15:00:31 -04:00
denise 4ca60ca676 CC-5074: Editing a linked instance sets incorrect schedule start times 2013-04-30 13:58:03 -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 58957cc919 CC-2301 : running dos2unix on 3 files. 2013-04-29 17:01:08 -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 1384c5d39d Function call was missing an argument 2013-04-29 15:57:59 -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
Naomi ef100f89f1 CC-2301 : not drawing fades of length zero. 2013-04-26 17:54:37 -04:00
Martin Konecny 3a931f27bf CC-4417: Opus codec support 2013-04-26 17:54:29 -04:00
Naomi 0169c01724 CC-2301 : updating waveform code for states 2013-04-26 16:23:46 -04:00
denise a5264aac1e CC-4961: Show linking 2013-04-26 16:10:01 -04:00
Naomi a4731d4af2 CC-2301 : automatically updating the fadein/fadeout for a track in the fadein/fadeout states. 
Can enable states on a per track basis.
 2013-04-26 15:57:02 -04:00
Martin Konecny 6cc366b100 CC-5069: 
Airtime 2.4 upgrade scripts

-initial commit
 2013-04-26 13:43:40 -04:00
denise 52655ab375 CC-4961: Show linking 2013-04-26 13:43:30 -04:00
Naomi 628af95325 CC-2301 : needed to adjust cueout if length information is inaccurate. 2013-04-26 12:38:13 -04:00
Naomi 2b22828e85 CC-2301 : destorying dialogs instead of just closing to free up resources. 2013-04-25 17:48:35 -04:00
Naomi 8fea97d580 CC-2301 : fade editor now loads currently set fades. Fixing some bugs in the waveform editor. 2013-04-25 17:10:37 -04:00
denise 0f1383d541 CC-4961: Show linking 2013-04-25 09:00:37 -04:00
Naomi 0deaee4d0e CC-2301 : disallowing movement of first track in fade editor. 2013-04-24 15:32:48 -04:00
Martin Konecny 0e3b4da52f clear unused function 2013-04-24 15:17:06 -04:00
Naomi 179621d687 CC-2301 : fades editor is loading now with a leftoffset for the second track and the cues for both tracks. 2013-04-24 14:15:07 -04:00
Naomi 956bcccd24 CC-2301 : creating different states for the fade editor: 
cursor, fadein, fadeout.
 2013-04-23 16:36:35 -04:00
Martin Konecny 8f6b583fcb CC-5061: 
Use propel transactions for StoredFile class
 2013-04-19 20:40:31 -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 923f4ee180 CC-5062: 
Add "error" logging level

-done
 2013-04-19 20:11:33 -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
denise a9b5d00d87 CC-4961: Show linking 2013-04-18 16:12:26 -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 04a0d9c54e CC-2301 : waveform editor 
current cues being set.
 2013-04-17 18:00:16 -04:00
Naomi 0d3c0912ba CC-2301 : Waveform Editor 
Cue editor can save values to the playlist.
 2013-04-17 17:17:39 -04:00
Naomi 0385285741 CC-2301 : waveform editors are now in their own separate pop up. controls working for fades/cues. should add more specific states for fade editor. 2013-04-16 17:24:30 -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 1a2a05c3cf CC-4961: Show linking 2013-04-12 16:34:36 -04:00
denise 9b4a0ba9c1 CC-4961: Show linking 
Removed stamp tables
 2013-04-12 10:52:13 -04:00
Martin Konecny d46fef8eda SAAS-301: Calendar content indicator did not update automatically after adding content to a show 
-fixed
 2013-04-11 15:11:20 -04:00
Martin Konecny 3714f83757 Merge branch '2.3.x' 2013-04-11 15:06:21 -04:00
Martin Konecny 5cd6dd907b Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-04-11 15:04:29 -04:00
Martin Konecny 3000f543d8 SAAS-301: 
Calendar content indicator did not update automatically after adding content to a show

-fixed
 2013-04-11 15:04:16 -04:00
Daniel James a7cdaa9629 Updated translation files against current strings 2013-04-11 18:20:25 +01:00
Daniel James 1bb5f171a8 Updated Canadian localization, eh? :-) 2013-04-11 17:05:33 +01:00
Daniel James de6ccd9c72 Updated US English localization 2013-04-11 17:02:53 +01:00
Martin Konecny 0da0e798c6 make password input width same as text input width. Also make everything a little wider. 2013-04-10 18:19:46 -04:00
denise 9b2fb3bece CC-4961: Show linking 2013-04-09 15:55:18 -04:00
denise e64f6fb3fd CC-4961: Show linking 
-modified db
 2013-04-08 14:43:27 -04:00
denise 76bfce21b1 CC-4961: Show linking 
-modified db
 2013-04-08 14:42:37 -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
denise 62d1b22fcc CC-4961: Show linking 
created new cc_show_stamp table
 2013-04-05 12:27:54 -04:00
denise f9d7167638 CC-4961: Show linking 2013-04-04 16:30:33 -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 b40306cb1b Add comment to schema.xml to indicate what the broadcasted column is of cc_schedule 2013-04-03 16:21:30 -04:00
denise 81dbb17922 CC-4961: Show linking 
-moved show deletion into show service
 2013-04-03 11:46:46 -04:00
Martin Konecny 563f5b64d2 Merge branch '2.3.x' into devel 
Conflicts:
	debian/postinst
 2013-04-02 12:31:48 -04:00
Daniel James 860524a873 Added locales for English localizations 2013-04-02 17:19:48 +01:00
Daniel James ebbb9f1b9c Added Austrian German localization, thanks Hoerich! 2013-04-02 17:06:16 +01:00
Martin Konecny 5ac51e289d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-04-01 19:15:02 -04:00
Martin Konecny 6ae8da98e4 removing logging 2013-04-01 19:14:55 -04:00
denise ab10ae68a2 CC-5036: Add back edit show instance functionality 2013-04-01 14:42:35 -04:00
denise 1eba09fc4c Show linking 2013-03-28 16:19:05 -04:00
denise d0691b114c Show linking 2013-03-28 14:25:40 -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 894887bd62 Merge branch '2.3.x' into devel 2013-03-26 15:02:17 -04:00
denise 230d1a6aa9 Fixed bug where shows weren't populating when moving forward in the calendar 2013-03-26 10:33:06 -04:00
denise ef8f87df5d Show linking 2013-03-25 16:28:53 -04:00
denise 5b69761833 CC-4961: Show linking 
Populate repeat show form correctly when a show is repeating monthly
on the same day of the week
 2013-03-25 13:48:11 -04:00
Martin Konecny 265ac49f2e remove duplicate cc_config 2013-03-24 23:11:55 -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 327d0dd6c9 CC-4961: Show linking 
Add front-end for creating a show with monthly repeats on same day of week
 2013-03-22 15:57:15 -04:00
denise 187e49e4b2 CC-4961: Show linking 
Added back-end functionality for creating monthly repeating shows on
the same day of the week
 2013-03-22 14:57:02 -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 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