Commit graph

1607 commits

Author SHA1 Message Date
Martin Konecny
9b77007e03 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-30 17:19:51 -04:00
Martin Konecny
8c90c1a12f CC-4645: Add support for x-scpls playlist types
-fixed
2012-10-30 17:19:40 -04:00
James
5061dfa05d CC-4647: apache error log entries
- fixed
2012-10-30 12:36:50 -04:00
James
5651dbce56 CC-4644: Exception from zendphp.log
- fixed
2012-10-29 16:37:27 -04:00
James
a937aa0e28 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-29 16:19:39 -04:00
James
4861397872 CC-4644: Exception from zendphp.log
- fixed
2012-10-29 16:19:23 -04:00
Rudi Grinberg
dc00528cd5 Merged baseUrl related conflicts 2012-10-29 11:56:20 -04:00
Rudi Grinberg
d6a4f2f713 Cleaned up soundcloud 2012-10-26 18:45:27 -04:00
James
f14320a769 CC-4603: Dynamic Smart Blocks: adding to multiple shows at once generates the same content
- fixed
2012-10-26 17:15:39 -04:00
Martin Konecny
4daaa776e2 CC-4620: Now Playing page loading is very slow because 1M records in cc_schedule table
-fixed
2012-10-23 17:45:55 -04:00
Martin Konecny
2d6be404d4 cc-4304: fixed ticket by deleting playlists when user is deleted. also removed useless index on file_exists
-regen propel files
2012-10-23 13:45:15 -04:00
james
dff5bb4e2b CC-4620: Now Playing page loading is very slow because 1M records in cc_schedule table
- fixed
2012-10-23 12:24:38 -04:00
Rudi Grinberg
abf4319d67 Removed logging 2012-10-22 15:55:24 -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
0084f8ce93 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-19 17:48:47 -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
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
denise
2527fa2e1a CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 14:42:01 -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
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
Rudi Grinberg
8d56c03fe3 deep voodoo magic to optimize schedule 2012-10-19 11:32:35 -04:00
denise
d32495d100 CC-2184: Hardcoded CSS path should be relative path instead 2012-10-19 11:09:34 -04:00
Rudi Grinberg
58d00cb9b9 Formatting sql 2012-10-19 11:05:12 -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
6c8c7aa285 CC-4592: Library: Changing fades does not save microseconds
-fixed
2012-10-18 12:09:48 -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
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
819dcf70fd CC-4579: Edit Metadata: Track number defaults to 0 if it is deleted
-fixed
2012-10-16 15:56:03 -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
denise
8f5830757f CC-4553: Calendar: Can create overlapping show by repeat show's instances
-fixed
2012-10-12 14:26:54 -04:00
denise
5f35336fd0 CC-2295 Improvements to playlist builder beha...CC-2303 Cue-in Cue-out inconsistency with time values:
-fixed
2012-10-11 11:49:04 -04:00
denise
dc410f4289 CC-4528: Calendar: Can drag and drop current show into past (it's forbidden to set it by editing show)
-fixed
2012-10-09 14:20:00 -04:00
Rudi Grinberg
5a0df2b6d5 Adde TODO's 2012-10-03 12:01:24 -04:00
Rudi Grinberg
1ae7784331 Added TODO 2012-10-03 11:59:02 -04:00
Rudi Grinberg
2deceaa5fb comment formatting 2012-10-03 11:58:21 -04:00
denise
f94c4cd96a CC-4515: Calendar: Errors for editing recording show
-fixed
2012-10-03 11:13:41 -04:00
denise
1b0dd13eac CC-4521: Playlist Builder: Cannot set fades
-fixed
2012-10-02 15:38:05 -04:00
denise
aede8e8efa CC-4520: Playlist Builder: Cannot set cue in
-fixed
2012-10-02 15:35:49 -04:00
Rudi Grinberg
4ff267ee8a removed z 2012-09-19 17:45:03 -04:00