Commit Graph

3718 Commits

Author SHA1 Message Date
Duncan Sommerville 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
drigato 1d3180cc80 CC-5932: Update is_scheduled query is too slow
Forgot to remove some debugging statements
2014-10-28 10:29:25 -04:00
drigato eae1b4e17c CC-5932: Update is_scheduled query is too slow 2014-10-28 10:25:40 -04:00
Duncan Sommerville d4e8eed51d Marked old functions for API calls as deprecated 2014-10-27 15:52:58 -04:00
Duncan Sommerville e6cf1c7cb9 Updated occurrence of GetPlayOrderRange to use old version for backwards compatibility 2014-10-27 15:52:14 -04:00
Duncan Sommerville e6b9a71d00 Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x 2014-10-24 15:12:17 -04:00
Duncan Sommerville 598b18b65a Added live-info-v2 and station metadata api calls 2014-10-24 15:11:27 -04:00
Robert Elder f29f30e3ac Include base_dir in session namespaces. 2014-10-22 14:37:47 +00:00
Robbt fe291cdc8c Added sort tracks by upload time to smart blocks criteria 2014-10-19 23:02:40 -04:00
dpsommer 5cc93eac3c Merge pull request #68 from RobertElder/session
Regenerate session ids.
2014-10-07 10:10:41 -04:00
dpsommer 9a21b99fdf Merge pull request #70 from RobertElder/more-tokens
More tokens
2014-10-07 10:10:14 -04:00
Robert Elder 185d84dc01 Increase the time token is valid for in case of long uploads. 2014-10-03 02:18:04 +00:00
Robert Elder feff7f4343 tokens for multipart data upload. 2014-10-02 02:04:03 +00:00
Robert Elder 5c69eda010 Tokens for Stream Settings page. 2014-10-01 20:55:07 +00:00
Robert Elder 29b05343bd Tokens for add User. 2014-10-01 19:36:36 +00:00
Robert Elder dbed915469 Tokens for preferences form. 2014-10-01 19:36:17 +00:00
Robert Elder 2be4a5f9d0 Add form tokens to several forms. 2014-09-30 23:09:27 +00:00
Robert Elder 78cc43d33d Regenerate session ids. 2014-09-29 22:48:52 +00:00
drigato 3c797c044a Undoing make API on by default for now. This needs to be done in the db 2014-09-19 15:41:55 -04:00
drigato 66b97158b7 Make API on by default - fix 2014-09-19 15:30:06 -04:00
drigato 28399b70cc Make API on by default 2014-09-19 14:57:43 -04:00
drigato 2729202dc4 Corrected japanese locale from ja to ja_JP 2014-09-12 16:29:47 -04:00
Albert Santoni f7b6e3379e Enable Japanese locale 2014-09-08 20:49:08 -04:00
drigato 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
Albert Santoni 4c1e6d3fe3 Fixed base URL
Conflicts:
	airtime_mvc/application/controllers/LocaleController.php
2014-09-04 17:09:09 -04:00
Albert Santoni 716cc5a754 Disable the APC cache for Ubuntu 14.04. APC is deprecated now so we need a better solution anyways. 2014-08-27 18:51:06 -04:00
Albert Santoni d1971b6d2b Remove cc_locale table and add Selenium running script
* Fixes CC-5906
2014-08-26 13:32:35 -04:00
drigato 20a5649dbe Removed unused code.
Changed linked show warning message in the edit show form.
2014-08-25 18:33:29 -04:00
drigato 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
Albert Santoni 32e06a7456 Clean up and simplifcation of linked show filling 2014-08-25 18:33:00 -04:00
drigato e3596dfed3 Added comments and removed some unused code 2014-08-25 18:32:41 -04:00
drigato 29c07f2438 Removed old comments 2014-08-25 18:32:27 -04:00
drigato 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
drigato 57c1e76dc7 Added criteria parameter to CcShow->getFutureInstanceIds so we can retrieve results from database instead of cache 2014-08-25 18:31:58 -04:00
drigato 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
drigato 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
drigato 81357bc51f CC-5904: New linked show instances may get an old copy of the schedule 2014-08-25 18:31:20 -04:00
drigato 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
drigato afc3d981e8 Commented out unnecessary functions using too much memory 2014-08-25 18:26:46 -04:00
Albert Santoni 192c4e884f Bugfix in LocaleController 2014-08-25 18:19:11 -04:00
Albert Santoni c55a3a4d74 Use SSL with Recaptcha to fix it 2014-08-25 18:19:00 -04:00
Albert Santoni 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
drigato 7bd443f668 CC-5898: Future repeating shows may not get generated and/or filled with content
Commented function
2014-08-15 11:09:05 -04:00
drigato 20bd2ad9d5 CC-5898: Future repeating shows may not get generated and/or filled with content
Refactored show creation into separate function
2014-08-15 11:08:55 -04:00
drigato 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
Albert Santoni 6c11ef2769 Even better fix, fixes unit tests too 2014-06-25 11:24:19 -04:00
Albert Santoni 15013afa40 Better session handling fix 2014-06-25 11:15:14 -04:00
Albert Santoni a2bef67d33 Fix user session storage in multi-tenancy mode 2014-06-23 15:22:44 -04:00
drigato 9c4b254bab CC-5756: Scheduler: Different results between Show contents and Add/Remove Contents 2014-06-09 15:35:50 -04:00
drigato 94f1c95934 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-06-09 12:07:45 -04:00
drigato 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
Albert Santoni 345c782eb9 Fixed the unit tests and changed ops->zu 2014-06-09 11:34:25 -04:00
Albert Santoni a07121787f CC-5833: Update airtime demo w/o o.p.s. 2014-06-06 17:12:55 -04:00
drigato 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
drigato e4bb97bcc4 CC-5867: Can't edit show instance 2014-06-06 12:22:59 -04:00
Albert Santoni cc19b18d7f CC-5588: Specific user can't see Library because ColReorder is null for
their account
2014-06-05 18:04:42 -04:00
Albert Santoni 61be4875fb CC-5343: Missing files can be scheduled via playlists
* Fixed it by adding a check for this.
2014-05-30 17:11:12 -04:00
drigato 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
Naomi 578f758274 CC-5810 : Installation can have race conditions with the cache
Preferences.php is used to set values since it will save the value to cache there as well.

defaultdata.sql is used where possible.
2014-04-23 15:41:15 -04:00
Naomi 97989953c8 CC-5727 : History search range using incorrect timezone offset (also Nowplaying & Listener Stats)
need to modify these to user timezone strings to match the new changes.
2014-03-12 18:00:01 -04:00
Naomi f8935a312f CC-5727 : History search range using incorrect timezone offset (also Nowplaying & Listener Stats)
fixing listener stat search
2014-03-11 13:24:22 -04:00
Naomi c668d91e08 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-03-10 18:33:15 -04:00
Naomi 8d2926aeed CC-5727 : History search range using incorrect timezone offset (also Nowplaying)
sending the timestamp string back for nowplaying as well.
added error class to history page if end is < start.
2014-03-10 18:33:07 -04:00
drigato 725b5da154 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-03-10 17:42:12 -04:00
drigato 14c670aa20 CC-5728: Problem when removing repeat option and changing start date 2014-03-10 17:41:57 -04:00
Naomi 1854d76f03 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-03-10 17:39:36 -04:00
Naomi 5f3199b4bb CC-5727 : History search range using incorrect timezone offset 2014-03-10 17:39:17 -04:00
drigato 8ad866c2a2 Fixed changing the start date on a non-repeating show 2014-03-10 17:32:54 -04:00
drigato 6b91d2daf8 CC-5725: Changing a show's repeat type removes first instance from repeating series 2014-03-07 14:52:32 -05:00
drigato 35fd639c1c CC-5725: Changing a show's repeat type removes first instance from repeating series 2014-03-06 11:18:13 -05:00
drigato 51b5cc2052 CC-5725: Changing a show's repeat type removes first instance from repeating series 2014-03-06 10:54:40 -05:00
drigato bcda9ea5e6 Broke unit test for adding content to single show 2014-03-05 14:50:35 -05:00
drigato 426b75b635 CC-5724: Changing start date of a repeating show will update content incorrectly 2014-03-05 14:37:07 -05:00
drigato 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
drigato 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
drigato b433a529ab CC-5696: Two shows or even three shows playing at once. Unstopable even after reboot 2014-03-03 16:42:52 -05:00
drigato 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
drigato 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
drigato 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
drigato cd592827fd CC-5698: Library -> Scheduled column doesn't get updated when bulk adding items
Array storing file ids of scheduled files was in wrong place
and was getting re-created everytime a file was inserted into a show
2014-02-24 17:46:16 -05:00
drigato 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
drigato 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
Albert Santoni 86dafaf61c SAAS-404: Separate the Airtime API version from the Airtime version
* Airtime PHP side can be version bumped without pypo freaking out now
2014-02-14 16:22:15 -05:00
drigato 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
drigato 63ec20d9f1 CC-5681: I18N: Fail to switch language
Check if Zend_Auth class exists with the autoloader
2014-02-03 12:33:35 -05:00
drigato b7c79df6ec Merge branch 'unittests' into 2.5.x 2014-01-31 15:02:41 -05:00
drigato 883e8885c7 CC-5677: Library -> Scheduled column gets updated on incorrect file 2014-01-30 12:38:18 -05:00
drigato 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
drigato 7a04f7d98e CC-5672: Webstream warnings on SaaS
Don't parse/use header info if get_headers returns false
2014-01-29 12:09:05 -05:00
Albert Santoni c9d98e4e10 Small Airtime Pro fix for ShowFormService 2014-01-27 14:31:33 -05:00
Albert Santoni 52c3971fc6 Fixed a bug in Application_Model_SetShowsPopulatedUntil 2014-01-22 17:58:25 -05:00
drigato d5112f0368 Added comments for a show_service function 2014-01-20 17:05:37 -05:00
drigato 0b4ae6b94d CC-5651: Unit Test the Scheduler
Added test for deleting repeating show instances
2014-01-14 14:16:37 -05:00
Albert Santoni fe9beec778 CC-5651: Unit Test the Scheduler
* Added runtests.sh script for unit tests
* Use the airtime_test database config in Config.php, propel
* First unit test passes! :-)
2014-01-13 11:43:17 -05:00
drigato 0f107dbad3 Initial unit test configuration 2014-01-13 11:43:16 -05:00
drigato 9e5cfe0d39 CC-5666: Deleting a show instance can revert the 'no end' option 2014-01-13 11:41:44 -05:00
drigato a648f7fa2d CC-5665: Timeout can occur when scheduling large playlists into linked shows
Added a temporary fix by extending the php time limit
2014-01-09 11:57:32 -05:00
drigato 2cdad4932a CC-5660: Unable to create shows with a rebroadcast
Used wrong formating for minutes
2014-01-06 14:04:18 -05:00
drigato 11284d0d41 CC-5660: Unable to create shows with a rebroadcast
Two variables that are needed for the rebroadcast validation were deleted
before the 2.5.1 release. Just had to add them back in.
2014-01-06 13:51:06 -05:00
drigato dc05d9ddaf CC-5649: Remove unused function, Application_Model_Show::populateAllShowsInRange 2013-12-17 17:09:59 -05:00