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

3787 commits

Author SHA1 Message Date
Albert Santoni
7db571d103 Remove clearAction from the media REST API for security 2014-11-20 16:47:02 -05:00
Albert Santoni
8ffd70781b Remove clearAction from the media REST API for security 2014-11-20 16:46:21 -05:00
Albert Santoni
c829b6bf95 Fix bad merge 2014-11-18 18:17:19 -05:00
Albert Santoni
dd3b54f8ed Actually delete files from the database via the media REST API 2014-11-18 18:15:45 -05:00
Albert Santoni
11a31375df Slightly more robust fix for the last issue 2014-11-18 17:41:44 -05:00
Duncan Sommerville
6460854fda Fixed 'clear' button not working when files failed to import 2014-11-18 17:13:48 -05:00
Albert Santoni
e7e1926896 CC-5950: Fix for issue where clear button in Recent Uploads didn't work 
sometimes
 2014-11-18 17:11:09 -05:00
drigato
95517cac87 Fix exception thrown when the analyzer doesn't return filesize with the metadata 2014-11-12 14:45:50 -05:00
drigato
54d1bcf81e Merge branch '2.5.x' into cc-5709-airtime-analyzer 2014-10-30 12:15:41 -04:00
Albert Santoni
c590869311 Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-10-29 17:57:25 -04:00
Albert Santoni
fd39db2e24 Merge pull request #75 - Saas relder csrf delete file 2014-10-29 17:55:42 -04: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
drigato
8134687c24 Merge branch '2.5.x' into cc-5709-airtime-analyzer 2014-10-22 17:13:42 -04:00
Robert Elder
f29f30e3ac Include base_dir in session namespaces. 2014-10-22 14:37:47 +00: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