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

5512 Commits

Author SHA1 Message Date
Robert Elder c02ed026f4 Support for tokens in multipart file upload using API. 2014-10-24 03:57:35 +00:00
Robert Elder aec189089a Merge branch '2.5.x' into saas 2014-10-22 14:46:32 +00:00
Robert Elder f29f30e3ac Include base_dir in session namespaces. 2014-10-22 14:37:47 +00:00
Robert Elder 9fb35c448e Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas. 2014-10-10 19:57:22 +00:00
Albert Santoni f439072422 Merge branch '2.5.x' into cc-5709-airtime-analyzer 2014-10-10 11:21:49 -04:00
Duncan Sommerville 0196aa21f5 Fixed testcases to account for show image path in and show instance description 2014-10-09 09:39:50 -04:00
localizer 736acda14e updated translation resources 2014-10-09 04:27:12 +00:00
Duncan Sommerville 6ade74163d Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2014-10-08 18:03:16 -04:00
Duncan Sommerville a84e0761ca Updated file deletion to remove cc_files rows properly when deleting from the Library 2014-10-08 18:01:06 -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
dpsommer 159ab47857 Merge pull request #69 from RobertElder/tokens 
Add form tokens to several forms.
 2014-10-07 10:05:59 -04:00
dpsommer e803676d1b Merge pull request #67 from RobertElder/2.5.x 
PHP ini settings for cookies.
 2014-10-07 10:04:13 -04:00
localizer b861375959 updated translation resources 2014-10-07 13:42:14 +00:00
localizer cf1d65363c updated translation resources 2014-10-03 05:39:12 +00: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
Robert Elder f0397bbc59 PHP ini settings for cookies. 2014-09-29 18:22:10 +00:00
localizer ff16cefa62 updated translation resources 2014-09-29 06:43:17 +00:00
Albert Santoni 1bb17c5614 Blacklist free products from upgrade page 2014-09-23 16:01:28 -04:00
localizer 657a47a576 updated translation resources 2014-09-22 02:46:15 +00:00
drigato bc603ddd33 Merge branch '2.5.x' into saas 2014-09-19 15:42:05 -04: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 36b908b4d1 Merge branch '2.5.x' into saas 2014-09-19 15:30:16 -04:00
drigato 66b97158b7 Make API on by default - fix 2014-09-19 15:30:06 -04:00
drigato a0b40e1f7d Merge branch '2.5.x' into saas 2014-09-19 15:00:58 -04:00
drigato 28399b70cc Make API on by default 2014-09-19 14:57:43 -04:00
Duncan Sommerville 365184c2b1 Merging upstream pull 2014-09-19 13:15:53 -04:00
Duncan Sommerville 9952c2b58f Auto generated schema file updates 2014-09-19 13:03:09 -04:00
Duncan Sommerville 0789de9392 Updated Show services to account for added show instance description field 2014-09-19 13:02:38 -04:00
Duncan Sommerville 2630d88a03 Updated SQL queries to include instance descriptions for API calls 2014-09-19 13:00:44 -04:00
Duncan Sommerville 62c50234ab Added 2.5.5 upgrades 2014-09-19 12:59:53 -04:00
Duncan Sommerville 28d2bdbbec Updated upgrade functions to have a directory parameter, since __DIR__ 2014-09-19 12:58:31 -04:00
Duncan Sommerville 0a0c6911f8 Added description field to cc_show_instances table 2014-09-19 12:56:47 -04:00
Duncan Sommerville abc9481a58 Updated to conform to naming conventions 2014-09-19 12:55:47 -04:00
Duncan Sommerville 3a1efa39eb Added instance description field 2014-09-19 12:55:02 -04:00
Duncan Sommerville 26d875ed66 Added confirmation prompt when deleting current logo 2014-09-19 12:54:03 -04:00
drigato 8b20ee459c Merge branch '2.5.x' into saas 2014-09-19 11:12:49 -04:00
Duncan Sommerville 05a8fdf091 Removed disk quota check from image upload, updated doc for processUploadedImage function 2014-09-18 18:23:13 -04:00
Duncan Sommerville be90839dbe Added description field to database calls for getting API information 2014-09-18 18:21:27 -04:00
Duncan Sommerville 1d658867f7 Updated front-end validation to work in FireFox 2014-09-18 17:11:56 -04:00
Duncan Sommerville c65fa8ce37 Added button to remove current show logo 2014-09-18 16:38:18 -04:00
Duncan Sommerville d5f6e8a682 Moved validation workaround for show logo in from Schedule Controller, added check to prevent warning about invalid path in readfile 2014-09-18 16:37:03 -04:00
Duncan Sommerville 5dfadf6ecc Changed check for image deletion 2014-09-18 16:35:32 -04:00