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

4120 commits

Author SHA1 Message Date
Albert Santoni
6c11ef2769 Even better fix, fixes unit tests too 2014-06-25 11:24:19 -04:00
Albert Santoni
bb21f08d87 Merge branch '2.5.x' into saas 
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/models/Auth.php
 2014-06-25 11:18:56 -04:00
Albert Santoni
15013afa40 Better session handling fix 2014-06-25 11:15:14 -04:00
Albert Santoni
8a5a796858 Undo session fix temporarily until issues resolved 2014-06-24 16:46:10 -04:00
drigato
6f1727d8f3 Merge branch 'cc-5709-airtime-analyzer-buy-now' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-buy-now 
Conflicts:
	airtime_mvc/application/controllers/BillingController.php
 2014-06-24 16:26:06 -04:00
drigato
bfb5631105 Removed hardcoded client ids. 
Added a function that calculates vat and adds it to an invoice
 2014-06-24 16:23:23 -04:00
Albert Santoni
8c20592423 Start of form customization for billing 2014-06-24 15:52:43 -04:00
drigato
5d69ba5f91 Custom fields were not saving 2014-06-24 12:51:02 -04:00
drigato
73724bdd04 Custom fields were not saving 2014-06-24 12:46:11 -04:00
drigato
3307cc8645 Merge branch 'cc-5709-airtime-analyzer-buy-now' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-buy-now 2014-06-23 17:04:50 -04:00
drigato
806525e28c Fetch service id from whmcs api for upgrades 2014-06-23 17:04:23 -04:00
Albert Santoni
da6263c677 Merge branch 'cc-5709-airtime-analyzer-saas' into saas 2014-06-23 16:27:38 -04:00
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