Albert Santoni
f07e3b65eb
Better error handling if the WHMCS API call for GTM code generation
...
fails
2014-07-24 16:49:03 -04:00
Albert Santoni
0d9cf2485e
Merge remote-tracking branch 'origin/cc-5709-airtime-analyzer-buy-now' into saas
2014-07-15 16:47:20 -04:00
Albert Santoni
490a9c0d06
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-07-15 16:46:20 -04:00
Albert Santoni
7438ecd2b4
Use track metadata from Airtime in playout engine
...
* Resolves CC-5893: Metadata not updated on Airtime Pro
* Report track metadata in the schedule API, and make pypo pass that
along to Liquidsoap via annotations.
* Move HTTP response sanitization for file metadata out of the REST module and into CcFiles
* Slightly improved the terrible exception handling in pypo
2014-07-15 16:41:55 -04:00
Albert Santoni
1aa99e2896
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.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-07-15 16:41:29 -04:00
Albert Santoni
790af06929
Use track metadata from Airtime in playout engine
...
* Resolves CC-5893: Metadata not updated on Airtime Pro
* Report track metadata in the schedule API, and make pypo pass that
along to Liquidsoap via annotations.
* Move HTTP response sanitization for file metadata out of the REST module and into CcFiles
* Slightly improved the terrible exception handling in pypo
2014-07-15 16:32:48 -04:00
Albert Santoni
b8a9d72da6
Give Submit Order button an ID for GTM
2014-07-11 16:37:48 -04:00
Albert Santoni
bbade8401c
FTP upload hook bugfix for files with commas in their names (CURL
...
restriction)
2014-07-10 16:43:13 -04:00
Albert Santoni
08f4610aec
Fix CURL error handling in FTP upload hook
2014-07-10 12:12:16 -04:00
Albert Santoni
52b8f3af87
Show plan updated confirmation on invoices page
2014-07-09 14:06:51 -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
20f55314b4
Logging to debug account upgrade, possibly broken by WHMCS update
2014-07-09 12:56:53 -04:00
Albert Santoni
3c05e14e4d
Fix error when upgrading account
2014-07-09 12:51:12 -04:00
Albert Santoni
9b3a26c19a
Fix user deletion, remove spurious logging
2014-07-08 17:45:22 -04:00
Albert Santoni
fc2f68cb51
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-07-07 15:54:02 -04:00
Albert Santoni
e84f765696
Better FileMover permissions unit test (passes as root)
2014-07-07 15:53:25 -04:00
Albert Santoni
2750b6aa0b
Fixed unit tests in saas branch
2014-07-07 15:30:18 -04:00
Albert Santoni
0b41cd1d38
Validate VAT every time the Account Plans page loads
2014-07-07 15:20:41 -04:00
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