2a89e4d5a0
Massive refactor of the analyzer branch and sync it back up with the
...
cloud storage branch (for the last time)
* Backported all the bugfixes from cc-5709-airtime-analyzer-cloud-storage
* Backported missing FileStorageBackend.php
* Fixed CC-6001: Track titles and artist names with slashes break audio preview
* Refactored all the MediaController code, pulling out the logic into MediaService
* Fixed an API key leak to guests in the Media API
* Made this branch work without cloud_storage.conf (defaults to file storage)
* Made ApiController's getMediaAction use the MediaService code
2015-02-20 14:01:06 -05:00
be7cae4408
Fixed CSRF prevention checks for REST calls, moved CSRF initialization to Bootstrap
2015-02-20 13:12:49 -05:00
6d00da89db
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/models/airtime/CcFiles.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-20 11:14:11 -05:00
fd0db11450
SAAS-596: Store file size and hash in database
...
Added upgrader class to add new filesize column
2015-02-19 16:27:50 -05:00
ddab1943f6
Merge branch '2.5.x' into saas
2015-02-19 09:20:57 -05:00
b3a46b948f
CC-5999: Unknown file type: audio/vorbis
2015-02-19 09:19:27 -05:00
961cdfc2ee
CC-5849: Audio preview audio/x-wav exception
2015-02-18 19:41:56 -05:00
857ad9615e
CC-5849: Audio preview audio/x-wav exception
2015-02-18 19:40:27 -05:00
0535626df1
Merge branch 'saas-file-sanitization' into saas
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-18 17:19:26 -05:00
9098e204e5
Merge branch 'cc-5709-airtime-analyzer' into saas-file-sanitization
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-18 17:18:43 -05:00
964d7d1326
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-18 16:42:04 -05:00
17f1d0e96d
Simplify the metadata sanitization and bugfix it
...
* SAAS-376 and CC-5868
2015-02-18 16:29:08 -05:00
2ae921e9d7
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2015-02-18 16:16:41 -05:00
72e4a036a4
Cleaning up editFileMD in LibraryController
2015-02-17 15:09:18 -05:00
29d7e20622
Fixing file metadata sanitization
2015-02-17 12:39:58 -05:00
29c6ae15b0
Merged cc-5709-airtime-analyzer into saas-file-sanitization
2015-02-17 12:19:11 -05:00
a07a1edcc0
SAAS-595 - Updated validation and sanitization
2015-02-17 12:17:49 -05:00
e603597101
Cleanup and comments
2015-02-17 12:13:37 -05:00
ad5536dedd
SAAS-582 - Added provisioning class to create database from within Airtime
2015-02-12 15:39:22 -05:00
c261182c8f
Skeleton player form/view/controller
2015-02-12 14:08:06 -05:00
dd095e8933
Added create endpoint to provisioning controller, fixed RestAuth helper
2015-02-09 17:41:03 -05:00
2cf0f7da7a
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
airtime_mvc/application/configs/ACL.php
2015-02-06 16:06:32 -05:00
2a9790adf3
Backport ACL REST permission fix
2015-02-06 16:05:51 -05:00
a20f90cd2d
Marginally better error handling for 401 in REST controller
2015-02-06 15:20:01 -05:00
7bf96e09a5
Tweaked ACL plugin again temporarily
2015-02-06 14:45:07 -05:00
bcd7e3d70f
Rollback last commit due to REST error when downloading files
2015-02-06 14:43:34 -05:00
ed190c30f3
Merge branch 'cc-5709-airtime-analyzer' into saas
2015-02-06 14:33:17 -05:00
4b6e5671c3
REST permission fix
2015-02-06 14:33:02 -05:00
74e142c3d7
Fix for ACL REST error
2015-02-06 14:28:25 -05:00
826ae17552
SAAS-580 - Fixed routing issue causing show art to not upload; changed ShowController to be more RESTful
2015-02-04 15:09:27 -05:00
7eef9d941e
Recommitting filesize checks in smartReadFile
2015-02-03 16:33:48 -05:00
d5477dfb5b
Fix misordering of params in readfile function
2015-02-03 16:23:26 -05:00
b5f6077c04
Quick fix for pro
2015-02-03 16:22:12 -05:00
6601e016a6
Removed unused variable
2015-02-03 15:19:41 -05:00
e0269e1e22
smartReadFile fix for saas show-logo
2015-02-03 14:16:44 -05:00
75ce732512
Fixed bad merge
2015-02-02 18:04:08 -05:00
7717692b41
Merge branch '2.5.x' into saas
2015-02-02 18:03:39 -05:00
df4bc01ff8
Log all PHP errors (including parse errors) to our zend log
2015-02-02 18:03:13 -05:00
1ddc27bb77
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/public/index.php
2015-01-27 18:26:39 -05:00
e83c86a0ff
Refactored the logging class to reduce code, use error levels correctly, and improve performance.
2015-01-27 18:24:13 -05:00
dbba5a7427
Decouple Billing and S3 cloud storage stuff from Zend
2015-01-26 13:10:10 -05:00
49667e3d2d
Squash logging
2015-01-26 12:12:27 -05:00
ac8fadfc80
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
CREDITS
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-23 16:36:31 -05:00
ca9750f415
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/configs/ACL.php
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/build/sql/schema.sql
2015-01-23 11:32:45 -05:00
134ade877c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
airtime_mvc/build/sql/schema.sql
2015-01-22 15:48:34 -05:00
d5ee710f89
Fixed CSRF token checking in MediaController (broken by last 2 commits)
...
* Also fixed getOwnerId(), no longer calls a non-existent function
2015-01-22 12:20:13 -05:00
230cdcccb4
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
CREDITS
2015-01-22 11:29:38 -05:00
bade613e80
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-01-22 11:19:25 -05:00
a40067ca55
Moved REST authorization boilerplate to Zend Acl_plugin
2015-01-21 17:20:04 -05:00
2c2f7ebc5f
Initial commit for update to ACL for REST module; NEEDS TESTING
2015-01-21 15:34:15 -05:00
2cb26db84b
SAAS-547: Refactor upgrade procedure in 2.5.x-installer branch
...
* Start using "schema_version" key instead of "system_version"
* Refactored the upgrade code a bit and make it be automatically invoked
from the Zend bootstrap if a schema update is needed.
* Fixed error logging in certain cases
* Fixed an exception in Show related to image_path
2015-01-19 13:41:23 -05:00
5abe364a69
Forgot to rename the 2.5.5 upgrade.sql to 2.5.2
2015-01-16 17:31:11 -05:00
c03dd38c00
Merge branch '2.5.x' into 2.5.x-installer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/models/Show.php
2015-01-16 17:27:52 -05:00
44018b2cbf
Changed status page to use config-check (tentative) and removed time-intensive check in index routing
2015-01-16 16:15:16 -05:00
57a7218a79
SAAS-540: Change the Provisioning Controller's terminate endpoint to reflect new S3 file prefix
2015-01-16 11:09:13 -05:00
791466b023
Fixes for code review https://github.com/sourcefabric/Airtime/pull/84
2015-01-15 16:33:33 -05:00
7c28b66ce9
Merge branch '2.5.x-albertenhancements' into saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/forms/Preferences.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-15 16:32:29 -05:00
f9bf71a349
Moved the Station Logo field to GeneralPreferences, and stopped using
...
AJAX on the general prefs form
2015-01-15 16:28:18 -05:00
ee9163fa8e
2.5.2: Reorganize upgrade path so that 2.5.2 contains the show art schema changes
...
* Also bump the system_version number to 2.5.2. This will be deprecated sooner or later...
2015-01-15 12:42:36 -05:00
5e22f929c7
Reverted commit mistakenly changing file modifiers to 755
2015-01-14 20:45:03 -05:00
d99147bad4
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
2015-01-13 14:23:51 -05:00
7bdf34fcd1
Logging
2015-01-12 15:58:50 -05:00
8f0f69abd9
More logging
2015-01-12 15:45:33 -05:00
44b82fdd8a
More logging statements
2015-01-12 15:37:48 -05:00
f0bad70cee
Merge branch '2.5.x' into saas-pullreq77
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/controllers/ApiController.php
2015-01-09 13:10:54 -05:00
17a577fbbb
use is_numeric instead of is_int as values are strings
2015-01-09 13:02:25 -05:00
1b03bd7fbd
use new var instaead of calling getShowListContent again
2015-01-09 13:02:25 -05:00
fc8e65944e
added error checked for required params
2015-01-09 13:02:25 -05:00
1cc1f8a378
return error for missing instance_id on show-tracks action
2015-01-09 13:02:25 -05:00
174cf79d84
clean up shows endpoint, remove dependency on Show model
2015-01-09 13:02:25 -05:00
a27ca2f583
cleanup new HTTP apiendpoints, added HTTPHelper and getStartEndFromRequest and updated all controllers that called their own versions of this function
2015-01-09 13:02:25 -05:00
03dae5be2b
fix spacing in ApiController
2015-01-09 13:01:43 -05:00
44b4faf6d9
added shows, show-schedules, show-preview, show-history-feed, item-history-feed endpoints to the HTTP api to be used via NewscoopAirtimePlugin
2015-01-09 13:01:42 -05:00
f4c5cf1353
Added virtualenv back into install process
2015-01-05 16:41:03 -05:00
6ee97d9c53
Upgrade sql was missing the storage_backend column
2014-12-18 18:55:37 -05:00
ab4ebb2969
SAAS-525: Station Termination -> Delete cloud_file table records
...
Deleted cloud_file records.
Renamed the function that does this.
2014-12-16 14:13:57 -05:00
2af14e099b
SAAS-519: webstreams not being deleted
2014-12-15 12:49:13 -05:00
c24320a094
Removed call to session_write_close()
2014-12-15 09:49:35 -05:00
891cfdb48e
SAAS-517: Create Provisioning controller with a terminate endpoint
2014-12-11 13:35:34 -05:00
e9a966a8a4
Test closing the session to prevent asnyc blocking to see if it impacts load performance
2014-12-11 12:53:45 -05:00
008ffa025a
SAAS-517: Create Provisioning controller with a terminate endpoint
...
Not quite done but getting there
2014-12-10 17:04:14 -05:00
cf9eabbc74
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/build/sql/schema.sql
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-12-03 13:35:32 -05:00
183fa7b3a3
Bind CURL calls to WHMCS to ipv4 adapter because WHMCS IP whitelist
...
doesn't support IPv6
* Fixes WHMCS login for all airtime.pro users
2014-12-01 16:10:03 -05:00
acaf47c592
More work on web setup form
2014-12-01 15:49:53 -05:00
94d9577539
Temporarily disable the Google Tag Manager generation for debugging
2014-12-01 11:34:47 -05:00
e59cd11370
Close the session when a track is previewed or downloaded.
...
Close the file pointer when we are down with it.
2014-11-27 13:48:34 -05:00
477ac337e5
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-11-26 11:54:07 -05:00
884a4c493d
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
2014-11-26 11:42:40 -05:00
f08535cc10
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
2014-11-26 10:35:48 -05:00
bec62ec906
SAAS-496: Create a provisioning controller with a terminate endpoint
2014-11-25 16:04:08 -05:00
df933b57f7
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-20 17:12:52 -05:00
8e8fe2d288
SAAS-489: Cannot preview tracks stored on disk
2014-11-20 17:11:23 -05:00
29fd728d7d
Undo live stream auth action breakage
2014-11-20 14:30:42 -05:00
cea3fc5302
Temporarily fix live stream auth (show source)
2014-11-20 13:59:59 -05:00
4d8b32556b
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-11-18 09:24:38 -05:00
97b74a0997
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/models/Schedule.php
2014-11-12 15:08:35 -05:00
c132cac43d
Code cleanup
2014-11-12 14:42:34 -05:00
10db978a2b
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-11 16:30:50 -05:00
5cf5ff4fa1
code cleanup
2014-11-11 16:29:54 -05:00
785651ec4b
Merged 2.5.x into 2.5.x-installer
2014-11-10 17:15:41 -05:00
8733788807
Added NOT NULL to cloud_file foreign key field
2014-11-10 10:55:15 -05:00
6b058ade0b
Upgrade script fix
2014-11-10 10:50:15 -05:00
13f6b693d6
Fixed upgrade.sql script
2014-11-10 10:37:01 -05:00
af8c6c2f48
Merged 2.5.x into saas
2014-11-10 09:08:03 -05:00
f6bf2f8cc5
Changed tabs to spaces
2014-11-07 12:05:29 -05:00
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
4d263ce897
Merged 2.5.x into saas
2014-11-05 17:36:58 -05:00
b94d34f719
Removed calls to set user locale and timezone on user creation; these calls were updating the current user instead of the created user, and so served no purpose
2014-11-05 17:22:13 -05:00
564e8d9311
Replaced hardcoded locale defaults with the station default locale
2014-11-05 17:21:19 -05:00
90626a2fcb
Formatting; Changed tabs to spaces
2014-11-05 17:04:18 -05:00
5275669211
Updated i18n to use multiple domains
2014-11-04 17:03:52 -05:00
2f16385b53
Fixed upgrades
2014-11-04 13:33:20 -05:00
298d8630f3
Initial commit of InstallWizardController
2014-11-04 11:07:56 -05:00
e8950c8815
Changed tabs to spaces
2014-11-04 11:07:24 -05:00
f147fb34bb
Cloud storage upgrade script
2014-11-03 16:56:25 -05:00
0a45de7fba
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
.gitignore
airtime_mvc/application/configs/airtime-conf.php
airtime_mvc/application/configs/classmap-airtime-conf.php
airtime_mvc/application/models/RabbitMq.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php
airtime_mvc/application/models/airtime/map/CcShowTableMap.php
airtime_mvc/application/models/airtime/om/BaseCcShow.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstances.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstancesPeer.php
airtime_mvc/application/models/airtime/om/BaseCcShowInstancesQuery.php
airtime_mvc/application/models/airtime/om/BaseCcShowPeer.php
airtime_mvc/application/models/airtime/om/BaseCcShowQuery.php
airtime_mvc/application/modules/rest/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/build/sql/schema.sql
airtime_mvc/public/index.php
2014-11-03 12:29:58 -05:00
b871b32175
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-10-30 12:17:34 -04:00
54d1bcf81e
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2014-10-30 12:15:41 -04:00
53c4301024
Wrapped json_encode call in PHP version check
2014-10-28 13:29:35 -04:00
1a90184a69
Merging 2.5.x into saas
2014-10-27 16:27:45 -04:00
275ca5eed6
Resolved differences merging 2.5.x into saas
2014-10-27 16:25:42 -04:00
e6cf1c7cb9
Updated occurrence of GetPlayOrderRange to use old version for backwards compatibility
2014-10-27 15:52:14 -04:00
e6b9a71d00
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
2014-10-24 15:12:17 -04:00
598b18b65a
Added live-info-v2 and station metadata api calls
2014-10-24 15:11:27 -04:00
544d20ebc2
Replaced spaces with dashes in resource_id generation
...
Fixed track preview and download signed urls
Removed cloud_storage_deleter.py file
Changed cloud_storage settings in airtime.conf
2014-10-17 17:16:53 -04:00
a10e287368
Fixed a fresh install bug that wasn't using composer installs.
...
Fixed a cloud file download bug where it was downloading the wrong track.
Working on amazon s3 signed urls for private objects.
Added cloud storage configuration to install script.
2014-10-14 16:54:58 -04:00
9fb35c448e
Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas.
2014-10-10 19:57:22 +00:00
6ade74163d
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2014-10-08 18:03:16 -04:00
2423ea6787
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-10-08 11:46:30 -04:00
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
5cc93eac3c
Merge pull request #68 from RobertElder/session
...
Regenerate session ids.
2014-10-07 10:10:41 -04:00
185d84dc01
Increase the time token is valid for in case of long uploads.
2014-10-03 02:18:04 +00:00
feff7f4343
tokens for multipart data upload.
2014-10-02 02:04:03 +00:00
5c69eda010
Tokens for Stream Settings page.
2014-10-01 20:55:07 +00:00
78cc43d33d
Regenerate session ids.
2014-09-29 22:48:52 +00:00
1bb17c5614
Blacklist free products from upgrade page
2014-09-23 16:01:28 -04:00
62c50234ab
Added 2.5.5 upgrades
2014-09-19 12:59:53 -04:00
28d2bdbbec
Updated upgrade functions to have a directory parameter, since __DIR__
2014-09-19 12:58:31 -04:00
6c0b94f9bb
Moved validation workaround to Service
2014-09-18 16:34:35 -04:00
5af735654c
Added Airtime255 class in Upgrades
2014-09-18 16:33:01 -04:00
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
Albert Santoni
Duncan Sommerville
drigato
Mark Lewis
Robert Elder