Duncan Sommerville
795e239ff3
Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls.
2014-11-06 18:39:48 -05:00
Duncan Sommerville
4d263ce897
Merged 2.5.x into saas
2014-11-05 17:36:58 -05:00
Duncan Sommerville
eecd3fa188
Added setDefaults call to initialize the locale field to user's locale, or the station default; removed unnecessary field
2014-11-05 17:24:08 -05:00
Duncan Sommerville
275ca5eed6
Resolved differences merging 2.5.x into saas
2014-10-27 16:25:42 -04:00
Robbt
fe291cdc8c
Added sort tracks by upload time to smart blocks criteria
2014-10-19 23:02:40 -04:00
drigato
c4692cc0d7
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/controllers/PluploadController.php
airtime_mvc/application/views/scripts/plupload/index.phtml
2014-10-08 11:46:08 -04:00
dpsommer
9a21b99fdf
Merge pull request #70 from RobertElder/more-tokens
...
More tokens
2014-10-07 10:10:14 -04:00
Robert Elder
29b05343bd
Tokens for add User.
2014-10-01 19:36:36 +00:00
Robert Elder
dbed915469
Tokens for preferences form.
2014-10-01 19:36:17 +00:00
Robert Elder
2be4a5f9d0
Add form tokens to several forms.
2014-09-30 23:09:27 +00:00
drigato
66b97158b7
Make API on by default - fix
2014-09-19 15:30:06 -04:00
drigato
28399b70cc
Make API on by default
2014-09-19 14:57:43 -04:00
Duncan Sommerville
abc9481a58
Updated to conform to naming conventions
2014-09-19 12:55:47 -04:00
Duncan Sommerville
3a1efa39eb
Added instance description field
2014-09-19 12:55:02 -04:00
Duncan Sommerville
c65fa8ce37
Added button to remove current show logo
2014-09-18 16:38:18 -04:00
Duncan Sommerville
5e18e1881f
Removed unnecessary validator override functions
2014-09-18 16:30:47 -04:00
Duncan Sommerville
45939138cd
Added previews of uploaded and current show images
2014-09-17 19:48:17 -04:00
Duncan Sommerville
5434311f7d
More work on show image uploads
2014-09-16 18:03:14 -04:00
Duncan Sommerville
cb80423fdd
Work on adding image upload to add-show form
2014-09-12 18:05:24 -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
c55a3a4d74
Use SSL with Recaptcha to fix it
2014-08-25 18:19:00 -04:00
Albert Santoni
80b9bcdfc6
Use SSL with Recaptcha to fix it
2014-08-25 14:45:04 -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
Albert Santoni
d320651735
SAAS-461: Re-enable timezone and language settings for Super Admins
2014-07-28 12:37:40 -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
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
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
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
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
Albert Santoni
b36967a690
Nicer auto-styling for the Billing Details form
2014-06-25 20:32:41 -04:00
Albert Santoni
338fd06f81
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-25 19:03:13 -04:00
Albert Santoni
d92e5197e1
Design and overhaul of Account Plans screen
...
* Basically working now except for VAT calculation
* Includes pricing grid, basic total calculation
* Revamped layout
* Implemented getting the service ID in BillingController.php
2014-06-25 18:58:54 -04:00
Albert Santoni
8c20592423
Start of form customization for billing
2014-06-24 15:52:43 -04:00
drigato
73724bdd04
Custom fields were not saving
2014-06-24 12:46:11 -04:00
drigato
f40cdbc8cd
Merge branch 'saas' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-23 10:59:07 -04:00
drigato
497841225b
Merge branch 'whmcs-login' into cc-5709-airtime-analyzer-buy-now
2014-06-20 16:54:41 -04:00
drigato
40f2796972
Created an invoice view
...
Some refactoring
Some validation
2014-06-19 16:55:01 -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
1f4c8b755d
Created a separate view for upgrades and client info
2014-06-17 12:47:08 -04:00
drigato
81ceafbfbd
whmcs client form
2014-06-12 17:54:20 -04:00
Albert Santoni
01fc9e6ffc
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-26 19:11:47 -04:00
drigato
9eb0f2f3b3
CC-5859: Airtime Analyzer: format fields before writing to db
2014-05-26 17:13:45 -04:00
