Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
9,694 Commits 18 Branches 28 Tags 437 MiB
Commit Graph

9694 Commits

Author SHA1 Message Date
Martin Konecny 77b430ce01 CC-4564: Webstream Book same webstream twice in Scheduler, the 2nd one doesn't get played 
-fixed
 2012-10-19 15:14:52 -04:00
denise 2527fa2e1a CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 14:42:01 -04:00
James 3ecde35b7c Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-19 14:28:14 -04:00
James 1146e1f269 CC-4215: Smart Playlist: Exception happens when generate with criteria Length is 2012-08-10 14:00:00 
- fixed
 2012-10-19 14:27:57 -04:00
Martin Konecny 0268c3d261 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-19 14:20:22 -04:00
Rudi Grinberg 96ff440435 Removed space 2012-10-19 14:18:34 -04:00
denise 7356d4fe89 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-19 13:42:41 -04:00
denise 8f998fd2c8 CC-4595: Fade in/out setting doesn't work 
-fixed
 2012-10-19 13:42:24 -04:00
Rudi Grinberg 671802d658 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-19 13:24:14 -04:00
Rudi Grinberg 57ef1c20ac Removed trailing whitespace 2012-10-19 13:24:06 -04:00
Rudi Grinberg a1e653b41f Deep optimization 2012-10-19 13:22:00 -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
Martin Konecny ee89ac6603 CC-4589: Small inconsistency in config files after upgrade 2012-10-19 12:16:04 -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
Martin Konecny d838d8ae30 update version number in VERSION 2012-10-18 17:34:37 -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 ae3ff3dd91 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-18 14:47:29 -04:00
denise 67ac4340c4 CC-4596: Too many ajax calls in Calendar page 
-fixed
 2012-10-18 14:47:19 -04:00
Martin Konecny daa7e8d263 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-18 14:29:06 -04:00
Martin Konecny 9444fc3418 invalid sql statement that was deleting cc_schedule on upgrade 2012-10-18 14:28:52 -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 e01f86c377 CC-4588: Airtime 2.2 upgrade does not upgrade "list_all_db_files" correctly 
-fixed
 2012-10-17 16:45:03 -04: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
Rudi Grinberg 07968e9db1 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-16 18:36:04 -04:00
Rudi Grinberg 893f9509fa cc-4556: fixed 2012-10-16 18:35:56 -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