58624ec100
Try to silence another permissions error problem
2015-03-25 17:34:38 -04:00
040eb1443d
CSS fixes to make page header more responsive
2015-03-25 17:29:28 -04:00
3d2b189dba
removed logging statement
2015-03-25 11:47:23 -04:00
17358a761f
SAAS-663: Integrate player design
2015-03-25 11:44:28 -04:00
99d16444d2
Squash unlink warning in CcFiles.php
2015-03-25 10:51:51 -04:00
48b4eaacd6
Squashed ob_end_flush(): failed to delete and flush buffer warning
2015-03-24 17:02:04 -04:00
25d6ecac0e
Disabled broken maintenance screen code to squash warnings on upgrade
2015-03-24 16:54:57 -04:00
d1b28fd564
Fixed a bug in FTP upload hook, other minor improvements
...
* Ensure we have write permissions on any newly uploaded files by FTP
* Don't silence warnings in moveFileToStor()
* Reduced the FTP upload max retry count
* Log E_NOTICE and E_WARNING levels to Sentry
2015-03-24 14:56:03 -04:00
bc2acaea51
Don't fire conversion tracking for the sourcefabric_admin user
2015-03-24 11:18:03 -04:00
084c6dd662
PHP compatibility fix
2015-03-24 10:34:48 -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
e32744668f
SAAS-661: Add mobile stream identifier on Stream Settings page
2015-03-23 16:06:35 -04:00
e2ca218ac2
Merge remote-tracking branch 'stash/saas-four-streams' into saas-embed-player
2015-03-23 15:54:04 -04:00
5a373ac604
Merge branch 'saas' into saas-embed-player
2015-03-23 15:46:03 -04:00
2ae4d6c1c3
Embed Player
...
Added stream modes
Unhardcoded some values
Disabled opus streams
2015-03-23 12:37:22 -04:00
7b9efb988f
Fixed logic error Amazon_S3StorageBackend
2015-03-20 18:03:23 -04:00
8c7ae6c890
Added safety checks to Amazon_S3StorageBackend
2015-03-20 17:23:53 -04:00
32aa962138
Fixed error logging and refactored ErrorController to get invoked
...
correctly when using API key authentication
* Along with the bugfixes, backported improved ErrorController from upstream branch,
including style improvements.
2015-03-20 17:20:34 -04:00
ddd75cb8e3
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-03-20 12:36:46 -04:00
68c4cdcab3
Added missing downgrade() function to the 2.5.11 upgrader
2015-03-20 12:36:28 -04:00
28786e7bf1
SAAS-655: Extract muses player events into our own js object
...
Moved player creation into musesPlayer constructor
2015-03-20 07:41:10 -04:00
20d774874e
SAAS-655: Extract muses player events into our own js object
...
Added skeleton functions for setVolume and setURL
2015-03-20 07:35:18 -04:00
59206bc73b
Fixed typo
2015-03-19 17:53:53 -04:00
2ec2403cce
Moved provisioning change function into controller from helper
2015-03-19 17:32:02 -04:00
16ddf09d6d
SAAS-655: Extract muses player events into our own js object
2015-03-19 16:59:05 -04:00
875ed0e41e
Got muses working without a skin
...
Had to leave the skin visible but "hide" it by setting the width and
height to 1px
2015-03-19 13:42:19 -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
bafd9eeb6f
Cleaning up player code
2015-03-18 15:03:34 -04:00
ed891fb145
Committing lots of trial and error embed player code changes
2015-03-18 14:23:38 -04:00
1f2f8a27a5
SAAS-650: Fix up player page UI in Airtime
2015-03-16 13:24:58 -04:00
dc0855de18
SAAS-643: Embed Player -> Restrict the setting of an OPUS stream
2015-03-16 11:29:24 -04:00
694430f542
SAAS-637: Un-hardcode all player variables
2015-03-12 15:45:53 -04:00
ac2181a52d
Merge branch 'saas' into saas-embed-player
2015-03-11 17:13:04 -04:00
052055bfff
Merge pull request #106 from sourcefabric/saas-update-disk-usage-upgrader
...
SAAS-628: Create script to update disk_usage for all Airtime pro station...
2015-03-11 16:48:28 -04:00
55ed21a155
SAAS-606: Enable disk quota on Airtime Pro
2015-03-11 13:50:17 -04:00
5b3edaa2ca
Add order by clause to /rest/media index action
2015-03-11 13:25:27 -04:00
0042fb50fe
Refactor some stuff related to four streams, Liquidsoap is a piece of
...
shit too - no dynamic variables
2015-03-10 19:15:38 -04:00
8198d89095
small change to player form
2015-03-10 16:47:08 -04:00
6c46f0a156
Added player preview to view
...
Everything is hardcoded right now
2015-03-10 16:32:35 -04:00
716244011a
Removed unnecessary conditional around /provisioning/change in Bootstrap
2015-03-10 13:20:11 -04:00
b398fea7e7
SAAS-628: Create script to update disk_usage for all Airtime pro stations
2015-03-10 12:29:30 -04:00
0d790213e3
Merge pull request #103 from sourcefabric/saas-paginagte-rest-media-index-action
...
Saas paginagte rest media index action
2015-03-06 14:31:06 -05:00
e315498a5c
SAAS-624: Request to rest/media throws an exception if the data set is too large
...
Modified /rest/media to return items where file_exists = true
2015-03-06 12:21:51 -05:00
47e6879766
Fixed Billing.php again
2015-03-06 11:18:48 -05:00
6cecb7c239
Simplified the FTP upload hook
2015-03-06 11:06:17 -05:00
962f5d925d
SAAS-624: Request to rest/media throws an exception if the data set is too large
...
Fixed small typo
2015-03-06 09:32:14 -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
7607888257
Merge branch 'saas' into saas-paginagte-rest-media-index-action
2015-03-05 14:27:32 -05:00
62d6849d4e
SAAS-624: Request to rest/media throws an exception if the data set is too large
...
Added offset and limit parameters to /rest/media index action.
2015-03-05 14:25:48 -05:00
918631d676
When calling /change, don't set prefs if empty/no parameters are given
2015-03-05 12:24:02 -05:00
181db7617a
Use Billing::getClientInstanceId() in Amazon_S3StorageBackend
2015-03-04 17:02:30 -05:00
df28b47b92
SAAS-624: Request to rest/media throws an exception if the data set is too large
2015-03-04 16:26:35 -05:00
278aa31d2f
Hack: avoid calling WHMCS to get the station instance id
2015-03-04 15:53:43 -05:00
d61b75f105
Added a working 4th stream
2015-03-03 16:08:53 -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
1f6f880dad
Fixed deleting failed uploads
2015-03-03 13:44:42 -05:00
8a6ee8ad14
Fixed /rest/media endpoint DELETE
2015-03-03 12:52:41 -05:00
6082738439
Merge branch 'saas' into saas-media-refactor
2015-03-02 16:02:34 -05:00
17d51eb0f9
Added csrf verification to show image upload and deletion
2015-03-02 16:00:11 -05:00
ccb4b1552e
Merge branch '2.5.x-albertenhancements' into saas
2015-03-02 15:26:13 -05:00
0272eaef44
Changed is_null to empty
2015-03-02 15:25:52 -05:00
a7cedbb34f
Merge branch '2.5.x-albertenhancements' into saas
2015-03-02 15:10:37 -05:00
b6a6f038a9
Added call to setStationDescription in preferences action
2015-03-02 15:10:04 -05:00
7a035e91ec
Merge branch '2.5.x-albertenhancements' into saas
2015-03-02 14:58:33 -05:00
13bd0b7589
Fixed removing image when saving preferences with no upload
2015-03-02 14:57:50 -05:00
936d11b367
Merge branch '2.5.x-albertenhancements' into saas
2015-02-27 17:21:20 -05:00
78c7170c4e
Reformatted logo remove button to use Zend
2015-02-27 17:19:37 -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
f1a311dad6
Merge branch 'saas' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-26 14:26:33 -05:00
6047670dbd
Fix corner case where failed uploads could show up in the library
2015-02-26 14:12:51 -05:00
0b1af01822
Better exception logging and small pypo exception fix
2015-02-26 13:52:51 -05:00
c57d4e3fc4
Check if station is on a trial plan before displaying the trial box
2015-02-26 13:30:35 -05:00
ab6d83f49d
Merge branch 'saas' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-26 13:10:13 -05:00
93f62eaadd
Added check to hide LiveChat for existing hobbyist users
2015-02-26 12:49:52 -05:00
bfd6ef72b1
Fixed download URLs for non-cloud files
2015-02-26 11:29:08 -05:00
3885abbdb8
Fixed webstream previewing
2015-02-26 11:09:43 -05:00
2272451e08
Added placeholders for player embed code and preview
2015-02-25 17:10:41 -05:00
7d534d1cda
Airtime Pro SSL compatibility hack
2015-02-25 16:19:01 -05:00
48b4e3fb62
Also need to diable disk usage in media controller
2015-02-25 16:11:52 -05:00
5acad059de
Insert leading slash into basedir for station URL
2015-02-25 16:09:08 -05:00
7e167e5a47
Temporarily disabling disk quota limit until all file sizes have been set
2015-02-25 15:28:48 -05:00
e0a050ac60
Fix file deletion bug
2015-02-25 15:09:02 -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
cf11291877
Merge branch 'saas' into saas-embed-player
2015-02-25 12:13:41 -05:00
38aa1d1cd9
Merge branch 'saas' into saas-store-file-size-and-hash-in-db
2015-02-24 16:44:17 -05:00
e13e4413ea
Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas
2015-02-24 15:03:06 -05:00
5e256df061
Added remove button for station logo on preferences page
2015-02-24 12:12:30 -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
7600b8ae82
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-refactor
2015-02-24 11:16:44 -05:00
90aa1faea4
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2015-02-24 11:16:19 -05:00
e2130df51c
Merge branch 'cc-5709-airtime-analyzer-csrf' into cc-5709-airtime-analyzer
2015-02-24 11:15:27 -05:00
73e5fb938f
Use more secure random number generation for CSRF auth tokens
...
* Also cleaned up pull request
2015-02-24 11:13:39 -05:00
be7a6854f0
SAAS-596: Store file size and hash in database
...
Have pypo fetch the file size and md5, if necessary, and make request to
Airtime to set these values
2015-02-24 11:00:41 -05:00
69d588d2f6
Merge branch '2.5.x' into 2.5.x-albertenhancements
2015-02-24 10:45:52 -05:00
47a7b0245e
Merge branch 'saas' into saas-store-file-size-and-hash-in-db
2015-02-23 10:29:34 -05:00
51aa846a4c
Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/models/RabbitMq.php
python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
python_apps/airtime_analyzer/airtime_analyzer/message_listener.py
2015-02-20 18:25:38 -05:00
c868136d26
Make airtime_analyzer respect the storage_backend setting passed to it
...
by Airtime
2015-02-20 18:21:49 -05:00
0c537194ec
Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor
2015-02-20 17:36:15 -05:00
909cbae5f4
Added new parameter to CcFiles::createFromLocalFile() for flexibility
2015-02-20 17:34:58 -05:00
6858316dfc
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2015-02-20 17:26:53 -05:00
ce36c1be18
Removed unnecessary call to BaseCcFiles->delete
2015-02-20 16:58:09 -05:00
903de66349
Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor
...
Conflicts:
airtime_mvc/application/cloud_storage/ProxyStorageBackend.php
airtime_mvc/application/configs/conf.php
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/application/models/airtime/CcFiles.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
airtime_mvc/application/services/MediaService.php
2015-02-20 16:52:00 -05:00
84f0f135ef
More refactoring: Allow files to be imported from disk directly
2015-02-20 16:36:36 -05:00
5e9252a562
SAAS-587: Add stream urls to station-metadata API
...
Fix typo
2015-02-20 15:52:13 -05:00
6dcc7ee2fc
SAAS-587: Add stream urls to station-metadata API
2015-02-20 15:50:40 -05:00
a931e282e1
SAAS-585: Create Embeddable Player form
...
Fixed up the stream urls options
2015-02-20 15:44:25 -05:00
40d6249229
Merge branch 'saas' into saas-embed-player
2015-02-20 14:47:57 -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
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
0177e40083
Pull the logic for Media REST API out of the controller
2015-02-19 15:10:01 -05:00
6ef085f460
Merge branch 'saas' into saas-store-file-size-and-hash-in-db
2015-02-19 11:43:34 -05:00
2905d0394b
Merge branch 'saas-store-file-size-and-hash-in-db' of https://github.com/sourcefabric/Airtime into saas-store-file-size-and-hash-in-db
2015-02-19 10:35:07 -05:00
e5d6797ce7
SAAS-596: Store file size and hash in database
...
Removed md5_hash column from cc_files since there is already a md5
column
2015-02-19 10:34:35 -05:00
73cb14155c
Replace the version hashing with git revision hashing to fix browser
...
caching
2015-02-19 10:01:09 -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
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
d0bd4bfe81
Merge branch 'saas' into saas-store-file-size-and-hash-in-db
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-18 19:29:45 -05:00
08c53a9292
Fixed incorrect authorization for ShowImage API
2015-02-18 18:34:52 -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
b76ab27230
Fixed the unit tests: Ensure key in $_SERVER exists.
2015-02-18 17:03:16 -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
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
5bd3371ec2
SAAS-596: Store file size and hash in database
...
Removed getFileSize from CloudFile.php since it can call the parent
function.
Moved setting filesize metadata from cloud_storage_uploader.
2015-02-17 16:51:25 -05:00
d2fae5adae
Testing out only creating the database tables ...
2015-02-17 16:49:52 -05:00
fe7071b5e3
SAAS-596: Store file size and hash in database
...
Fixing bad merge ?(not really sure what happened here)
2015-02-17 16:28:33 -05:00
c1086842d3
Merge branch 'cc-5709-airtime-analyzer-store-file-size-and-hash-in-db' into saas-store-file-size-and-hash-in-db
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2015-02-17 16:19:58 -05:00
72e4a036a4
Cleaning up editFileMD in LibraryController
2015-02-17 15:09:18 -05:00
6ccc634782
SAAS-596: Store file size and hash in database
...
Updated schema and added filesize and md5_hash columns.
Changed getFileSize functions to return the value stored in the
database.
Removed getFileSize from the cloud storage classes.
2015-02-17 14:51:51 -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
Albert Santoni
Duncan Sommerville
drigato
Denise Rigato