532bd1ea85
SAAS-772: Send metadata to Tunein
...
Made Improvement so Airtime always makes a request to TuneIn every 4
minutes so TuneIn does not turn metadata off
2015-05-25 15:37:45 -04:00
94b949adaa
SAAS-772: Send metadata to Tunein
...
Removed unused code
2015-05-22 10:35:36 -04:00
a2a9e54553
Merge branch 'saas-dev' into saas-tunein
...
Conflicts:
airtime_mvc/application/views/scripts/form/preferences.phtml
2015-05-19 15:50:16 -04:00
2da4e264e5
SAAS-772: Send metadata to Tunein
...
Update metadata when station goes offline
2015-05-19 15:42:07 -04:00
c3457ae03f
tunein testing
2015-05-19 15:19:09 -04:00
4451c49c06
SAAS-772: Send metadata to Tunein
...
This is pretty much working except with master source metadata
2015-05-19 14:39:05 -04:00
70735e7bae
Retun 200 from ProvisioningHelper when a database exists to accommodate recreating terminated stations
2015-05-14 10:51:53 -04:00
cf24c141fd
SAAS-772: Send metadata to Tunein
...
This is pretty much working for scheduled metadata - just to need to
test with a TuneIn account.
2015-05-13 16:05:37 -04:00
3e2cd54be7
Fixed double sending of headers problem with S3 cache
2015-04-01 17:29:21 -04:00
9b85fc59a6
Another attempt at squashing header() warning
2015-04-01 16:29:59 -04:00
69b03cdefa
Three small bugfixes
...
* Remove files from the database even if they couldn't be removed from disk. (log a warning)
* Return a better error message if the user attempts to delete a scheduled file
* Attempt to squash headers already sent warning during buffer flushing
in FileIO.php
2015-04-01 16:16:46 -04:00
d31de0937f
Refactored file storage code slightly to allow multiple download URLs
2015-03-30 11:31:07 -04:00
48b4eaacd6
Squashed ob_end_flush(): failed to delete and flush buffer warning
2015-03-24 17:02:04 -04:00
bc2acaea51
Don't fire conversion tracking for the sourcefabric_admin user
2015-03-24 11:18:03 -04:00
3d03f837d2
Trial->Paid conversion tracking with GTM
...
* Added trial to paid conversion tracking with GTM
* Removed WHMCS roundtrip from Showbuilder
* Moved all Analytics code into common/GoogleAnalytics.php
* Added a new Thank You page after plan changes to capture conversions
* Added a ConversionTracking plugin to facilitate that
* Also backported some minor staticBaseDir compatibility changes
* Fixed a logic error in creating the baseDir
2015-03-24 10:11:25 -04:00
2ec2403cce
Moved provisioning change function into controller from helper
2015-03-19 17:32:02 -04:00
bd72252e9e
Fixed typos
2015-03-19 12:07:02 -04:00
766f649f56
Merge branch 'saas-dashboard-provisioning' into saas
2015-03-19 11:59:01 -04:00
47e6879766
Fixed Billing.php again
2015-03-06 11:18:48 -05:00
e9adf1a7ed
Merge branch 'saas-623' into saas
...
Conflicts:
airtime_mvc/application/common/Billing.php
2015-03-05 18:23:09 -05:00
8cdecff022
Fixed Billing::GetClientInstanceId()
2015-03-05 18:22:04 -05:00
df48de607b
Revert billing client ID change
2015-03-05 17:45:07 -05:00
918631d676
When calling /change, don't set prefs if empty/no parameters are given
2015-03-05 12:24:02 -05:00
278aa31d2f
Hack: avoid calling WHMCS to get the station instance id
2015-03-04 15:53:43 -05:00
e2054c13c8
Added provisioning code for change requests
2015-03-03 16:04:45 -05:00
95db8533b5
Made provisioning helper slightly more robust
2015-03-03 15:29:34 -05:00
52813045a6
Additional parameters in provisioning when creating stations from dashboard
2015-03-03 15:10:10 -05:00
76141b38b8
Merge branch 'saas' into saas-media-refactor
2015-03-02 09:52:05 -05:00
2e2f1f9762
Fixed SAAS-612: Recreating a station can wipe its database
2015-02-26 17:14:46 -05:00
ac3ad3d23b
Prevent overwriting the database if it already exists
2015-02-26 15:33:35 -05:00
7d534d1cda
Airtime Pro SSL compatibility hack
2015-02-25 16:19:01 -05:00
5acad059de
Insert leading slash into basedir for station URL
2015-02-25 16:09:08 -05:00
3a1141d4c8
Merge branch 'saas' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
airtime_mvc/application/controllers/ApiController.php
2015-02-25 13:02:11 -05:00
c0db309e32
Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/controllers/plugins/Acl_plugin.php
2015-02-24 11:18:49 -05:00
2e2c3d6276
Merge of cc-5709-airtime-analyzer-saas-refactor into saas
2015-02-20 14:27:16 -05:00
33ebca00db
Small fix to BPM sanitization
2015-02-20 14:23:36 -05:00
61a47aeb27
Small fix to BPM sanitization
2015-02-20 14:01:29 -05:00
0177e40083
Pull the logic for Media REST API out of the controller
2015-02-19 15:10:01 -05:00
5a644ae0b8
Merge branch 'cc-5709-airtime-analyzer' into saas
2015-02-19 09:31:58 -05:00
487ab9bd99
CC-5868: Make the BPM field less strict
2015-02-19 09:31:23 -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
717d322dc8
Fix typo breaking provisioning/create/
2015-02-18 15:22:47 -05:00
12c0617e57
Set up the cc_music_dirs entry in /provisioning/create
2015-02-18 13:27:52 -05:00
dcac7ab652
Fixed a couple of bugs in the new /provisioning/create API
2015-02-18 12:21:15 -05:00
d2fae5adae
Testing out only creating the database tables ...
2015-02-17 16:49:52 -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
e216a03d37
SAAS-562: UpgradeController broken
2015-01-27 12:13:58 -05:00
drigato
Duncan Sommerville
Albert Santoni