Albert Santoni
|
701139e433
|
Merge branch 'gtm-saas' into cc-5709-airtime-analyzer-saas
|
2014-06-23 15:45:03 -04:00 |
|
Albert Santoni
|
72ef576f03
|
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
|
2014-06-23 15:28:50 -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
|
380b5526d6
|
Merge branch 'whmcs-login-saas' into cc-5709-airtime-analyzer-buy-now-saas
|
2014-06-23 13:25:40 -04:00 |
|
Albert Santoni
|
3919fbd839
|
Merge branch 'whmcs-login' into cc-5709-airtime-analyzer-buy-now
|
2014-06-23 13:25:19 -04:00 |
|
Albert Santoni
|
55ff95a34f
|
Merge branch 'whmcs-login' into whmcs-login-saas
|
2014-06-23 13:24:47 -04:00 |
|
Albert Santoni
|
6302e3b335
|
Fix CORS with Chrome
|
2014-06-23 13:24:28 -04:00 |
|
drigato
|
f40cdbc8cd
|
Merge branch 'saas' into cc-5709-airtime-analyzer-buy-now-saas
|
2014-06-23 10:59:07 -04:00 |
|
drigato
|
0439413ac0
|
Merge branch 'whmcs-login' into cc-5709-airtime-analyzer-buy-now
|
2014-06-20 17:46:08 -04:00 |
|
Albert Santoni
|
a881790408
|
Merge branch 'whmcs-login' into whmcs-login-saas
|
2014-06-20 17:44:44 -04:00 |
|
Albert Santoni
|
9a84bdfda1
|
Fixed syntax error
|
2014-06-20 17:44:30 -04:00 |
|
Albert Santoni
|
e43c1c00cf
|
Merge branch 'whmcs-login' into whmcs-login-saas
|
2014-06-20 17:43:37 -04:00 |
|
Albert Santoni
|
0eab0c609b
|
Permissions fixes for Super Admin users
|
2014-06-20 17:43:20 -04:00 |
|
drigato
|
25e4036d2f
|
typo
|
2014-06-20 17:29:56 -04:00 |
|
drigato
|
5d0ea2d015
|
Add billing section to main menu
|
2014-06-20 17:25:05 -04:00 |
|
drigato
|
497841225b
|
Merge branch 'whmcs-login' into cc-5709-airtime-analyzer-buy-now
|
2014-06-20 16:54:41 -04:00 |
|
drigato
|
f6a4a9d0d0
|
Removed invalid client id - for testing purposes
|
2014-06-20 16:54:05 -04:00 |
|
Albert Santoni
|
7275986158
|
Merge branch 'whmcs-login' into whmcs-login-saas
|
2014-06-20 16:42:18 -04:00 |
|
Albert Santoni
|
4179123ce0
|
Set up CORS for microsite autologin after signup
|
2014-06-20 16:41:48 -04:00 |
|
drigato
|
1e1dc1dd03
|
Validation
Refactoring
|
2014-06-20 16:31:26 -04:00 |
|
drigato
|
01bf2883e5
|
Save client info on upgrade
|
2014-06-20 15:00:28 -04:00 |
|
Albert Santoni
|
82220a44a3
|
Merge branch 'whmcs-login' into whmcs-login-saas
|
2014-06-20 13:36:37 -04:00 |
|
Albert Santoni
|
faa12c8065
|
Super Admin edit page points to billing now
* Also prevent super admin from being deleted
|
2014-06-20 13:36:06 -04:00 |
|
drigato
|
40f2796972
|
Created an invoice view
Some refactoring
Some validation
|
2014-06-19 16:55:01 -04:00 |
|
drigato
|
540b9167a1
|
Invoice action
|
2014-06-19 07:10:30 -04:00 |
|
Albert Santoni
|
83dbc789af
|
Merge branch 'whmcs-login' into whmcs-login-saas
|
2014-06-18 20:22:33 -04:00 |
|
Albert Santoni
|
29e9182fcd
|
Fixed syntax error... grumble grumble
|
2014-06-18 20:22:13 -04:00 |
|
Albert Santoni
|
6402e6d2b6
|
Merge branch 'whmcs-login' into whmcs-login-saas
|
2014-06-18 20:20:30 -04:00 |
|
Albert Santoni
|
76659c80c4
|
Fixed bad client ID / subdomain check in WhmcsLoginController
|
2014-06-18 20:20:08 -04:00 |
|
Albert Santoni
|
20c069fc65
|
Merge branch 'saas' into whmcs-login-saas
|
2014-06-18 18:43:15 -04:00 |
|
Albert Santoni
|
ee928a2963
|
Merge branch 'whmcs-login' into whmcs-login-saas
|
2014-06-18 18:43:12 -04:00 |
|
Albert Santoni
|
81699b3c65
|
Fixed missing constant
|
2014-06-18 18:42:55 -04:00 |
|
Albert Santoni
|
b6ab9fa2c5
|
Merge branch 'whmcs-login' into whmcs-login-saas
|
2014-06-18 18:29:14 -04:00 |
|
Albert Santoni
|
971e81756c
|
Added ability to login directly with WHMCS credentials (on Airtime login
screen)
|
2014-06-18 18:27:16 -04:00 |
|
drigato
|
b12d88ddf7
|
Fix a whoopsies
|
2014-06-18 11:03:26 -04:00 |
|
drigato
|
70a7410b1a
|
Remove key
|
2014-06-18 10:42:50 -04:00 |
|
Albert Santoni
|
0ba09c2dda
|
Merge branch 'whmcs-login' into whmcs-login-saas
|
2014-06-17 17:41:46 -04:00 |
|
Albert Santoni
|
7f6fc7770a
|
Added Super Admin role and WHMCS login
|
2014-06-17 17:40:55 -04:00 |
|
drigato
|
dc583a6e41
|
Messing around with AutoAuth for whmcs
Client form wasn't getting populated with new values after a save - fixed
|
2014-06-17 17:07:33 -04:00 |
|
drigato
|
d81afca7e3
|
Adding detailed log statements for actions involving show scheduling
|
2014-06-17 14:17:28 -04:00 |
|
drigato
|
1f4c8b755d
|
Created a separate view for upgrades and client info
|
2014-06-17 12:47:08 -04:00 |
|
drigato
|
d39f7548cd
|
un-hardcoded client id
|
2014-06-12 17:58:02 -04:00 |
|
drigato
|
81ceafbfbd
|
whmcs client form
|
2014-06-12 17:54:20 -04:00 |
|
drigato
|
267cc78699
|
'My Account' link on free trial box was broken
|
2014-06-12 09:37:16 -04:00 |
|
Albert Santoni
|
782a746a36
|
Merge branch 'gtm-saas' into saas
|
2014-06-11 14:13:50 -04:00 |
|
Albert Santoni
|
e3850f79da
|
Fix for detecting account duration
|
2014-06-11 14:09:40 -04:00 |
|
Albert Santoni
|
994dbddac2
|
Use document ready() event to fire data layer
|
2014-06-11 13:52:42 -04:00 |
|
Albert Santoni
|
d984ec9b43
|
Don't use NumberFormatter because of PECL intl dependency
|
2014-06-11 13:45:23 -04:00 |
|
Albert Santoni
|
a731f94f70
|
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
|
2014-06-11 13:35:34 -04:00 |
|