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

1567 Commits

Author SHA1 Message Date
Duncan Sommerville af8c6c2f48 Merged 2.5.x into saas 2014-11-10 09:08:03 -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 4d263ce897 Merged 2.5.x into saas 2014-11-05 17:36:58 -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
Duncan Sommerville 5275669211 Updated i18n to use multiple domains 2014-11-04 17:03:52 -05:00
Duncan Sommerville 53c4301024 Wrapped json_encode call in PHP version check 2014-10-28 13:29:35 -04:00
Duncan Sommerville 1a90184a69 Merging 2.5.x into saas 2014-10-27 16:27:45 -04:00
Duncan Sommerville 275ca5eed6 Resolved differences merging 2.5.x into saas 2014-10-27 16:25:42 -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
Robert Elder 9fb35c448e Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas. 2014-10-10 19:57:22 +00:00
Duncan Sommerville 6ade74163d Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2014-10-08 18:03:16 -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 1bb17c5614 Blacklist free products from upgrade page 2014-09-23 16:01:28 -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 6c0b94f9bb Moved validation workaround to Service 2014-09-18 16:34:35 -04:00
Duncan Sommerville 5af735654c Added Airtime255 class in Upgrades 2014-09-18 16:33:01 -04:00
Duncan Sommerville b505f16b8f Commented out $calendar_info logging 2014-09-17 19:47:05 -04:00
Duncan Sommerville f64b7d0813 Updated show edit functionality to accommodate uploading new show image 2014-09-17 10:27:14 -04:00
Duncan Sommerville b2d81f370a Merged changes 2014-09-16 18:34:59 -04:00
Duncan Sommerville f3548ff893 Moved functionality for uploading to RESTful ShowController class 2014-09-16 18:18:26 -04:00
Duncan Sommerville 5434311f7d More work on show image uploads 2014-09-16 18:03:14 -04:00
Duncan Sommerville 2a2fcdcf10 More work on show image uploading functionality 2014-09-15 17:14:48 -04:00
Duncan Sommerville cb80423fdd Work on adding image upload to add-show form 2014-09-12 18:05:24 -04:00
Albert Santoni 662f9d3486 LocaleController path fix 2014-09-08 21:18:57 -04:00
Albert Santoni 142060d600 Merge remote-tracking branch 'origin/2.5.x' into saas 2014-09-08 20:47:38 -04:00
Albert Santoni 4c1e6d3fe3 Fixed base URL 
Conflicts:
	airtime_mvc/application/controllers/LocaleController.php
 2014-09-04 17:09:09 -04:00
Albert Santoni f157cad877 Fix silly CAPTCHA flow, now only asks if you get your password wrong 4 
times in a row
 2014-09-03 11:43:06 -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 0fb9429a9e Bugfix in LocaleController 2014-08-25 14:18:23 -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 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 d320651735 SAAS-461: Re-enable timezone and language settings for Super Admins 2014-07-28 12:37:40 -04:00
Albert Santoni 1803e1fd8f Logging::warning bugfix and updated translations 2014-07-25 15:05:35 -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
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 52b8f3af87 Show plan updated confirmation on invoices page 2014-07-09 14:06:51 -04:00