Commit Graph

3412 Commits

Author SHA1 Message Date
denise 5b14c4fe88 CC-4656: Library -> No error message when a dj tries to delete smart blocks and webstreams they do not own
-fixed
2012-10-31 17:19:27 -04:00
denise 2507e0f8a4 CC-4655: DJ's can delete files that they do not own
-fixed
2012-10-31 16:51:29 -04:00
denise fc613aa597 CC-4604: Edit Metadata: DJ's cannot edit metadata on their own files
-fixed
2012-10-31 16:01:17 -04:00
denise dfd52eedf1 CC-4654: Library -> Simple search still has effects even if you are doing an advanced search
-fixed
2012-10-31 15:24:50 -04:00
denise cc40dfdf4e CC-4641: Now Playing: Extending show's length won't change the overbooked track's style
-added comment
2012-10-31 14:16:16 -04:00
denise 71be2b2bd1 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-31 12:36:56 -04:00
denise fd0e1c3c95 CC-4641: Now Playing: Extending show's length won't change the overbooked track's style
-fixed
2012-10-31 12:36:45 -04:00
james 2e4d5ec142 CC-4539: Advanced search: Sample rate searched on Hz, but search results
shown in kHz

- fixed
2012-10-31 12:32:40 -04:00
james 9293a26738 CC-4639: Give an option to allow smart blocks to reuse tracks if not enough
tracks meet the time limit

- code optimazation
2012-10-31 12:05:17 -04:00
James 1899d588ee - CRLF fix 2012-10-30 18:03:03 -04:00
James cbee9422ec Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-30 17:58:16 -04:00
James 9d495ebc03 CC-4639: Give an option to allow smart blocks to reuse tracks if not enough tracks meet the time limit.
- done
2012-10-30 17:57:58 -04:00
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
denise 00947f9d7e CC-4640: Automatically jump to current song when loading the Now Playing page.
-small fix
2012-10-30 15:34:38 -04:00
denise 5f03a38262 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-30 15:04:08 -04:00
denise cabe583a3b CC-4649: Library -> Disable simple search if advanced search fields are open
-done
2012-10-30 15:01:46 -04:00
James ef68680868 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-30 13:23:23 -04:00
James 3e60ac4393 remove \r line endings 2012-10-30 13:23:09 -04:00
denise acc3ccca22 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-30 13:03:05 -04:00
denise b8039e315a CC-4577: Webstream UI: little improvement about 'SAVE' button and input boxes for URL and length
-done
2012-10-30 13:02:55 -04:00
James bba7975882 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-30 12:36:59 -04:00
James 5061dfa05d CC-4647: apache error log entries
- fixed
2012-10-30 12:36:50 -04:00
denise 71291b14f0 CC-4646: Library: Make advanced search options hidden by default
-done
2012-10-30 11:59:52 -04:00
denise 695c0fa926 CC-4607: Library: Please make the 'Add x items' following mouse's point
-fixed
2012-10-30 11:45:53 -04:00
denise 51de436fd5 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-30 11:18:18 -04:00
denise b08f5091b5 CC-4609: Calendar -> Add/Remove contents: Please remove useless buttons: 'Jump to current playing song' and 'Cancel current show'
-done
2012-10-30 11:18:11 -04:00
Rudi Grinberg 7276985bb4 test commit 2012-10-29 19:19:48 -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
denise d97afabaea CC-4640: Automatically jump to current song when loading the Now Playing page.
-added check to see if a show is currently playing
2012-10-29 15:40:58 -04:00
denise 332f9993c0 CC-4640: Automatically jump to current song when loading the Now Playing page.
-done
2012-10-29 15:20:16 -04:00
denise fdd889d7a8 - fixed formatting 2012-10-29 12:09:11 -04:00
denise 8ac0f41987 CC-4590: New smart block says 'Empty playlist'
-fixed
2012-10-29 11:57: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
James e667a721ad - comment for some code 2012-10-26 16:26:48 -04:00
James 1ee228558a CC-4574: Audio preview fails with certain characters in metadata
- fixed
2012-10-26 16:24:17 -04:00
Rudi Grinberg dc361c1136 Aligned constants 2012-10-26 13:10:08 -04:00
Martin Konecny c1b2978fba disable rabbitmq status on SaaS 2012-10-25 17:50:43 -04:00
denise.rigato bec021fcb6 - live chat was appearing in smart block preview window 2012-10-24 10:46:34 -04:00
James 6231998cc0 Merge branch '2.2.x-saas' of dev.sourcefabric.org:airtime into 2.2.x-saas 2012-10-23 18:47:44 -04:00
James b8d6132b52 - saas patch #1 2012-10-23 18:47:15 -04:00
Martin Konecny 1ed8d37e12 Merge branch '2.2.x-saas' of dev.sourcefabric.org:airtime into 2.2.x-saas 2012-10-23 17:53:43 -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 a4d91a5d48 CC-4620: Now Playing page loading is very slow because 1M records in cc_schedule table
-small fix
2012-10-23 17:44:06 -04:00
denise 9cd389d16b Merge branch '2.2.x-saas' of dev.sourcefabric.org:airtime into 2.2.x-saas 2012-10-23 16:50:36 -04:00
denise 70ed5548b9 -chat box was appearing in playlist-preview window 2012-10-23 16:50:25 -04:00
Martin Konecny 3c61b39daa Merge branch '2.2.x' into 2.2.x-saas
Conflicts:
	airtime_mvc/application/Bootstrap.php
2012-10-23 16:09: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 c74354b6f9 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-23 12:24:53 -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 50d09d09d3 cc-4304: fixed ticket by deleting playlists when user is deleted. also removed useless index on file_exists 2012-10-23 12:08:01 -04:00
Martin Konecny 8b9b005708 CC-4612: Create index for cc_schedule during upgrade to improve the performance when cc_schedule's getting bigger
- also create one during fresh install
2012-10-22 17:29:26 -04:00
denise 9ddd54ec12 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-10-22 16:37:19 -04:00
denise c51fb8a040 CC-4549: Tooltip for source username cannot be shared between input and output settings
-fixed
2012-10-22 16:37:06 -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
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
denise f30d636b17 CC-4581: Confirmation dialog for removing an item from a show refers to deletion 2012-10-19 16:19:32 -04:00
denise b4264f83e8 CC-4608: Chat Box is gone on sourcefabric.airtime.pro 2012-10-19 15:45:14 -04:00
denise d23ba12aaa CC-4608: Chat Box is gone on sourcefabric.airtime.pro
-fixed
2012-10-19 15:42:09 -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
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
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 a51c3174e0 SAAS-282: Overlap detection prevents creation of a repeating show
-fixed
2012-10-19 12:33:12 -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
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
James 4ad8ee2472 - removing a line for saas 2012-10-18 14:32:56 -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