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

1531 Commits

Author SHA1 Message Date
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 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 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
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 5df522f226 Added GTM code and data layer 2014-06-11 13:24:03 -04:00
Albert Santoni fa3c7bd67a Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-06-09 11:37:06 -04:00
Albert Santoni a12ebf2cb1 CC-5836: Status page still reports media-monitor even AA enabled 2014-06-04 18:23:18 -04:00
Albert Santoni 6e5d99b828 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-06-04 14:16:06 -04:00
Albert Santoni e3c2ae03b3 Fixed upload file count being wrong in Add Media page (lemma to CC-5863) 2014-06-04 14:15:36 -04:00
Albert Santoni e8de3b5750 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-06-02 14:15:06 -04:00
Albert Santoni 2e6d3821ae CC-5863: Deleted files still shown in Recent Uploads view 
* Fixed
 2014-06-02 14:14:09 -04:00
drigato f684ce4ab9 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-05-20 14:16:24 -04:00
drigato 4cdd855a21 CC-5855: Output to zendlog when files are deleted from library 2014-05-20 14:15:51 -04:00
drigato 39db3d4aee Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/application/controllers/UpgradeController.php
 2014-05-05 11:21:02 -04:00
drigato e4e5590b9f CC-5802: Upgrade application.ini file 
Remove this upgrade step from the upgrade controller
 2014-05-05 11:19:14 -04:00
drigato 1de58c64d6 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/application/controllers/UpgradeController.php
 2014-04-28 09:44:14 -04:00
drigato 42806b1cbf CC-5802: Upgrade application.ini file 2014-04-28 09:43:21 -04:00
drigato 2fdb8d1deb Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-25 15:00:29 -04:00
drigato 8d9b9c1fb7 Moved deleting the maintenace temporary file flag to very end of upgrade task 2014-04-25 15:00:13 -04:00
drigato f98b03f270 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/application/controllers/UpgradeController.php
 2014-04-25 14:54:47 -04:00
drigato 66000a2847 CC-5802: Upgrade application.ini file 
Changed where we insert new application.ini file lines
 2014-04-25 14:53:58 -04:00
drigato 61df7c1a44 Moved some comments around 2014-04-25 14:20:04 -04:00
drigato 57ad1beaa9 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/application/controllers/UpgradeController.php
 2014-04-25 14:18:56 -04:00
drigato f432ea9f75 CC-5802: Upgrade application.ini file 
Execute raw sql upgrade file at the end in case errors occured during the upgrade before it gets executed
 2014-04-25 14:16:18 -04:00
drigato aeec9172f9 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/application/controllers/UpgradeController.php
 2014-04-25 11:16:21 -04:00
drigato 1009719e1c Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer 2014-04-25 11:05:51 -04:00
drigato 6890dcc3bc CC-5802: Upgrade application.ini file 
Used a transaction for upgrades. If upgrading the application.ini file fails, the database upgrades will get rolled back.
 2014-04-25 11:05:33 -04:00
drigato 25e484cc2f Delete code that was copied in twice 2014-04-25 10:22:38 -04:00
Albert Santoni 22b9cc3be1 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-25 01:08:24 -04:00
Albert Santoni d9adba117a One more time... 2014-04-25 01:08:08 -04:00
Albert Santoni 7a2f27fe41 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-25 01:03:05 -04:00
Albert Santoni cdc88d25e1 Argh, fixed typo... it's late 2014-04-25 01:02:47 -04:00
Albert Santoni 3e2a165dd2 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-25 00:48:54 -04:00
Albert Santoni e7ea5e5301 Try fixing UpgradeController version check again... 2014-04-25 00:48:13 -04:00
Albert Santoni 446eca057c Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 
Conflicts:
	airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
	airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
	airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
	airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
	airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
	airtime_mvc/locale/template/airtime.po
	airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
 2014-04-25 00:43:22 -04:00
Albert Santoni 54db74f622 Allow upgrades from Airtime 2.5.1 because the version wasn't bumped 
internally to 2.5.2
 2014-04-25 00:40:51 -04:00
drigato 42f3bb17e1 CC-5814: 'Down for maintenance' page during upgrades 2014-04-24 16:23:57 -04:00
drigato f536a7b1b4 CC-5814: 'Down for maintenance' page during upgrades 2014-04-24 16:19:55 -04:00
drigato fcd8ea8ba5 CC-5802: Upgrade application.ini file 2014-04-24 10:22:52 -04:00
drigato 069ebd3991 CC-5802: Upgrade application.ini file 2014-04-24 10:12:24 -04:00
Naomi fe20cc7f63 Merge branch '2.5.x' into cc-5709-airtime-analyzer 
Conflicts:
	airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
	airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
	airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
	airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
 2014-04-23 15:58:39 -04:00
Albert Santoni 2f8461b2a6 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-23 14:58:36 -04:00
Naomi 3e34f1cf96 fixing up some datatables queries, propel usage. 2014-04-23 12:53:43 -04:00
Albert Santoni 41e2b5d840 Fix the failed uploads view 2014-04-23 11:52:10 -04:00
drigato 1a71a848e1 CC-5802: Upgrade application.ini file 
Attempting to write new lines to application.ini file via the upgrade controller
 2014-04-22 16:11:46 -04:00
drigato d00e390511 Removed last change 2014-04-17 13:58:56 -04:00
drigato 0a6b72ad99 Removing something for testing purposes 2014-04-17 13:56:02 -04:00
drigato c8121f9bc8 CC-5781: Upgrade script for new storage quota implementation 
Was using du wrong. Wasn't returning value in bytes
 2014-04-17 13:53:24 -04:00
drigato 3ebf9e56dd Upgrade script testing 2014-04-16 17:30:44 -04:00
drigato b348286448 Upgrade script testing 2014-04-16 17:28:55 -04:00
drigato 456ac40fe6 Upgrade action testing 2014-04-16 17:27:15 -04:00
drigato cd6c4f7ede Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-16 17:24:56 -04:00
drigato a3be55fd60 CC-5781: Upgrade script for new storage quota implementation 
Changed airtime conf file path so it works for saas or self-hosted users
 2014-04-16 17:24:02 -04:00