Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
12312 commits 3 branches 0 tags 405 MiB
Commit graph

3804 commits

Author SHA1 Message Date
drigato
7edd993fa3 Reverted pypo's copy file method to how it was without cloud files 
and instead directly call the cloud file's downloader method.
 2014-10-24 15:50:52 -04:00
drigato
70ff67374b Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 
Conflicts:
	python_apps/airtime_analyzer/airtime_analyzer/filemover_analyzer.py
 2014-10-22 17:16:46 -04:00
drigato
8134687c24 Merge branch '2.5.x' into cc-5709-airtime-analyzer 2014-10-22 17:13:42 -04:00
drigato
9726fb80d2 Removed amazon s3 signature from pypo cache file name. 
Stopped pyppo from downloading amazon s3 files if it already exists in the pypo cache dir.
 2014-10-22 14:17:44 -04:00
Robert Elder
f29f30e3ac Include base_dir in session namespaces. 2014-10-22 14:37:47 +00:00
drigato
f775bedb49 Stopped returning filesize in delete functions. 
Created an Amazon S3 wrapper class around Zend_Service_Amazon_S3 to add more functionality.
 2014-10-21 16:05:50 -04:00
drigato
544d20ebc2 Replaced spaces with dashes in resource_id generation 
Fixed track preview and download signed urls
Removed cloud_storage_deleter.py file
Changed cloud_storage settings in airtime.conf
 2014-10-17 17:16:53 -04:00
drigato
a10e287368 Fixed a fresh install bug that wasn't using composer installs. 
Fixed a cloud file download bug where it was downloading the wrong track.
Working on amazon s3 signed urls for private objects.
Added cloud storage configuration to install script.
 2014-10-14 16:54:58 -04:00
drigato
2423ea6787 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2014-10-08 11:46:30 -04:00
drigato
c4692cc0d7 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/controllers/PluploadController.php
	airtime_mvc/application/views/scripts/plupload/index.phtml
 2014-10-08 11:46:08 -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
drigato
0ccc7e7dc9 SAAS-470: Zend Rest module doesn't work on Ubuntu 14.04 
The Bootstrap.php in the modules directory didn't like
short php tags.
 2014-08-28 16:52:47 -04:00
drigato
52f3ed816e Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
 2014-08-28 12:01:42 -04:00
drigato
9fe0830dfd Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LoginController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
 2014-08-28 11:59:41 -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
drigato
ca62086e16 Removed cloud file deletion from Airtime Analyzer. Deletion is done from PHP now. 2014-08-12 12:59:50 -04:00