f6f23864ce
SAAS-1063: REST API for podcasts
...
/rest/podcast mostly done
2015-09-18 08:15:48 -04:00
2ede56c26d
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-09-16 14:22:34 -04:00
67db2c1d25
SAAS-1063: REST API for podcasts
...
Hierarchy routing is working
Basic implentation of podcast INDEX and POST actions done
2015-09-16 14:22:13 -04:00
7b76c8d6d3
Rename CeleryService to avoid confusion; fix wording and reduce redundancy in task functions
2015-09-15 15:06:03 -04:00
ff24976bed
Fix up celery downloads a bit
2015-09-15 14:21:19 -04:00
c8baa6e4b3
Merge branch 'saas-dev-publishing' into soundcloud
...
Conflicts:
airtime_mvc/application/views/scripts/playlist/playlist.phtml
airtime_mvc/application/views/scripts/playlist/smart-block.phtml
airtime_mvc/public/js/airtime/library/spl.js
2015-09-15 14:03:11 -04:00
dd09676f88
Hide celery user
2015-09-15 13:59:48 -04:00
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
f243014d9f
Merge branch 'saas-dev' into soundcloud
2015-09-08 16:01:06 -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
04333aaa29
SoundCloud download initial commit
2015-07-16 11:27:27 -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
0177e40083
Pull the logic for Media REST API out of the controller
2015-02-19 15:10:01 -05:00
826ae17552
SAAS-580 - Fixed routing issue causing show art to not upload; changed ShowController to be more RESTful
2015-02-04 15:09:27 -05:00
ca9750f415
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/ACL.php
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/build/sql/schema.sql
2015-01-23 11:32:45 -05:00
6ac5a2950f
SAAS-551: Cannot schedule shows due to overlapping show check bug
2015-01-20 11:32:15 -05:00
a27ca2f583
cleanup new HTTP apiendpoints, added HTTPHelper and getStartEndFromRequest and updated all controllers that called their own versions of this function
2015-01-09 13:02:25 -05:00
44b4faf6d9
added shows, show-schedules, show-preview, show-history-feed, item-history-feed endpoints to the HTTP api to be used via NewscoopAirtimePlugin
2015-01-09 13:01:42 -05:00
4d263ce897
Merged 2.5.x into saas
2014-11-05 17:36:58 -05:00
00e85de3c8
Updated preEditShowValidationCheck to behave properly when dealing with shows with cc_show_days rows in the past, updated serialized form data in add-show to accommodate the change
2014-11-05 10:06:59 -05:00
0f3c1914e1
CC-5948 - Fixed bug where user couldn't edit repeating instances of a show while another instance was playing
2014-11-04 18:38:31 -05:00
0196aa21f5
Fixed testcases to account for show image path in and show instance description
2014-10-09 09:39:50 -04:00
0789de9392
Updated Show services to account for added show instance description field
2014-09-19 13:02:38 -04:00
d5f6e8a682
Moved validation workaround for show logo in from Schedule Controller, added check to prevent warning about invalid path in readfile
2014-09-18 16:37:03 -04:00
5dfadf6ecc
Changed check for image deletion
2014-09-18 16:35:32 -04:00
323f53d6ac
Changed data uri method to return empty string instead of malformed uri when given an incorrect path (oddball case)
2014-09-18 10:34:38 -04:00
096556fa74
Added show_logo_name field to data object to avoid deleting current logo when none is being uploaded
2014-09-18 10:32:56 -04:00
c08252bc99
Added function to convert static image file in stor to data URI for display
2014-09-17 19:45:45 -04:00
c4b38043e8
Removed unnecessary image_path field from showData and ccShow object
2014-09-17 19:43:26 -04:00
f64b7d0813
Updated show edit functionality to accommodate uploading new show image
2014-09-17 10:27:14 -04:00
f5a607ad90
Added functionality for deleting saved images when the show is deleted, updating the show image, and returning the showId to be used by ShowController
2014-09-16 18:24:22 -04:00
cb80423fdd
Work on adding image upload to add-show form
2014-09-12 18:05:24 -04:00
a21b4f177d
Fixed a bug where we weren't checking if a variable was empty before using it
2014-09-08 13:14:23 -04:00
6598401266
Fixed a bug where we weren't checking if a variable was empty before using it
2014-09-08 11:48:18 -04:00
20a5649dbe
Removed unused code.
...
Changed linked show warning message in the edit show form.
2014-08-25 18:33:29 -04:00
10cb5484fe
Removed unused function.
...
Removed commented out code.
Renamed fillNewLinkedInstances to fillLinkedInstances.
Streamline show instance content if a show goes from unlinked to linked.
2014-08-25 18:33:15 -04:00
32e06a7456
Clean up and simplifcation of linked show filling
2014-08-25 18:33:00 -04:00
e3596dfed3
Added comments and removed some unused code
2014-08-25 18:32:41 -04:00
29c07f2438
Removed old comments
2014-08-25 18:32:27 -04:00
d81de5c6eb
Better way of getting the linked show schedule and moved that into its own function.
...
Store the ids of the new, created show instances so we can pass them to the
fillNewLinkedInstances function
2014-08-25 18:32:08 -04:00
08e82cb32e
CC-5904: New linked show instances may get an old copy of the schedule
...
Change the way get the show stamp
2014-08-25 18:31:45 -04:00
9a6e617f7c
CC-5904: New linked show instances may get an old copy of the schedule
...
Better way of getting show stamp
Renamed variables
2014-08-25 18:31:33 -04:00
81357bc51f
CC-5904: New linked show instances may get an old copy of the schedule
2014-08-25 18:31:20 -04:00
ee52c7692c
CC-5902: Linked Shows -> Replace content check assumes content of shows have the same number of tracks
...
Conflicts:
airtime_mvc/application/services/SchedulerService.php
2014-08-25 18:30:27 -04:00
afc3d981e8
Commented out unnecessary functions using too much memory
2014-08-25 18:26:46 -04:00
bc63669853
Removed unused code.
...
Changed linked show warning message in the edit show form.
2014-08-21 17:12:54 -04:00
6249deb1ac
Removed unused function.
...
Removed commented out code.
Renamed fillNewLinkedInstances to fillLinkedInstances.
Streamline show instance content if a show goes from unlinked to linked.
2014-08-21 16:40:01 -04:00
11de8bd988
Clean up and simplifcation of linked show filling
2014-08-21 13:39:25 -04:00
2a2b4bd05a
Added comments and removed some unused code
2014-10-15 17:11:38 -04:00
660b1a0596
Removed old comments
2014-08-21 09:47:54 -04:00
4c03e12ea1
Better way of getting the linked show schedule and moved that into its own function.
...
Store the ids of the new, created show instances so we can pass them to the
fillNewLinkedInstances function
2014-08-20 16:37:44 -04:00
4a124a8faf
CC-5904: New linked show instances may get an old copy of the schedule
...
Change the way get the show stamp
2014-08-18 19:27:42 -04:00
3fa15913c0
CC-5904: New linked show instances may get an old copy of the schedule
...
Better way of getting show stamp
Renamed variables
2014-08-18 18:55:03 -04:00
b9ecd00d33
CC-5904: New linked show instances may get an old copy of the schedule
2014-08-18 18:10:45 -04:00
62f8a65573
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
...
Conflicts:
airtime_mvc/application/services/SchedulerService.php
2014-08-18 13:03:22 -04:00
2cfc20d0c1
CC-5902: Linked Shows -> Replace content check assumes content of shows have the same number of tracks
2014-08-18 12:59:43 -04:00
60f4d112e7
Optimized linked shows schedule filling
...
* Fairly big improvement in memory usage and execution time for 24 hour linked
shows (memory usage no longer grows with show length)
2014-08-15 18:18:57 -04:00
f072d60ff1
Optimized linked shows schedule filling
...
* Fairly big improvement in memory usage and execution time for 24 hour linked
shows (memory usage no longer grows with show length)
2014-08-15 18:17:23 -04:00
33f397f577
remove memory usage log statements
2014-08-15 16:25:37 -04:00
f863f4dfcf
More mem usage logs
2014-08-15 15:41:00 -04:00
2bc8f6d403
Logging memory usage
2014-08-15 15:36:13 -04:00
26b210ded9
Commented out unnecessary functions using too much memory
2014-08-15 15:32:52 -04:00
fe8e004d87
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Create and fill show instances when pypo requests the schedule
Changed getCcShowInstancess function to return all instances
Changed some function calls to retrieve only show instances scheduled in the future
2014-08-15 11:07:26 -04:00
520387fcad
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Create and fill show instances when pypo requests the schedule
Changed getCcShowInstancess function to return all instances
Changed some function calls to retrieve only show instances scheduled in the future
2014-08-16 11:05:55 -04:00
66e6c23311
CC-5634: Can add/remove content to a linked show while one instance is currently playing
2014-06-09 12:07:27 -04:00
ee489b39f9
CC-5869: Changing a repeating show to non-repeating and changing start time does not work
2014-06-06 14:51:01 -04:00
e4bb97bcc4
CC-5867: Can't edit show instance
2014-06-06 12:22:59 -04:00
eafbd7d5e9
CC-5838: Editing a repeating show yields in error if an instance is in the past
...
Was not checking if show is repeating properly
2014-05-06 13:01:20 -04:00
14c670aa20
CC-5728: Problem when removing repeat option and changing start date
2014-03-10 17:41:57 -04:00
8ad866c2a2
Fixed changing the start date on a non-repeating show
2014-03-10 17:32:54 -04:00
6b91d2daf8
CC-5725: Changing a show's repeat type removes first instance from repeating series
2014-03-07 14:52:32 -05:00
35fd639c1c
CC-5725: Changing a show's repeat type removes first instance from repeating series
2014-03-06 11:18:13 -05:00
51b5cc2052
CC-5725: Changing a show's repeat type removes first instance from repeating series
2014-03-06 10:54:40 -05:00
426b75b635
CC-5724: Changing start date of a repeating show will update content incorrectly
2014-03-05 14:37:07 -05:00
ebc68b980c
CC-5718: Show content can get scheduled in instances that are in the past
...
Disabled scheduled content into instances that have already played out
Removed setting the show's start date to the first repeating instance's start date
because we already fixed that in CC-5697
2014-03-05 13:12:27 -05:00
7660e0cd84
CC-5719: Incorrect show content start time
...
The show content was getting recalculated twice sometimes.
So if the difference between the original and now show start
date-time and was 2 hours, the scheduled content would have
a difference of 4 hours
2014-03-04 11:29:49 -05:00
753003639f
CC-5696: Two shows or even three shows playing at once. Unstopable even after reboot
...
The problem was that we weren't updating the first show's start time if deleting
a repeat show day changes it. This affected the difference between the original
show start time and the new one.
2014-02-25 17:22:17 -05:00
f1658f6490
CC-5697: Editing a linked show's repeat day sets wrong day for show content
...
Fixed a problem where we can't store the original cc_show_day data
because none can exist at some points. If the user changes the only
repeat day, the cc_show_day rule is deleted first then recreated
2014-02-25 17:16:14 -05:00
3db1cd412a
CC-5697: Editing a linked show's repeat day sets wrong day for show content
...
Optimized how we store the instance ids that already exist
2014-02-25 16:51:48 -05:00
6cd84363a6
CC-5697: Editing a linked show's repeat day sets wrong day for show content
...
Added comment
2014-02-24 16:04:48 -05:00
787f19f69a
CC-5697: Editing a linked show's repeat day sets wrong day for show content
...
When a user edits a show and changes the repeat day, we are really deleting the instances from the original
repeat day and creating new instances. Therefore, we don't need to update the show content's start/end time
in this case.
2014-02-24 14:49:11 -05:00
3b9608a8df
CC-5693: API call to notify-item-start-playing fails because an invalid schedule id is sent
...
Temporary fix for this bug. Throw an exception if no schedule item is found.
2014-02-10 16:19:26 -05:00
b7c79df6ec
Merge branch 'unittests' into 2.5.x
2014-01-31 15:02:41 -05:00
ce7eddf563
CC-5678: Scheduler: Show's contents won't follow show's scheduled time change
...
Fixed by storing original cc_show_day object by value
2014-01-30 12:07:24 -05:00
c9d98e4e10
Small Airtime Pro fix for ShowFormService
2014-01-27 14:31:33 -05:00
d5112f0368
Added comments for a show_service function
2014-01-20 17:05:37 -05:00
0b4ae6b94d
CC-5651: Unit Test the Scheduler
...
Added test for deleting repeating show instances
2014-01-14 14:16:37 -05:00
0f107dbad3
Initial unit test configuration
2014-01-13 11:43:16 -05:00
9e5cfe0d39
CC-5666: Deleting a show instance can revert the 'no end' option
2014-01-13 11:41:44 -05:00
27c3637591
CC-5640: End time does not get updated when editing the current playing show
...
Was checking if the start time was in the past, but we should check if the
end time is in the past. This way you can extend or shrink shows that are currently playing.
2013-12-16 15:27:51 -05:00
0afaeadb15
CC-5641: Can Create Zero or Negative Length Shows
...
* Fixed two underlying causes of zero or negative length shows
that could be created over DST time changes:
- Fixed incorrect end time arithmetic which did not preserve the
show duration.
- Fixed a desynchronization issue due to FullCalendar handling
events over DST differently from Airtime.
2013-12-14 22:38:33 -05:00
d841f11de3
CC-5638: Shows become unlinked when moving the end time back
...
Disabled linked checkbox field in show form while the show is playing
Added a warning message if the user attempts to change this value
Update .po and .mo files with the warning message string
2013-12-13 13:06:14 -05:00
e8a8aeaf00
CC-5636: Php 5.5: Cannot update repeating show's name if that instance is updated
...
Made all show fields readonly when editing a repeating instance
2013-12-13 12:13:58 -05:00
bbccc2e7d3
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-12 17:18:17 -05:00
87ac5dc294
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone
2013-12-12 17:18:03 -05:00
d0474f4247
Changed function title when editing a repeating instance
...
Removed a function call we don't need when editing a repeating instance
2013-12-12 16:47:55 -05:00
f37b9a3796
CC-5634: Can add/remove content to a linked show while one instance is currently playing
...
small logic fix
2013-12-12 13:23:20 -05:00
fb793ff3e1
CC-5634: Can add/remove content to a linked show while one instance is currently playing
...
Fixed by removing option from context menu
2013-12-12 13:01:33 -05:00
67031a75fe
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
2013-12-11 18:56:19 -05:00
9237692782
CC-5630: Shows created on a DST border get scheduled an extra hour longer
...
The show start and end time need to be in the show's local timezone when adding
or subtracting time to the start and end time (in case of DST crossings). In this
case the end time was already converted to UTC when we tried to change the time.
2013-12-11 14:45:16 -05:00
0919915c6b
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2013-12-09 16:27:06 -05:00
310cfddd3a
CC-5626: Context menu -> Edit -> Doesn't populate show forms properly
2013-12-09 14:53:58 -05:00
0f28e0f1aa
Merge branch '2.5.x' into cc-5594-date_default
2013-12-06 18:18:17 -05:00
drigato
Duncan Sommerville
Duncan Sommerville
Albert Santoni
Mark Lewis
Naomi