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

1643 commits

Author SHA1 Message Date
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
drigato
dd37ffbdd7 CC-5888: Handle file deletion if the file is stored in the cloud 
Execute a python script that deletes a file from the cloud
 2014-07-31 23:11:49 -04:00
drigato
b7d1852fc0 CC-5896: Store cloud files in separate table, inherited from cc_files 2014-07-28 16:11:05 -04:00
drigato
ecb072b84c CC-5896: Store cloud files in separate table, inherited from cc_files 
Fixed broken metadata display on Library page
Fixed broken download/preview option from Library page
 2014-07-28 15:17:46 -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
drigato
f1ea100411 CC-5896: Store cloud files in separate table, inherited from cc_files 2014-07-24 16:56:15 -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
c09457ce7c Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage 2014-07-16 15:03:39 -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
drigato
e7dfc08128 CC-5892: Handle when a file is downloaded from the Airtime library 2014-07-10 17:59:27 -04:00
Albert Santoni
52b8f3af87 Show plan updated confirmation on invoices page 2014-07-09 14:06:51 -04:00
Albert Santoni
0ab1eaa08c Fix account upgrade invoicing issue 
* Don't generate upgrade orders if the plan and the billing cycle didn't
  change. WHMCS freaks out otherwise.
* Clean up some deadcode in BillingUpgradeDowngrade.php
* Squash an error in the invoice view if there's no invoices
 2014-07-09 13:49:25 -04:00
Albert Santoni
20f55314b4 Logging to debug account upgrade, possibly broken by WHMCS update 2014-07-09 12:56:53 -04:00
Albert Santoni
3c05e14e4d Fix error when upgrading account 2014-07-09 12:51:12 -04:00
Albert Santoni
6494db3ccf Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas 2014-07-03 13:06:14 -04:00
Albert Santoni
cec2132e5f Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas 2014-07-03 13:06:04 -04:00
Albert Santoni
10acbb8ad6 Fix WHMCS login for multiple users again 2014-07-03 13:05:44 -04:00
Albert Santoni
db73c94f5a Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas 2014-07-03 12:39:42 -04:00
Albert Santoni
1f08f3c482 Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas 2014-07-03 12:39:33 -04:00
Albert Santoni
6f9c87db3d WHMCS login bugfix 2014-07-03 12:39:18 -04:00
Albert Santoni
9c14cfd47c Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas 2014-07-03 12:27:01 -04:00
Albert Santoni
14113f7e60 Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas 2014-07-03 12:26:45 -04:00
Albert Santoni
585a2859a6 Merge branch 'cc-5709-airtime-analyzer-buy-now' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-buy-now 2014-07-03 12:26:20 -04:00
Albert Santoni
a5822aa07a CORS refactoring 2014-07-03 12:26:09 -04:00
drigato
ac930607ad Redirect index action to upgrade action 2014-07-03 11:08:54 -04:00
Albert Santoni
758423a7f7 Billing page fix for customers with multiple stations 2014-07-02 14:47:10 -04:00
Albert Santoni
35e98e468d Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas 
Conflicts:
	airtime_mvc/application/controllers/LoginController.php
 2014-07-02 13:43:09 -04:00
Albert Santoni
2794ca1355 Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas 
Conflicts:
	airtime_mvc/application/controllers/UpgradeController.php
	airtime_mvc/application/models/Cache.php
 2014-07-02 12:34:33 -04:00
Albert Santoni
728fccc2fe Fixed Upgrade caching bugs 2014-07-02 12:30:52 -04:00
Albert Santoni
9de92a87a4 Refactored the upgrade process for Airtime Pro 2014-07-01 13:36:09 -04:00
Albert Santoni
e9cca4c441 Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas 2014-06-27 15:50:51 -04:00
Albert Santoni
3357c1f032 Select current plan and show that correctly 2014-06-27 15:50:05 -04:00
Albert Santoni
907c53b94f Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas 2014-06-26 19:14:07 -04:00
Albert Santoni
2504a34818 Fallback to letting VAT validate if the VIES service is down 2014-06-26 19:13:40 -04:00
Albert Santoni
54590de6ee Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas 2014-06-26 18:59:14 -04:00