Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
14173 commits 3 branches 0 tags 405 MiB
Commit graph

2381 commits

Author SHA1 Message Date
Albert Santoni
99d16444d2 Squash unlink warning in CcFiles.php 2015-03-25 10:51:51 -04:00
Albert Santoni
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
Albert Santoni
bc2acaea51 Don't fire conversion tracking for the sourcefabric_admin user 2015-03-24 11:18:03 -04:00
Albert Santoni
084c6dd662 PHP compatibility fix 2015-03-24 10:34:48 -04:00
Albert Santoni
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
drigato
e32744668f SAAS-661: Add mobile stream identifier on Stream Settings page 2015-03-23 16:06:35 -04:00
drigato
e2ca218ac2 Merge remote-tracking branch 'stash/saas-four-streams' into saas-embed-player 2015-03-23 15:54:04 -04:00
drigato
5a373ac604 Merge branch 'saas' into saas-embed-player 2015-03-23 15:46:03 -04:00
drigato
2ae4d6c1c3 Embed Player 
Added stream modes
Unhardcoded some values
Disabled opus streams
 2015-03-23 12:37:22 -04:00
Duncan Sommerville
766f649f56 Merge branch 'saas-dashboard-provisioning' into saas 2015-03-19 11:59:01 -04:00
Albert Santoni
34de6da2c7 Major performance improvements to the Dashboard and Calendar views 
* Close the PHP session for writing as early as possible in most AJAX
  calls for those views
* Reduce the number of roundtrips to the server in both the Dashboard
  and Calendar views by putting the data in our HTML response (this
  makes a massive difference)
* Eliminated a couple of unneccessary AJAX calls
* Use lazy loading in full calendar
* Fixed a bug in the week view that only occurs near the end of the
  week (date->gmdate bug!)
 2015-03-13 18:22:27 -04:00
drigato
ac2181a52d Merge branch 'saas' into saas-embed-player 2015-03-11 17:13:04 -04:00
drigato
55ed21a155 SAAS-606: Enable disk quota on Airtime Pro 2015-03-11 13:50:17 -04:00
Albert Santoni
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
Albert Santoni
6cecb7c239 Simplified the FTP upload hook 2015-03-06 11:06:17 -05:00
Duncan Sommerville
52813045a6 Additional parameters in provisioning when creating stations from dashboard 2015-03-03 15:10:10 -05:00
Albert Santoni
1f6f880dad Fixed deleting failed uploads 2015-03-03 13:44:42 -05:00
Albert Santoni
8a6ee8ad14 Fixed /rest/media endpoint DELETE 2015-03-03 12:52:41 -05:00
Albert Santoni
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
Albert Santoni
0b1af01822 Better exception logging and small pypo exception fix 2015-02-26 13:52:51 -05:00
Albert Santoni
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
Albert Santoni
bfd6ef72b1 Fixed download URLs for non-cloud files 2015-02-26 11:29:08 -05:00
Albert Santoni
5acad059de Insert leading slash into basedir for station URL 2015-02-25 16:09:08 -05:00
drigato
e0a050ac60 Fix file deletion bug 2015-02-25 15:09:02 -05:00
Albert Santoni
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
drigato
cf11291877 Merge branch 'saas' into saas-embed-player 2015-02-25 12:13:41 -05:00
drigato
38aa1d1cd9 Merge branch 'saas' into saas-store-file-size-and-hash-in-db 2015-02-24 16:44:17 -05:00
Albert Santoni
e13e4413ea Merge remote-tracking branch 'origin/2.5.x-albertenhancements' into saas 2015-02-24 15:03:06 -05:00
Duncan Sommerville
5e256df061 Added remove button for station logo on preferences page 2015-02-24 12:12:30 -05:00
drigato
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
Albert Santoni
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
Albert Santoni
c868136d26 Make airtime_analyzer respect the storage_backend setting passed to it 
by Airtime
 2015-02-20 18:21:49 -05:00
Albert Santoni
0c537194ec Merge branch 'cc-5709-airtime-analyzer-refactor' into saas-media-refactor 2015-02-20 17:36:15 -05:00
Albert Santoni
909cbae5f4 Added new parameter to CcFiles::createFromLocalFile() for flexibility 2015-02-20 17:34:58 -05:00
Duncan Sommerville
ce36c1be18 Removed unnecessary call to BaseCcFiles->delete 2015-02-20 16:58:09 -05:00
Albert Santoni
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
Albert Santoni
84f0f135ef More refactoring: Allow files to be imported from disk directly 2015-02-20 16:36:36 -05:00
drigato
6dcc7ee2fc SAAS-587: Add stream urls to station-metadata API 2015-02-20 15:50:40 -05:00
Albert Santoni
2e2c3d6276 Merge of cc-5709-airtime-analyzer-saas-refactor into saas 2015-02-20 14:27:16 -05:00
Albert Santoni
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
Albert Santoni
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
Albert Santoni
0177e40083 Pull the logic for Media REST API out of the controller 2015-02-19 15:10:01 -05:00
drigato
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
drigato
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
drigato
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
drigato
cee0ff4881 SAAS-560: Deploy separate cloud storage config files for each development environment 
Default to production config files if dev env specific files are not
found.
Fix analyzer unit tests.
 2015-02-05 14:31:20 -05:00
drigato
7b3f9af04c SAAS-560: Deploy separate cloud storage config files for each development environment 
Changed analyzer upstart to take the cloud storage config file as a command line option
Dropped the dev env portion from the rabbitmq-analyzer.ini filename
 2015-02-03 15:55:47 -05:00
drigato
5040eb498d SAAS-560: Deploy separate cloud storage config files for each development environment 2015-02-02 12:54:56 -05:00
Duncan Sommerville
bc604b992e CC-5986 - Fixed unit tests, removed unnecessary code from service execution files 2015-01-28 13:19:50 -05:00
Albert Santoni
f7d26c0dde Merge branch '2.5.x' into saas 2015-01-27 15:39:40 -05:00