Albert Santoni
|
db9d4e3327
|
htaccess changes to make the saas branch run locally
|
2014-07-07 15:13:27 -04:00 |
|
Albert Santoni
|
3c88f66162
|
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
|
2014-07-03 17:13:06 -04:00 |
|
Albert Santoni
|
64d3cb7b1b
|
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
|
2014-07-03 17:12:50 -04:00 |
|
Albert Santoni
|
63113b4e75
|
Fix for Chrome radio button disabling
|
2014-07-03 17:12:33 -04:00 |
|
Albert Santoni
|
e18a281991
|
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
|
2014-07-03 16:53:11 -04:00 |
|
Albert Santoni
|
e8bc6a3080
|
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
|
2014-07-03 16:53:01 -04:00 |
|
Albert Santoni
|
dea68878f4
|
Fix for radio button disabling bug in Billing view
|
2014-07-03 16:51:59 -04:00 |
|
Albert Santoni
|
20a4323af9
|
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
|
2014-07-03 16:49:37 -04:00 |
|
Albert Santoni
|
a831fbe5b7
|
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
|
2014-07-03 16:49:28 -04:00 |
|
Albert Santoni
|
c551097d57
|
Default to monthly billing for invalid values
|
2014-07-03 16:46:25 -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
|
cda812dd73
|
Trialbox: Don't open My Account in new window
|
2014-07-02 14:49:11 -04:00 |
|
Albert Santoni
|
758423a7f7
|
Billing page fix for customers with multiple stations
|
2014-07-02 14:47:10 -04:00 |
|
Albert Santoni
|
0695f7da20
|
Promote the sourcefabric_admin user too
|
2014-07-02 14:11:02 -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
|
54fdb34fc4
|
Disable APC cache clearing on SaaS
|
2014-07-02 12:49:37 -04:00 |
|
Albert Santoni
|
523bb8e7b6
|
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
|
2014-07-02 12:45:44 -04:00 |
|
Albert Santoni
|
b0cab62e80
|
More syntax fixes for PHP 5.3
|
2014-07-02 12:45:17 -04:00 |
|
Albert Santoni
|
368ac19d52
|
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
|
2014-07-02 12:43:20 -04:00 |
|
Albert Santoni
|
4b7f8abc3d
|
Same thing again
|
2014-07-02 12:43:06 -04:00 |
|
Albert Santoni
|
96f370e071
|
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
|
2014-07-02 12:41:07 -04:00 |
|
Albert Santoni
|
cd26671627
|
Weird syntax fix for PHP 5.3
|
2014-07-02 12:40:32 -04:00 |
|
Albert Santoni
|
f068d5bd9a
|
Fixed cache merge
|
2014-07-02 12:36:03 -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 |
localizer
|
3b6b0f8b69
|
updated translation resources
|
2014-07-02 12:02:12 +00: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 |
|
Albert Santoni
|
5745288113
|
Redirect Edit User screen for super admins
|
2014-06-26 18:58:03 -04:00 |
|
Albert Santoni
|
fe0485e66b
|
Invoice view bugfix
|
2014-06-26 18:04:37 -04:00 |
|
Albert Santoni
|
d34c0d91cd
|
Invoice view bugfix
|
2014-06-26 18:03:40 -04:00 |
|
Albert Santoni
|
f1610485c3
|
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
Conflicts:
airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
|
2014-06-26 17:45:48 -04:00 |
|
Albert Santoni
|
d785d92953
|
VAT fixes
|
2014-06-26 17:44:53 -04:00 |
|
Albert Santoni
|
18c828defd
|
Finished up VAT validation for Plans page
|
2014-06-26 17:31:34 -04:00 |
|
Albert Santoni
|
94bbd3c8a5
|
Don't open trialbox My Account link in new window
|
2014-06-25 20:36:08 -04:00 |
|
Albert Santoni
|
51b7fe9adf
|
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
|
2014-06-25 20:33:10 -04:00 |