Commit graph

4949 commits

Author SHA1 Message Date
Albert Santoni
d438587ddc Merge branch '2.5.x' into saas
Conflicts:
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/airtime/CcShow.php
	airtime_mvc/application/services/SchedulerService.php
	airtime_mvc/application/services/ShowService.php
2014-08-25 18:09:51 -04:00
Albert Santoni
80b9bcdfc6 Use SSL with Recaptcha to fix it 2014-08-25 14:45:04 -04:00
Albert Santoni
0fb9429a9e Bugfix in LocaleController 2014-08-25 14:18:23 -04:00
Albert Santoni
55682dc7a9 Bugfix in Airtime 2.5.3 upgrader class 2014-08-25 14:04:25 -04:00
drigato
bc63669853 Removed unused code.
Changed linked show warning message in the edit show form.
2014-08-21 17:12:54 -04:00
drigato
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
Albert Santoni
11de8bd988 Clean up and simplifcation of linked show filling 2014-08-21 13:39:25 -04:00
drigato
2a2b4bd05a Added comments and removed some unused code 2014-10-15 17:11:38 -04:00
drigato
660b1a0596 Removed old comments 2014-08-21 09:47:54 -04:00
drigato
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
drigato
a5704eac6e Added criteria parameter to CcShow->getFutureInstanceIds so we can retrieve results from database instead of cache 2014-08-20 16:35:59 -04:00
drigato
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
drigato
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
drigato
b9ecd00d33 CC-5904: New linked show instances may get an old copy of the schedule 2014-08-18 18:10:45 -04:00
drigato
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
drigato
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
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
Albert Santoni
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
drigato
33f397f577 remove memory usage log statements 2014-08-15 16:25:37 -04:00
drigato
f863f4dfcf More mem usage logs 2014-08-15 15:41:00 -04:00
drigato
2bc8f6d403 Logging memory usage 2014-08-15 15:36:13 -04:00
drigato
26b210ded9 Commented out unnecessary functions using too much memory 2014-08-15 15:32:52 -04:00
drigato
f2929d02f6 CC-5898: Future repeating shows may not get generated and/or filled with content
Commented function
2014-08-15 15:41:55 -04:00
drigato
22218079af CC-5898: Future repeating shows may not get generated and/or filled with content
Refactored show creation into separate function
2014-08-15 15:35:58 -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
drigato
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
drigato
ca62086e16 Removed cloud file deletion from Airtime Analyzer. Deletion is done from PHP now. 2014-08-12 12:59:50 -04:00
drigato
879e776c8d CC-5888: Handle file deletion if the file is stored in the cloud 2014-08-12 12:32:49 -04:00
drigato
46228341b2 Audio preview fix 2014-08-12 11:39:29 -04:00
drigato
35c450be3f Audio preview fix 2014-08-12 11:33:10 -04:00
Albert Santoni
1d43200041 Syntax error fix 2014-08-01 15:46:08 -04:00
Albert Santoni
1ab30c26e6 Enforce non-empty passwords when editing user settings 2014-08-01 15:38:35 -04:00
Albert Santoni
0203be0f10 Revert zend routing changes to fix uploads 2014-08-01 15:30:37 -04:00
Albert Santoni
1c676dee6d Fix user settings again for Super Admins, also Zend routing tweak
* Better fix for language and interface settings not being able to change for Super Admins
* Fixes Zend routing on Trusty, for whatever reason
2014-08-01 12:50:02 -04:00
Albert Santoni
aa8a26271c Fix zend routing on Trusty (weird error due to REST module) 2014-08-01 11:51:20 -04:00
drigato
02ea553f43 Removed media api delete-success callback because it's no longer in use 2014-07-31 23:21:39 -04:00
drigato
dd37ffbdd7 CC-5888: Handle file deletion if the file is stored in the cloud
Execute a python script that deletes a file from the cloud
2014-07-31 23:11:49 -04:00
drigato
8c2754972e CC-5896: Store cloud files in separate table, inherited from cc_files
Refactored storedfile->delete()
Added a deletePhysicalFile function to CcFile and CloudFile
Cleaned up schedule events that get passed to Pypo
2014-07-29 15:07:51 -04:00
drigato
b7d1852fc0 CC-5896: Store cloud files in separate table, inherited from cc_files 2014-07-28 16:11:05 -04:00
drigato
6fa7ddba9a CC-5896: Store cloud files in separate table, inherited from cc_files
Added delete on cascade for cloud files
2014-07-28 16:03:57 -04:00
drigato
f6aa2e5a3b CC-5896: Store cloud files in separate table, inherited from cc_files
For cloud files, return the original filename when downloading a file instead of the cloud object name
2014-07-28 16:02:06 -04:00
drigato
ecb072b84c CC-5896: Store cloud files in separate table, inherited from cc_files
Fixed broken metadata display on Library page
Fixed broken download/preview option from Library page
2014-07-28 15:17:46 -04:00
Albert Santoni
d320651735 SAAS-461: Re-enable timezone and language settings for Super Admins 2014-07-28 12:37:40 -04:00
Albert Santoni
4b4554476a Error checking if a locale isn't installed 2014-07-28 11:35:19 -04:00
Albert Santoni
e759b8969b Fix undefined variable 2014-07-25 15:18:17 -04:00
Albert Santoni
1803e1fd8f Logging::warning bugfix and updated translations 2014-07-25 15:05:35 -04:00
drigato
f1ea100411 CC-5896: Store cloud files in separate table, inherited from cc_files 2014-07-24 16:56:15 -04:00
Albert Santoni
f07e3b65eb Better error handling if the WHMCS API call for GTM code generation
fails
2014-07-24 16:49:03 -04:00