b505f16b8f
Commented out $calendar_info logging
2014-09-17 19:47:05 -04:00
f64b7d0813
Updated show edit functionality to accommodate uploading new show image
2014-09-17 10:27:14 -04:00
b2d81f370a
Merged changes
2014-09-16 18:34:59 -04:00
f3548ff893
Moved functionality for uploading to RESTful ShowController class
2014-09-16 18:18:26 -04:00
5434311f7d
More work on show image uploads
2014-09-16 18:03:14 -04:00
2a2fcdcf10
More work on show image uploading functionality
2014-09-15 17:14:48 -04:00
cb80423fdd
Work on adding image upload to add-show form
2014-09-12 18:05:24 -04:00
662f9d3486
LocaleController path fix
2014-09-08 21:18:57 -04:00
142060d600
Merge remote-tracking branch 'origin/2.5.x' into saas
2014-09-08 20:47:38 -04:00
4c1e6d3fe3
Fixed base URL
...
Conflicts:
airtime_mvc/application/controllers/LocaleController.php
2014-09-04 17:09:09 -04:00
f157cad877
Fix silly CAPTCHA flow, now only asks if you get your password wrong 4
...
times in a row
2014-09-03 11:43:06 -04:00
52f3ed816e
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
2014-08-28 12:01:42 -04:00
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
192c4e884f
Bugfix in LocaleController
2014-08-25 18:19:11 -04:00
0fb9429a9e
Bugfix in LocaleController
2014-08-25 14:18:23 -04:00
1d43200041
Syntax error fix
2014-08-01 15:46:08 -04:00
1ab30c26e6
Enforce non-empty passwords when editing user settings
2014-08-01 15:38:35 -04:00
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
dd37ffbdd7
CC-5888: Handle file deletion if the file is stored in the cloud
...
Execute a python script that deletes a file from the cloud
2014-07-31 23:11:49 -04:00
b7d1852fc0
CC-5896: Store cloud files in separate table, inherited from cc_files
2014-07-28 16:11:05 -04:00
ecb072b84c
CC-5896: Store cloud files in separate table, inherited from cc_files
...
Fixed broken metadata display on Library page
Fixed broken download/preview option from Library page
2014-07-28 15:17:46 -04:00
d320651735
SAAS-461: Re-enable timezone and language settings for Super Admins
2014-07-28 12:37:40 -04:00
1803e1fd8f
Logging::warning bugfix and updated translations
2014-07-25 15:05:35 -04:00
f1ea100411
CC-5896: Store cloud files in separate table, inherited from cc_files
2014-07-24 16:56:15 -04:00
f07e3b65eb
Better error handling if the WHMCS API call for GTM code generation
...
fails
2014-07-24 16:49:03 -04:00
c09457ce7c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-07-16 15:03:39 -04:00
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
e7dfc08128
CC-5892: Handle when a file is downloaded from the Airtime library
2014-07-10 17:59:27 -04:00
52b8f3af87
Show plan updated confirmation on invoices page
2014-07-09 14:06:51 -04:00
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
20f55314b4
Logging to debug account upgrade, possibly broken by WHMCS update
2014-07-09 12:56:53 -04:00
3c05e14e4d
Fix error when upgrading account
2014-07-09 12:51:12 -04:00
6494db3ccf
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
2014-07-03 13:06:14 -04:00
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
10acbb8ad6
Fix WHMCS login for multiple users again
2014-07-03 13:05:44 -04:00
db73c94f5a
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
2014-07-03 12:39:42 -04:00
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
6f9c87db3d
WHMCS login bugfix
2014-07-03 12:39:18 -04:00
9c14cfd47c
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
2014-07-03 12:27:01 -04:00
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
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
a5822aa07a
CORS refactoring
2014-07-03 12:26:09 -04:00
ac930607ad
Redirect index action to upgrade action
2014-07-03 11:08:54 -04:00
758423a7f7
Billing page fix for customers with multiple stations
2014-07-02 14:47:10 -04:00
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
2794ca1355
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
...
Conflicts:
airtime_mvc/application/controllers/UpgradeController.php
airtime_mvc/application/models/Cache.php
2014-07-02 12:34:33 -04:00
728fccc2fe
Fixed Upgrade caching bugs
2014-07-02 12:30:52 -04:00
9de92a87a4
Refactored the upgrade process for Airtime Pro
2014-07-01 13:36:09 -04:00
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
3357c1f032
Select current plan and show that correctly
2014-06-27 15:50:05 -04:00
907c53b94f
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-26 19:14:07 -04:00
2504a34818
Fallback to letting VAT validate if the VIES service is down
2014-06-26 19:13:40 -04:00
54590de6ee
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-26 18:59:14 -04:00
5745288113
Redirect Edit User screen for super admins
2014-06-26 18:58:03 -04:00
fe0485e66b
Invoice view bugfix
2014-06-26 18:04:37 -04:00
d34c0d91cd
Invoice view bugfix
2014-06-26 18:03:40 -04:00
f1610485c3
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-26 17:45:48 -04:00
d785d92953
VAT fixes
2014-06-26 17:44:53 -04:00
18c828defd
Finished up VAT validation for Plans page
2014-06-26 17:31:34 -04:00
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
fce6116d60
Made the invoices view nice!
2014-06-25 20:01:14 -04:00
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
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
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
15013afa40
Better session handling fix
2014-06-25 11:15:14 -04:00
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
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
8c20592423
Start of form customization for billing
2014-06-24 15:52:43 -04:00
5d69ba5f91
Custom fields were not saving
2014-06-24 12:51:02 -04:00
73724bdd04
Custom fields were not saving
2014-06-24 12:46:11 -04:00
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
806525e28c
Fetch service id from whmcs api for upgrades
2014-06-23 17:04:23 -04:00
da6263c677
Merge branch 'cc-5709-airtime-analyzer-saas' into saas
2014-06-23 16:27:38 -04:00
701139e433
Merge branch 'gtm-saas' into cc-5709-airtime-analyzer-saas
2014-06-23 15:45:03 -04:00
72ef576f03
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-23 15:28:50 -04:00
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
a2bef67d33
Fix user session storage in multi-tenancy mode
2014-06-23 15:22:44 -04:00
380b5526d6
Merge branch 'whmcs-login-saas' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-23 13:25:40 -04:00
3919fbd839
Merge branch 'whmcs-login' into cc-5709-airtime-analyzer-buy-now
2014-06-23 13:25:19 -04:00
55ff95a34f
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-23 13:24:47 -04:00
6302e3b335
Fix CORS with Chrome
2014-06-23 13:24:28 -04:00
f40cdbc8cd
Merge branch 'saas' into cc-5709-airtime-analyzer-buy-now-saas
2014-06-23 10:59:07 -04:00
0439413ac0
Merge branch 'whmcs-login' into cc-5709-airtime-analyzer-buy-now
2014-06-20 17:46:08 -04:00
e43c1c00cf
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-20 17:43:37 -04:00
0eab0c609b
Permissions fixes for Super Admin users
2014-06-20 17:43:20 -04:00
497841225b
Merge branch 'whmcs-login' into cc-5709-airtime-analyzer-buy-now
2014-06-20 16:54:41 -04:00
f6a4a9d0d0
Removed invalid client id - for testing purposes
2014-06-20 16:54:05 -04:00
7275986158
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-20 16:42:18 -04:00
4179123ce0
Set up CORS for microsite autologin after signup
2014-06-20 16:41:48 -04:00
1e1dc1dd03
Validation
...
Refactoring
2014-06-20 16:31:26 -04:00
01bf2883e5
Save client info on upgrade
2014-06-20 15:00:28 -04:00
82220a44a3
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-20 13:36:37 -04:00
faa12c8065
Super Admin edit page points to billing now
...
* Also prevent super admin from being deleted
2014-06-20 13:36:06 -04:00
40f2796972
Created an invoice view
...
Some refactoring
Some validation
2014-06-19 16:55:01 -04:00
540b9167a1
Invoice action
2014-06-19 07:10:30 -04:00
83dbc789af
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-18 20:22:33 -04:00
29e9182fcd
Fixed syntax error... grumble grumble
2014-06-18 20:22:13 -04:00
6402e6d2b6
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-18 20:20:30 -04:00
76659c80c4
Fixed bad client ID / subdomain check in WhmcsLoginController
2014-06-18 20:20:08 -04:00
20c069fc65
Merge branch 'saas' into whmcs-login-saas
2014-06-18 18:43:15 -04:00
ee928a2963
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-18 18:43:12 -04:00
81699b3c65
Fixed missing constant
2014-06-18 18:42:55 -04:00
b6ab9fa2c5
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-18 18:29:14 -04:00
971e81756c
Added ability to login directly with WHMCS credentials (on Airtime login
...
screen)
2014-06-18 18:27:16 -04:00
b12d88ddf7
Fix a whoopsies
2014-06-18 11:03:26 -04:00
70a7410b1a
Remove key
2014-06-18 10:42:50 -04:00
0ba09c2dda
Merge branch 'whmcs-login' into whmcs-login-saas
2014-06-17 17:41:46 -04:00
7f6fc7770a
Added Super Admin role and WHMCS login
2014-06-17 17:40:55 -04:00
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
d81afca7e3
Adding detailed log statements for actions involving show scheduling
2014-06-17 14:17:28 -04:00
1f4c8b755d
Created a separate view for upgrades and client info
2014-06-17 12:47:08 -04:00
d39f7548cd
un-hardcoded client id
2014-06-12 17:58:02 -04:00
81ceafbfbd
whmcs client form
2014-06-12 17:54:20 -04:00
e3850f79da
Fix for detecting account duration
2014-06-11 14:09:40 -04:00
994dbddac2
Use document ready() event to fire data layer
2014-06-11 13:52:42 -04:00
d984ec9b43
Don't use NumberFormatter because of PECL intl dependency
2014-06-11 13:45:23 -04:00
5df522f226
Added GTM code and data layer
2014-06-11 13:24:03 -04:00
fa3c7bd67a
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-09 11:37:06 -04:00
a12ebf2cb1
CC-5836: Status page still reports media-monitor even AA enabled
2014-06-04 18:23:18 -04:00
6e5d99b828
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-04 14:16:06 -04:00
e3c2ae03b3
Fixed upload file count being wrong in Add Media page (lemma to CC-5863)
2014-06-04 14:15:36 -04:00
e8de3b5750
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-06-02 14:15:06 -04:00
2e6d3821ae
CC-5863: Deleted files still shown in Recent Uploads view
...
* Fixed
2014-06-02 14:14:09 -04:00
f684ce4ab9
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-05-20 14:16:24 -04:00
4cdd855a21
CC-5855: Output to zendlog when files are deleted from library
2014-05-20 14:15:51 -04:00
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
e4e5590b9f
CC-5802: Upgrade application.ini file
...
Remove this upgrade step from the upgrade controller
2014-05-05 11:19:14 -04:00
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
42806b1cbf
CC-5802: Upgrade application.ini file
2014-04-28 09:43:21 -04:00
2fdb8d1deb
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-25 15:00:29 -04:00
8d9b9c1fb7
Moved deleting the maintenace temporary file flag to very end of upgrade task
2014-04-25 15:00:13 -04:00
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
66000a2847
CC-5802: Upgrade application.ini file
...
Changed where we insert new application.ini file lines
2014-04-25 14:53:58 -04:00
61df7c1a44
Moved some comments around
2014-04-25 14:20:04 -04:00
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
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
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
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
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
25e484cc2f
Delete code that was copied in twice
2014-04-25 10:22:38 -04:00
22b9cc3be1
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-25 01:08:24 -04:00
d9adba117a
One more time...
2014-04-25 01:08:08 -04:00
7a2f27fe41
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-25 01:03:05 -04:00
cdc88d25e1
Argh, fixed typo... it's late
2014-04-25 01:02:47 -04:00
3e2a165dd2
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-25 00:48:54 -04:00
e7ea5e5301
Try fixing UpgradeController version check again...
2014-04-25 00:48:13 -04:00
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
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
42f3bb17e1
CC-5814: 'Down for maintenance' page during upgrades
2014-04-24 16:23:57 -04:00
f536a7b1b4
CC-5814: 'Down for maintenance' page during upgrades
2014-04-24 16:19:55 -04:00
fcd8ea8ba5
CC-5802: Upgrade application.ini file
2014-04-24 10:22:52 -04:00
069ebd3991
CC-5802: Upgrade application.ini file
2014-04-24 10:12:24 -04:00
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
2f8461b2a6
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-23 14:58:36 -04:00
3e34f1cf96
fixing up some datatables queries, propel usage.
2014-04-23 12:53:43 -04:00
41e2b5d840
Fix the failed uploads view
2014-04-23 11:52:10 -04:00
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
d00e390511
Removed last change
2014-04-17 13:58:56 -04:00
0a6b72ad99
Removing something for testing purposes
2014-04-17 13:56:02 -04:00
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
3ebf9e56dd
Upgrade script testing
2014-04-16 17:30:44 -04:00
b348286448
Upgrade script testing
2014-04-16 17:28:55 -04:00
456ac40fe6
Upgrade action testing
2014-04-16 17:27:15 -04:00
cd6c4f7ede
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-16 17:24:56 -04:00
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
9041801103
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-14 12:09:48 -04:00
63e2eda64b
CC-5786: Quota Enforcement in the File Upload API
...
Tweaked this so it will work on self-hosted instances
2014-04-14 12:09:15 -04:00
edcf8844e3
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-14 11:25:02 -04:00
4add0f0b7b
CC-5786: Quota Enforcement in the File Upload API
2014-04-14 11:24:39 -04:00
4afccfe225
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-10 15:55:49 -04:00
7fbd285dd0
Fix typo
2014-04-10 15:55:21 -04:00
51c80bc033
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
2014-04-10 15:50:58 -04:00
819862c37b
CC-5781: Upgrade script for new storage quota implementation
...
cleaned up upgrade controller
2014-04-10 10:55:47 -04:00
b9b3e95caa
CC-5781: Upgrade script for new storage quota implementation
...
Returns error if API key is incorrect
Set the upgrade controller to skip login authentication
2014-04-10 09:28:23 -04:00
bae0c564d0
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-04-10 07:12:52 -04:00
5971f51b53
CC-5781: Upgrade script for new storage quota implementation
...
First draft of an upgrade controller
2014-04-10 07:12:31 -04:00
8fb95316f2
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
2014-04-09 15:01:11 -04:00
4fe9fc189a
CC-5709: Airtime Analyzer
...
* CC-5772: Recent Upload table times should be shown in local time
2014-04-09 14:57:30 -04:00
e044187aed
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
python_apps/airtime_analyzer/setup.py
2014-04-04 19:48:22 -04:00
64a95c7c59
CC-5709: Airtime Analyzer
...
* Nuked another unused function
2014-04-03 16:36:42 -04:00
95b369c54d
CC-5709: Airtime Analyzer
...
* Remove awful StoredFile::uploadFile() function
* Massive airtime_analyzer commenting and cleanup
* Cleaned up the upload code
* Temporarily disabled the liquidsoap playability test.
2014-04-03 16:13:26 -04:00
1c5e2d6205
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas
...
Conflicts:
airtime_mvc/public/index.php
* Reverted some SaaS-only thing Martin did a year ago. Looks benign but
only one way to find out...
2014-03-27 16:38:03 -04:00
db2b52a1bf
CC-5709: Airtime Analyzer
...
* Some cleanup and refactoring for file deletion in the Media REST API
* Fix the refresh timer on the Add Media page when there's pending
imports.
2014-03-24 17:14:04 -04:00
61c2c90b7e
CC-5709: Airtime Analyzer
...
* Remove the "hidden" field from the REST blacklist, the analyzer needs to set it.
* Added import_status column messages in the recent uploads table
* Auto-refresh the recent uploads table while imports are pending
* Moved the file moving stuff to its own analyzer in airtime_analyzer
* Basic error reporting to the REST API in airtime_analyzer, needs
hardeneing though
* Fixed a bug with the number of recent uploads
* Prevent airtime_analyzer from running if media_monitor is running
2014-03-22 02:12:03 -04:00
8f7ecafcf6
CC-5709: Airtime Analyzer
...
* A bunch of changes that somehow didn't make it into my last commit...
* confused
2014-03-21 14:03:17 -04:00
f120caa093
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-03-21 13:26:47 -04:00
878dd11ccc
CC-5709: Airtime Analyzer
...
* Overhauled Add Media screen, now shows state of recent uploads
* Dropped old unused "state" column, added new file_import column to cc_files
* New PluploadController methods
* Save the filename as the track title for unprocessed uploads
* Hide pending files from the library until they've been processed.
* Don't overwrite files with duplicate names, we rename them instead.
2014-03-21 13:22:00 -04:00
7800cb1e15
SAAS-382: Reimplement Storage Quota
...
Storing disk usage in cc_pref
Add/subtract filesize to/from disk usage total when a file is uploaded or deleted
TODO: Hook this into the ftp server
2014-03-21 09:50:03 -04:00
2a783f3825
Merge branch '2.5.x' into 2.5.x-saas
2014-03-17 15:41:14 -04:00
e6cbbdff33
CC-5709: Airtime Analyzer
...
* Added session auth to the Media API (if you're logged in)
* Started reworking our Plupload interaction with the server to be less
awkward.
* Basic uploading works with the Add Media page again, but messages
aren't dispatched to airtime_analyzer yet (coming next...)
2014-03-13 11:14:30 -04:00
97989953c8
CC-5727 : History search range using incorrect timezone offset (also Nowplaying & Listener Stats)
...
need to modify these to user timezone strings to match the new changes.
2014-03-12 18:00:01 -04:00
f8935a312f
CC-5727 : History search range using incorrect timezone offset (also Nowplaying & Listener Stats)
...
fixing listener stat search
2014-03-11 13:24:22 -04:00
8d2926aeed
CC-5727 : History search range using incorrect timezone offset (also Nowplaying)
...
sending the timestamp string back for nowplaying as well.
added error class to history page if end is < start.
2014-03-10 18:33:07 -04:00
5f3199b4bb
CC-5727 : History search range using incorrect timezone offset
2014-03-10 17:39:17 -04:00
6d7117f670
CC-5709: Airtime Analyzer
...
* Added MetadataAnalyzer unit tests and test data
* Improved debug logging and squashed pika logging
* Implemented file moving
* Extract the track number/total
* Fixed mapping of mutagen to Airtime fields in a few spots. The mapping
matches the DB column names now.
* Fixed the bin/airtime_analyzer binary
* Started work on PluploadController to make it work with the new File
API
2014-03-10 16:32:23 -04:00
64c1dd2c1e
CC-5701: Airtime File API
...
Beginnings of fil rest api
index, get, post actions working without authentication
2014-02-27 17:11:17 -05:00
86dafaf61c
SAAS-404: Separate the Airtime API version from the Airtime version
...
* Airtime PHP side can be version bumped without pypo freaking out now
2014-02-14 16:22:15 -05:00
acb3b9b179
Merge branch '2.5.x' into 2.5.x-saas
2014-02-11 10:29:50 -05:00
3b9608a8df
CC-5693: API call to notify-item-start-playing fails because an invalid schedule id is sent
...
Temporary fix for this bug. Throw an exception if no schedule item is found.
2014-02-10 16:19:26 -05:00
49474ab5c4
Merge branch '2.5.x' into 2.5.x-saas
...
Conflicts:
airtime_mvc/application/forms/AddShowWhen.php
airtime_mvc/application/forms/LiveStreamingPreferences.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/application/views/scripts/schedule/add-show-form.phtml
2013-12-17 17:20:38 -05:00
424de61a11
CC-5619 : Browser caching can produce unexpected behaviour in the 'Listen Now' window.
...
upgrading to jPlayer 2.5.0
2013-12-16 17:14:00 -05:00
1dfcfd3e34
CC-5639: Repeating show's instances will vanish when editing single instance with overlapping warning
...
The wrong action was getting set when there were errors in the show form
2013-12-13 14:20:43 -05:00
d841f11de3
CC-5638: Shows become unlinked when moving the end time back
...
Disabled linked checkbox field in show form while the show is playing
Added a warning message if the user attempts to change this value
Update .po and .mo files with the warning message string
2013-12-13 13:06:14 -05:00
d0474f4247
Changed function title when editing a repeating instance
...
Removed a function call we don't need when editing a repeating instance
2013-12-12 16:47:55 -05:00
1577b7c41e
CC-5627: Check all Application_Common_DateHelper calculations that use
...
timezone.
* Use the user timezone in eventFeedAction(), will fix a bug where
shows at the edge of a week can disappear from the calendar if
the user timezone is not the same as the station timezone.
2013-12-12 16:39:20 -05:00
a96c2551ef
CC-5627 : Check all Application_Common_DateHelper calculations that use
...
timezone.
* Fixed GetPlayOrderRange to be consistently return everything in UTC.
* ApiController liveInfoAction now returns everything consistently in
the station timezone. This fixes negative remaining time that could
occur in the embeddable JS Airtime widgets if you were logged in to
Airtime while you viewed your website. (The widgets display in
the browser's local time.)
* ScheduleController getCurrentPlaylistAction() returns everything
consistently in the user timezone now.
2013-12-12 13:28:51 -05:00
b13d12eaac
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
2013-12-11 15:20:19 -05:00
3d1f0b0d0e
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
2013-12-10 17:41:59 -05:00
3a2f9a24b5
CC-5627 : Check all Application_Common_DateHelper calculations that use timezone.
...
working on getting widgets to work properly returning station local time.
2013-12-10 16:45:05 -05:00
a1a9ec34cc
CC-5594 : Remove all date_default_timezone_get()
...
moving var serverTimezoneOffset to bootstrap,
also creating a var for userTimezoneOffset.
Utilities.js uses the userTimezoneOffset to calculate time in forms.
2013-12-06 18:17:30 -05:00
39063aaadb
CC-5594 : Remove all date_default_timezone_get()
...
using the user selected timezone in the form to calculate duration.
2013-12-05 15:12:01 -05:00
8f1e73edf5
CC-5594 : Remove all date_default_timezone_get()
...
fixing up controllers
2013-12-04 16:26:11 -05:00
20b32bab80
CC-5594 : Remove all date_default_timezone_get()
...
simplifying code, removing unnecessary calculations.
2013-12-04 16:05:18 -05:00
a465b5a770
CC-5405: When editing a single show instance from a repeating series, should not create a new cc_show
...
Create a new cc_show_day rule instead of a new cc_show
2013-12-04 09:00:43 -05:00
0bae60138f
CC-5555 : Implement simple caching for preferences
...
forgot to get rid of user id here.
2013-11-11 16:50:35 -05:00
06323a40fd
CC-5555 : Implement simple caching for preferences
...
fixing up code so user id is never passed in manually to a preference getter.
2013-11-11 16:20:51 -05:00
2ef95db747
CC-5371 : Fail to extend/shrink show by drag
...
window rezie event was triggered when resizing the show, caused problem.
Using the windowResize callback provided by fullcalendar now.
2013-10-10 17:38:49 -04:00
256ec9292d
CC-5388: Calendar won't load
2013-10-09 16:20:43 -04:00
38634810a3
Update .po files
2013-10-08 11:48:24 -04:00
c687b6ad24
Merge branch 'master' of https://github.com/jamieconnor/Airtime
...
Conflicts:
airtime_mvc/application/services/ShowService.php
2013-10-08 11:16:25 -04:00
7c2e92f6e5
CC-5293: Calendar page cannot be loaded sometimes
2013-10-07 17:16:52 -04:00
faa6c7210c
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-10-02 11:25:08 -04:00
4d01e3b11f
CC-5347 : isScheduled doesn't work for webstreams
2013-10-02 11:24:48 -04:00
3d9bc85fa0
Merge branch '2.5.x' of dev.sourcefabric.org:airtime into 2.5.x
2013-10-01 08:49:10 -04:00
1fa13eed13
CRLF
2013-09-30 13:59:08 -04:00
7d739a0f66
CC-5316 : Playout History: Doesn't support webstream
...
adding the webstream metadata to the history table.
2013-09-30 13:56:27 -04:00
6aa6d576cd
CC-5323: User's Timezone Can Improperly Edit Show
...
-made localizeDate a static function in ShowFormService
2013-09-25 16:22:30 -04:00
8ddb2974f1
CC-5323: User's Timezone Can Improperly Edit Show
2013-09-25 16:22:30 -04:00
107263ae20
CC-5323: User's Timezone Can Improperly Edit Show
2013-09-25 16:22:30 -04:00
24861545ce
crlf fix
2013-09-24 12:24:13 +02:00
7e96828cdd
CC-5317 : Guest user can't see Now playing page
...
removed the library module completely from page if the user does not have permission to view it.
2013-09-24 12:21:04 +02:00
9de8b6634c
CC-5334 : Localize Ryerson History Feature
...
crlf
2013-09-23 14:58:56 +02:00
9ec6156c92
CC-5334 : Localize Ryerson History Feature
2013-09-23 14:57:44 +02:00
ee45f10aeb
CC-5334 : Localize Ryerson History Feature
2013-09-23 14:42:35 +02:00
1c6d7725ca
Modified weekInfo from ApiController to display current week and next, changed widget to display extra days.
2013-09-18 17:35:32 +12:00
6da9b6bf42
Removed repeated code
2013-09-07 14:52:45 +12:00
682a37894b
Merge branch 'ryerson-history' into 2.5.x-saas
...
Conflicts:
airtime_mvc/application/views/scripts/menu.phtml
2013-09-02 15:52:43 -04:00
60bf334aeb
Merge branch '2.4.x' into 2.4.x-saas
2013-09-02 15:46:25 -04:00
4fd37a4fa0
Merge branch '2.4.x' into ryerson-history
2013-08-30 16:07:41 -04:00
15e27f8166
history records for a show have times validated within show range.
2013-08-30 00:43:43 -04:00
a4c97479b6
using an accordian to display per show logs.
2013-08-28 23:30:15 -04:00
429cdeeffb
filtering by a host's show so they can edit their own playout history.
2013-08-28 19:37:46 -04:00
653a6384b9
creating a separate controller for playouthistory templates.
2013-08-28 18:25:46 -04:00
b1e71e5adf
added optional parameter number_of_days for getting schedule information
2013-08-26 11:26:09 +12:00
c2b9bb01ac
crlf
2013-08-23 15:53:18 -04:00
dbe160c5d9
beginning of displaying form errors, need to keep working on this.
2013-08-23 15:52:49 -04:00
af822bb5b9
showing time first for endtime box.
2013-08-22 21:39:46 -04:00
01370c2124
reverting back to the bootstrap datetime picker since it's nicer to use.
2013-08-22 20:23:17 -04:00
84efdfd64a
crlf
2013-08-20 17:23:48 -04:00
007a7ee7ef
casting non mandatory types from "", to avoid database query problems.
2013-08-20 17:23:15 -04:00
Duncan Sommerville
Albert Santoni
drigato
Naomi
denise
Jamie Connor