James
|
da873b321b
|
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
|
2012-10-22 15:35:20 -04:00 |
James
|
b7b849a48f
|
CC-4612: Create index for cc_schedule during upgrade to improve the performance when cc_schedule's getting bigger
- fixed
|
2012-10-22 15:35:01 -04:00 |
Rudi Grinberg
|
feac48a003
|
cc-4613: fixed
|
2012-10-22 15:34:33 -04:00 |
Rudi Grinberg
|
e0402c88cf
|
cc-4613: fixed
|
2012-10-22 15:20:03 -04:00 |
Rudi Grinberg
|
d9932dc542
|
Removed gevent
|
2012-10-22 15:05:38 -04:00 |
Rudi Grinberg
|
32ce685e0e
|
gevent ain't working so it's cut
|
2012-10-22 12:52:47 -04:00 |
Rudi Grinberg
|
75ba2d8e90
|
Added gevent magic.
|
2012-10-22 12:14:36 -04:00 |
Rudi Grinberg
|
0084f8ce93
|
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
|
2012-10-19 17:48:47 -04:00 |
James
|
e80328dd57
|
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
|
2012-10-19 17:31:19 -04:00 |
James
|
a9df8cd7f2
|
CC-4610: Creating recording show will generate lots of exception in zendphp.log
- fixed
|
2012-10-19 17:30:54 -04:00 |
Martin Konecny
|
b59d71aa4f
|
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
|
2012-10-19 16:49:11 -04:00 |
Martin Konecny
|
ef78cefcd9
|
CC-4487: Webstream could not be heard unless you restart playout as well
-cleanup of unused variables
|
2012-10-19 16:49:01 -04:00 |
James
|
2bab46a12e
|
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
|
2012-10-19 16:40:49 -04:00 |
James
|
58535bef88
|
CC-4580: No contents in rebroadcast show
- fixed
|
2012-10-19 16:40:32 -04:00 |
Martin Konecny
|
bd5fef0bcd
|
CC-4487: Webstream could not be heard unless you restart playout as well
-fixed
|
2012-10-19 16:29:31 -04:00 |
denise
|
f30d636b17
|
CC-4581: Confirmation dialog for removing an item from a show refers to deletion
|
2012-10-19 16:19:32 -04:00 |
Martin Konecny
|
9dfee6aa68
|
CC-4564: Webstream: Book same webstream twice in Scheduler, the 2nd one doesn't get played
-fixed
|
2012-10-19 15:39:45 -04:00 |
Martin Konecny
|
1d4b905572
|
CC-4564: Webstream Book same webstream twice in Scheduler, the 2nd one doesn't get played
-small syntax error in last commit
|
2012-10-19 15:18:48 -04:00 |
Martin Konecny
|
b7de6a1e72
|
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
|
2012-10-19 15:15:01 -04:00 |
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 |