Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,399 Commits 3 Branches 0 Tags 405 MiB
Commit Graph

1392 Commits

Author SHA1 Message Date
Albert Santoni 17f1d0e96d Simplify the metadata sanitization and bugfix it 
* SAAS-376 and CC-5868
 2015-02-18 16:29:08 -05:00
Albert Santoni 2ae921e9d7 Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2015-02-18 16:16:41 -05:00
Duncan Sommerville a07a1edcc0 SAAS-595 - Updated validation and sanitization 2015-02-17 12:17:49 -05:00
Albert Santoni 2a9790adf3 Backport ACL REST permission fix 2015-02-06 16:05:51 -05:00
Albert Santoni 4b6e5671c3 REST permission fix 2015-02-06 14:33:02 -05:00
Albert Santoni d5ee710f89 Fixed CSRF token checking in MediaController (broken by last 2 commits) 
* Also fixed getOwnerId(), no longer calls a non-existent function
 2015-01-22 12:20:13 -05:00
Albert Santoni 230cdcccb4 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	CREDITS
 2015-01-22 11:29:38 -05:00
Duncan Sommerville a40067ca55 Moved REST authorization boilerplate to Zend Acl_plugin 2015-01-21 17:20:04 -05:00
Duncan Sommerville 2c2f7ebc5f Initial commit for update to ACL for REST module; NEEDS TESTING 2015-01-21 15:34:15 -05:00
Mark Lewis 17a577fbbb use is_numeric instead of is_int as values are strings 2015-01-09 13:02:25 -05:00
Mark Lewis 1b03bd7fbd use new var instaead of calling getShowListContent again 2015-01-09 13:02:25 -05:00
Mark Lewis fc8e65944e added error checked for required params 2015-01-09 13:02:25 -05:00
Mark Lewis 1cc1f8a378 return error for missing instance_id on show-tracks action 2015-01-09 13:02:25 -05:00
Mark Lewis 174cf79d84 clean up shows endpoint, remove dependency on Show model 2015-01-09 13:02:25 -05:00
Mark Lewis 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
Mark Lewis 03dae5be2b fix spacing in ApiController 2015-01-09 13:01:43 -05:00
Mark Lewis 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
drigato f08535cc10 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/Bootstrap.php
 2014-11-26 10:35:48 -05:00
Duncan Sommerville f6bf2f8cc5 Changed tabs to spaces 2014-11-07 12:05:29 -05:00
Duncan Sommerville 795e239ff3 Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls. 2014-11-06 18:39:48 -05:00
Duncan Sommerville b94d34f719 Removed calls to set user locale and timezone on user creation; these calls were updating the current user instead of the created user, and so served no purpose 2014-11-05 17:22:13 -05:00
Duncan Sommerville 564e8d9311 Replaced hardcoded locale defaults with the station default locale 2014-11-05 17:21:19 -05:00
Duncan Sommerville 90626a2fcb Formatting; Changed tabs to spaces 2014-11-05 17:04:18 -05:00
drigato 54d1bcf81e Merge branch '2.5.x' into cc-5709-airtime-analyzer 2014-10-30 12:15:41 -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 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
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 78cc43d33d Regenerate session ids. 2014-09-29 22:48:52 +00:00
Albert Santoni 4c1e6d3fe3 Fixed base URL 
Conflicts:
	airtime_mvc/application/controllers/LocaleController.php
 2014-09-04 17:09:09 -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 192c4e884f Bugfix in LocaleController 2014-08-25 18:19:11 -04:00
Albert Santoni 1aa99e2896 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
 2014-07-15 16:41:29 -04:00
Albert Santoni 15013afa40 Better session handling fix 2014-06-25 11:15:14 -04:00
Albert Santoni 24d842c4a6 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/application/controllers/LoginController.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
	airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
 2014-06-23 15:26:53 -04:00
Albert Santoni a2bef67d33 Fix user session storage in multi-tenancy mode 2014-06-23 15:22:44 -04:00
Albert Santoni a12ebf2cb1 CC-5836: Status page still reports media-monitor even AA enabled 2014-06-04 18:23:18 -04:00
Albert Santoni e3c2ae03b3 Fixed upload file count being wrong in Add Media page (lemma to CC-5863) 2014-06-04 14:15:36 -04:00
Albert Santoni 2e6d3821ae CC-5863: Deleted files still shown in Recent Uploads view 
* Fixed
 2014-06-02 14:14:09 -04:00
drigato 4cdd855a21 CC-5855: Output to zendlog when files are deleted from library 2014-05-20 14:15:51 -04:00
drigato e4e5590b9f CC-5802: Upgrade application.ini file 
Remove this upgrade step from the upgrade controller
 2014-05-05 11:19:14 -04:00
drigato 42806b1cbf CC-5802: Upgrade application.ini file 2014-04-28 09:43:21 -04:00
drigato 8d9b9c1fb7 Moved deleting the maintenace temporary file flag to very end of upgrade task 2014-04-25 15:00:13 -04:00
drigato 66000a2847 CC-5802: Upgrade application.ini file 
Changed where we insert new application.ini file lines
 2014-04-25 14:53:58 -04:00
drigato 61df7c1a44 Moved some comments around 2014-04-25 14:20:04 -04:00