Commit Graph

1603 Commits

Author SHA1 Message Date
Albert Santoni 758423a7f7 Billing page fix for customers with multiple stations 2014-07-02 14:47:10 -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 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
Albert Santoni 728fccc2fe Fixed Upgrade caching bugs 2014-07-02 12:30:52 -04:00
Albert Santoni 9de92a87a4 Refactored the upgrade process for Airtime Pro 2014-07-01 13:36:09 -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 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
Albert Santoni 2504a34818 Fallback to letting VAT validate if the VIES service is down 2014-06-26 19:13:40 -04:00
Albert Santoni 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
Albert Santoni 5745288113 Redirect Edit User screen for super admins 2014-06-26 18:58:03 -04:00
Albert Santoni fe0485e66b Invoice view bugfix 2014-06-26 18:04:37 -04:00
Albert Santoni d34c0d91cd Invoice view bugfix 2014-06-26 18:03:40 -04:00
Albert Santoni 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
Albert Santoni d785d92953 VAT fixes 2014-06-26 17:44:53 -04:00
Albert Santoni 18c828defd Finished up VAT validation for Plans page 2014-06-26 17:31:34 -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 fce6116d60 Made the invoices view nice! 2014-06-25 20:01:14 -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 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
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
drigato 9041801103 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-14 12:09:48 -04:00
drigato 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
drigato edcf8844e3 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-14 11:25:02 -04:00
drigato 4add0f0b7b CC-5786: Quota Enforcement in the File Upload API 2014-04-14 11:24:39 -04:00
drigato 4afccfe225 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-10 15:55:49 -04:00
drigato 7fbd285dd0 Fix typo 2014-04-10 15:55:21 -04:00
drigato 51c80bc033 Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas 2014-04-10 15:50:58 -04:00
drigato 819862c37b CC-5781: Upgrade script for new storage quota implementation
cleaned up upgrade controller
2014-04-10 10:55:47 -04:00
drigato 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
drigato 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
drigato 5971f51b53 CC-5781: Upgrade script for new storage quota implementation
First draft of an upgrade controller
2014-04-10 07:12:31 -04:00
Albert Santoni 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
Albert Santoni 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
Albert Santoni 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
Albert Santoni 64a95c7c59 CC-5709: Airtime Analyzer
* Nuked another unused function
2014-04-03 16:36:42 -04:00
Albert Santoni 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
Albert Santoni 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
Albert Santoni 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
Albert Santoni 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
Albert Santoni 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
Albert Santoni 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
Albert Santoni 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
drigato 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
Albert Santoni 2a783f3825 Merge branch '2.5.x' into 2.5.x-saas 2014-03-17 15:41:14 -04:00
Albert Santoni 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
Naomi 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
Naomi 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
Naomi 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