Commit Graph

3291 Commits

Author SHA1 Message Date
denise 3a7700eaac CC-4583: Use AJAX calls instead of refreshing entire page
-done
2012-10-26 18:09:30 -04:00
denise 0ab1353564 CC-4638: Stream Settings -> Apache error when setting master source port to same port Airtime is running on
-fixed
2012-10-26 18:00:48 -04:00
denise 2527fa2e1a CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 14:42:01 -04:00
denise 7d8079f770 Merge branch '2.2.x' into devel
Conflicts:
	airtime_mvc/application/controllers/ShowbuilderController.php
	airtime_mvc/public/js/airtime/audiopreview/preview_jplayer.js
	airtime_mvc/public/js/airtime/common/common.js
2012-10-19 12:50:36 -04:00
denise a51c3174e0 SAAS-282: Overlap detection prevents creation of a repeating show
-fixed
2012-10-19 12:33:12 -04:00
denise 3b5ec6fbe0 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:46:18 -04:00
Rudi Grinberg 6d1b8fe586 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-19 11:32:42 -04:00
Rudi Grinberg 8d56c03fe3 deep voodoo magic to optimize schedule 2012-10-19 11:32:35 -04:00
Martin Konecny f5051cff3a CC-4605: Some AJAX calls are cached
-fixed
2012-10-19 11:22:44 -04:00
Martin Konecny d5c2c37a3e Revert "CC-4605: Some AJAX calls are cached"
This reverts commit ffca5b42a8.
2012-10-19 11:16:42 -04:00
denise d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00
Martin Konecny e88e3a3df2 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-19 11:07:52 -04:00
Martin Konecny ffca5b42a8 CC-4605: Some AJAX calls are cached 2012-10-19 11:07:37 -04:00
Rudi Grinberg 58d00cb9b9 Formatting sql 2012-10-19 11:05:12 -04:00
denise e9815b617b - added comment 2012-10-18 15:21:38 -04:00
denise 6727bce328 CC-4598: Smart block: cannot save dynamic block with 0.5 hours
-fixed
2012-10-18 15:03:59 -04:00
denise 67ac4340c4 CC-4596: Too many ajax calls in Calendar page
-fixed
2012-10-18 14:47:19 -04:00
denise 99861269e1 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-18 12:10:05 -04:00
denise 6c8c7aa285 CC-4592: Library: Changing fades does not save microseconds
-fixed
2012-10-18 12:09:48 -04:00
Daniel James dc7b609115 CC-4593: Widen container in CSS so label is not truncated 2012-10-18 16:12:51 +01:00
denise 887a86c6a1 CC-4591: Calendar: Cannot change start time for repeating show
-fixed
2012-10-18 10:51:24 -04:00
Daniel James 7c799cd3af Fixed formatting of tooltip for smart blocks 2012-10-18 13:01:55 +01:00
Martin Konecny 7123230eea Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-17 15:28:15 -04:00
Martin Konecny 5fc72d9e51 add function necessary for saas 2012-10-17 15:28:05 -04:00
James 45801e5dc4 - fix spelling of some function name 2012-10-17 15:16:03 -04:00
James c1745145e8 - CRLF fix 2012-10-16 16:25:56 -04:00
James 35c8fe55b4 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-16 16:24:12 -04:00
James 3f1df49221 CC-4572: Adding a playlist to a show in Now Playing page fails, interface greys out
- bug with php 5.3.2 with DateTime::createFromFormat()
- fixed with workaround
2012-10-16 16:22:44 -04:00
denise 2b1db835dd CC-4571: Now Playing delete action does not delete, should be labelled 'Remove from show'
-done
2012-10-16 16:01:05 -04:00
denise 819dcf70fd CC-4579: Edit Metadata: Track number defaults to 0 if it is deleted
-fixed
2012-10-16 15:56:03 -04:00
denise 5d1d68d96b Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-16 15:29:18 -04:00
denise 25c28da761 CC-4550: Track should not be a required field in metadata editor
-fixed
2012-10-16 15:29:05 -04:00
James 562c509939 CC-4570: blockId and blockIndex are visible at top of smart block preview pop-up
- fixed
2012-10-16 14:51:14 -04:00
James cafc5a77d7 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-16 14:38:39 -04:00
James 96da822bc7 CC-4574: Audio preview fails with Zend errors on file with question mark in the title
- fixed
2012-10-16 14:38:24 -04:00
denise e41145b54e Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-16 14:33:56 -04:00
denise 846af50543 CC-4567: Calendar: Exception in zendphp.log when setting a wrong rebroadcast time from repeating show
-fixed
2012-10-16 14:33:45 -04:00
James 67ca0db4c8 CC-4542: Playlists containing dynamic smart blocks cannot be previewed
- fixed
2012-10-16 14:09:34 -04:00
James 75db11d780 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-16 12:07:02 -04:00
James 7796b23a58 CC-4506: Audio Preview in Playlist doesn't work
- fixed
2012-10-16 12:06:47 -04:00
denise fe1d8d51a9 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-16 12:05:24 -04:00
denise b061573d23 CC-4554: Playout History search sticks on 'Processing' message
-fixed
2012-10-16 12:04:52 -04:00
James 8a93717415 CC-4568: Show preview broken in Now Playing page
- fixed
2012-10-16 11:06:01 -04:00
James 9d23e61acc Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-16 10:37:56 -04:00
James 03b32ea986 CC-4563
Library: Exception is found when remove a block by context menu

- fixed
2012-10-16 10:37:42 -04:00
denise 9d3271c03d CC-4562: Calendar: Add Show button is removed after editing a show from regular show to repeating show
-fixed
2012-10-15 15:36:38 -04:00
denise 5ff89eeba2 CC-4561: Can create overlapping shows when rebroadcasting a repeating show
-fixed
2012-10-15 14:19:52 -04:00
Daniel James 095c2c7cc6 CC-4559: More useful tooltip for Find Shows button in Now Playing page 2012-10-15 12:41:39 +01:00
Daniel James a103c76378 CC-4558: Make button in Now Playing consistent with same action in Calendar 2012-10-15 12:27:16 +01:00
denise b79e190d3c -small comment change 2012-10-12 15:42:51 -04:00