b26d4833fe
Merge branch 'saas' into saas-dev
2015-09-09 18:47:53 -04:00
2296aab8d5
Fix bug where show logo was removed when deleting an instance of a repeating show
2015-09-09 18:47:43 -04:00
63f563f06d
Fix calendar context menu word wrapping
2015-09-02 11:22:24 -04:00
46e126145e
CC-6122 - change library behaviour for guest users
2015-09-01 13:53:59 -04:00
b2edaa8668
Merge branch 'saas' into saas-showbuilder
2015-08-28 13:07:00 -04:00
17074e5f70
SAAS-1032: Shows with missing show art on disk can't be edited
2015-08-28 12:28:34 -04:00
294298c9bf
CC-6096, CC-6093 - update calendar context menu and usability hint wording; bugfixes
2015-08-27 16:59:21 -04:00
dd5d6342a7
Merge branch 'saas-dev-usability-hints' into saas-dev
2015-07-16 11:00:04 -04:00
ffb55de566
SAAS-922 take 2
2015-07-15 13:12:56 -04:00
66caf2574a
CC-6064: Allow shows to be started "now"
2015-07-14 10:35:21 -04:00
721cd5a31b
SAAS-924: Cannot edit repeating show if first instance has ended
...
Added safeguard in case we don't find a future show instance
2015-07-13 09:04:49 -04:00
1b3a9f6e6a
SAAS-924: Cannot edit repeating show if first instance has ended
...
Reverted old behaviour where we set the show start and end date/time to
the next repeating instance start and end.
2015-07-09 12:18:21 -04:00
5cc8774e56
Merge branch 'saas-dev' into soundcloud
...
Conflicts:
airtime_mvc/application/configs/constants.php
2015-06-29 10:02:58 -04:00
5fe70754bd
Replace all timestamp strings with constant
2015-06-26 14:42:52 -04:00
881471c6b8
SAAS-793 - Prevent show image upload when editing single instance of a repeating show
2015-06-26 14:23:45 -04:00
d91b05a0ae
SoundCloud - Add release_year metadata field and set default sharing and license types
2015-06-25 10:53:35 -04:00
67155b136a
Add downgrade action to UpgradeController, fix SoundCloud schema and bugs
2015-06-24 18:38:04 -04:00
adff664e87
Fix sending null fields to SoundCloud
2015-06-24 16:13:04 -04:00
e44e0de534
Add fields to SoundCloud upload
2015-06-24 15:46:53 -04:00
d48e594dcd
Fix upload to SoundCloud button remaining disabled after upload failure
2015-06-23 19:02:28 -04:00
70f6cbbc71
Fixes to airtime-celery setup
2015-06-23 15:10:02 -04:00
76a7aa9a24
Fix SoundCloud and TaskManager bugs, switch tasks to use acks_late, and provide feedback from SoundCloud context menu items
2015-06-18 18:18:48 -04:00
de184d761e
Rename variable
2015-06-18 13:49:25 -04:00
6439bc9ad5
Add timestamp on SoundCloud upload success
2015-06-18 13:32:43 -04:00
02e0537be9
Merge branch 'saas-dev' into soundcloud
2015-06-18 13:29:59 -04:00
e033360a4e
Fix error when deleting SoundCloud tracks
2015-06-16 16:21:31 -04:00
8d2e476ff1
SAAS-868 - Refactor third party + celery workflow, implement locking on TaskManager
2015-06-16 15:10:08 -04:00
3902c8c746
Add SoundCloud delete functionality and fixes; implement TaskManager to run background jobs
2015-06-15 15:12:37 -04:00
b4c9a77e7c
CC-6055: Improved escaping
2015-06-12 13:48:54 -04:00
c1b5b53a16
Fix merge errors; use Celery status messages + handle fail case better
2015-06-10 17:11:42 -04:00
626489bb3b
SAAS-853 - Celery backend for SoundCloud uploads
2015-06-10 15:04:49 -04:00
49165e91d9
SAAS-854 - celery-based SoundCloud backend uploader
2015-06-09 14:02:29 -04:00
63b726e6b2
SAAS-848 - Modify SoundCloud code to use external redirect
2015-06-04 11:38:46 -04:00
b0b6e037ac
CC-6046, CC-6045, CC-6047 - New SoundCloud implementation
2015-06-03 16:57:17 -04:00
612aa37738
Merge branch 'saas' into saas-dev
2015-05-13 19:32:53 -04:00
77241bb6fc
Merge branch '2.5.x' into saas
2015-05-11 14:57:58 -04:00
2953576921
CC-5997: Tracks get scheduled outside of the show start and end time
2015-05-11 14:57:20 -04:00
21886a509d
Merge branch '2.5.x' into saas
2015-05-11 12:18:09 -04:00
28997344fc
CC-5997: Tracks get scheduled outside of the show start and end time
2015-05-11 12:16:32 -04:00
e78bd82c8c
SAAS-749, SAAS-753 - Fix for odd linked and repeating show behaviour
2015-04-30 14:14:56 -04:00
1c2a307d34
Fixed a repeating show bug
...
If the first instance has already started or ended we were getting the
wrong next instance because the result set was not ordered
2015-04-15 10:50:16 -04:00
3b33f55652
Fixed a repeating show bug
...
If the first instance has already started or ended we were getting the
wrong next instance because the result set was not ordered
2015-04-15 10:48:31 -04:00
3e2cd54be7
Fixed double sending of headers problem with S3 cache
2015-04-01 17:29:21 -04:00
d31de0937f
Refactored file storage code slightly to allow multiple download URLs
2015-03-30 11:31:07 -04:00
bfd6ef72b1
Fixed download URLs for non-cloud files
2015-02-26 11:29:08 -05:00
3a1141d4c8
Merge branch 'saas' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
airtime_mvc/application/controllers/ApiController.php
2015-02-25 13:02:11 -05:00
903de66349
Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
airtime_mvc/application/configs/conf.php
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/models/airtime/CcFiles.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/application/services/MediaService.php
2015-02-20 16:52:00 -05:00
84f0f135ef
More refactoring: Allow files to be imported from disk directly
2015-02-20 16:36:36 -05:00
2e2c3d6276
Merge of cc-5709-airtime-analyzer-saas-refactor into saas
2015-02-20 14:27:16 -05:00
2a89e4d5a0
Massive refactor of the analyzer branch and sync it back up with the
...
cloud storage branch (for the last time)
* Backported all the bugfixes from cc-5709-airtime-analyzer-cloud-storage
* Backported missing FileStorageBackend.php
* Fixed CC-6001: Track titles and artist names with slashes break audio preview
* Refactored all the MediaController code, pulling out the logic into MediaService
* Fixed an API key leak to guests in the Media API
* Made this branch work without cloud_storage.conf (defaults to file storage)
* Made ApiController's getMediaAction use the MediaService code
2015-02-20 14:01:06 -05:00
Duncan Sommerville
Duncan Sommerville
Albert Santoni
drigato