0c3395289d
Merge pull request #78 from Robbt/realtime-smart-blocks
...
Added sort tracks by upload time to smart blocks criteria
2015-01-19 15:36:28 -05:00
38882abd1a
SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download
2015-01-16 15:15:37 -05:00
527d2851af
SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download
2015-01-16 15:15:14 -05:00
19626ed4f5
SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download
2015-01-16 13:26:55 -05:00
775008b274
SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download
2015-01-16 12:13:04 -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
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
cfe3527b93
Fix link to user manual
2015-01-15 16:33:03 +00:00
a5cc529c4a
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-01-15 11:24:16 -05:00
754c7bfc64
Removed code that was deleting the cloud_file database records in the case of
...
station termination. The database will remain as is in case we have to restore
the files.
2015-01-14 15:15:23 -05:00
609a46dfa3
Comment Airtime_Decorator_SuperAdmin_Only
2015-01-14 15:12:20 -05:00
c24a040689
Fixed my SuperAdmin_Only decorator
2015-01-14 14:34:14 -05:00
d5b969f94f
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
2015-01-13 21:31:57 -05:00
3247f6992a
Merge branch 'saas-pullreq77' into saas
2015-01-13 20:59:02 -05:00
c4d3a8fa62
Massive simplification of the GeneralPreferences dialog
...
* The purpose of this was so that we can use Zend_Form_Element
decorators, which I need.
2015-01-13 20:51:46 -05:00
a0e5c975dd
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
2015-01-13 15:50:38 -05:00
a4461dc79a
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2015-01-13 15:50:20 -05:00
2185fc9ca4
SAAS-536: Check for future scheduled files uses cloud_file id instead of cc_files id
2015-01-13 15:49:57 -05:00
c264747a54
Removed silly logging statement
2015-01-13 15:25:36 -05:00
d99147bad4
Merge branch 'saas' into cc-5709-airtime-analyzer-cloud-storage-saas
2015-01-13 14:23:51 -05:00
caf37e1b87
CC-5975: Default fade-in/out, and crossfade time validators don't work
...
* Fixed the number formatting and validation in the preferences and streaming preferences
(the silly 00.5-style numbers are gone)
* Regex decmical validation of the default fade-in, fade-out, and
crossfade duration was totally broken (you could enter words and it would work). That's fixed now.
2015-01-13 12:18:57 -05:00
9cfcaf2ffd
SAAS-537: Fixed the week view of the schedule widgets
...
* Also improved the instructions inline for how to use them...
(this is a stop-gap measure until we get a real iframe widget)
* ALSO renamed the field HTML Code since it's not JS! (it was
misleading before)
2015-01-12 22:29:21 -05:00
e17b330186
Remove just previously added logging statements
2015-01-12 16:26:27 -05:00
c7c683966d
Logging
2015-01-12 16:21:53 -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
85557d4886
Logging statements
2015-01-12 15:29:41 -05:00
02e4c18931
SAAS-531: Finalize S3 folder hierarchy
2015-01-12 14:50:42 -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
8d56e9e1ff
Merge branch '2.5.x' into saas
2015-01-09 10:44:47 -05:00
05c9e21e48
Recognize audio/aac as a MIME type for webstreams
2015-01-09 10:44:24 -05:00
08738cf391
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/cloud_storage_uploader.py
2015-01-06 15:46:20 -05:00
8d914bcd13
SAAS-529: Replace Apache Libcloud with Python-Boto SDK
2015-01-06 15:44:34 -05:00
6ee97d9c53
Upgrade sql was missing the storage_backend column
2014-12-18 18:55:37 -05:00
19e6f1a535
SAAS-526: Change prefix from station name to station id
...
Done.
2014-12-17 16:48:20 -05:00
a0f5e33855
Added "Help Center" link to Help menu for Josh
2014-12-17 16:10:04 -05:00
b094e59df3
SAAS-526: Change prefix from station name to station id
...
Just seeing if we can get the hosting id from a function in the Billing Controller
2014-12-17 15:39:18 -05:00
ec1c8669c8
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-12-17 14:14:03 -05:00
cdabbc6648
SAAS-527: Allow files to be uploaded to either the cloud or on local file storage
...
Done.
2014-12-17 13:11:11 -05:00
6e2f07f875
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage
2014-12-16 18:47:55 -05:00
1de326283e
SAAS-527: Allow files to be uploaded to either the cloud or on local file storage
...
Not quite done.
2014-12-16 18:47:42 -05:00
7059820ca0
Add a comment about the proxy pattern
2014-12-16 14:54:53 -05:00
ff0a685243
Updated propel models
2014-12-16 14:20:28 -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
09c30bde1b
Regenerated Propel models because some fields and methods were missing.
2014-12-16 10:53:39 -05:00
2af14e099b
SAAS-519: webstreams not being deleted
2014-12-15 12:49:13 -05:00
797bafa453
Make the LiveChat changes from yesterday slightly more reslient to
...
missing database keys.
2014-12-12 11:57:16 -05:00
ad56d6cafb
Show the plan and station URL in Live Chat
2014-12-11 17:40:34 -05:00
891cfdb48e
SAAS-517: Create Provisioning controller with a terminate endpoint
2014-12-11 13:35:34 -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
57868d2351
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-12-10 12:47:22 -05:00
d73b331376
SAAS-515: Prefix object names with station name
2014-12-10 12:40:08 -05:00
644e6b00d8
SAAS-516: Replace Zend_Service_Amazon_S3 with AWS SDK for PHP
2014-12-09 17:58:36 -05:00
89925e52ed
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
python_apps/pypo/pypofile.py
2014-12-08 15:34:30 -05:00
ec189fc27a
SAAS-509: PYPO can't download files via the REST API
2014-12-08 15:33:02 -05:00
435c49da98
Changed PYPO's download URL scheme from https to http
2014-12-08 13:57:28 -05:00
70c6801a6c
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-12-08 13:51:15 -05:00
59ceb11f00
SAAS-510: PYPO -> Files are downloaded even if they already exist in tmp cache dir
2014-12-08 13:21:24 -05:00
80af25fdf4
Undoing last commit
2014-12-03 18:07:24 -05:00
963207e26f
Trying the PYPO download URL without ssl
2014-12-03 18:01:08 -05:00
024150f023
SAAS-503: PYPO -> Use the REST API to download files
...
Fixed disabling SSL verication
2014-12-03 14:50:58 -05:00
a1062e951f
SAAS-503: PYPO -> Use the REST API to download files
...
Change download URL to use https
2014-12-03 14:03:21 -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
16dc286420
SAAS-503: PYPO -> Use the REST API to download files
2014-12-03 13:22:52 -05:00
e1f1807f5a
SAAS-503: PYPO -> Use the REST API to download files
...
Removed Amazon S3 specific code
2014-12-02 18:46:17 -05:00
bf91677f91
SAAS-505: Extract Amazon_S3 class and have it inherit from a general 'cloud backend' class
...
Fixed reading credentials in from cloud_storage.conf
2014-12-02 09:06:28 -05:00
7c0a25be7f
SAAS-505: Extract Amazon_S3 class and have it inherit from a general 'cloud backend' class
2014-12-01 21:05:46 -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
94d9577539
Temporarily disable the Google Tag Manager generation for debugging
2014-12-01 11:34:47 -05:00
432245b18e
SAAS-502: Analyzer -> Set the station id and domain in the cloud object's metadata
...
Set the domain name in the cloud object's metadata
2014-11-27 16:54:22 -05:00
92feacd46f
SAAS-501: Re-jig cloud_storage.conf
2014-11-27 15:50:40 -05:00
8601452c71
Merge conflict
2014-11-27 15:46:39 -05:00
2f9382679a
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage
2014-11-27 15:45:26 -05:00
6cb993cc80
SAAS-504: Store provider in db
2014-11-27 15:44:53 -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
670a63df87
Error handling for if propel isn't found / composer wasn't run
2014-11-26 18:04:46 -05:00
8fbe7dd649
Report an error and die if amazon.conf is missing
2014-11-26 17:50:59 -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
86ce4673ab
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
2014-11-25 12:27:50 -05:00
a62e98beb4
Fix logins from WHMCS by disabling CSRF token on login page for trusted
...
origins
2014-11-20 19:33:11 -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
544767a775
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer-cloud-storage
2014-11-20 17:11:50 -05:00
8e8fe2d288
SAAS-489: Cannot preview tracks stored on disk
2014-11-20 17:11:23 -05:00
ca7d0688e7
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-11-20 16:47:35 -05:00
7db571d103
Remove clearAction from the media REST API for security
2014-11-20 16:47:02 -05:00
8ffd70781b
Remove clearAction from the media REST API for security
2014-11-20 16:46:21 -05:00
29fd728d7d
Undo live stream auth action breakage
2014-11-20 14:30:42 -05:00
0890de4cdd
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2014-11-20 14:00:12 -05:00
cea3fc5302
Temporarily fix live stream auth (show source)
2014-11-20 13:59:59 -05:00
00fbda193e
Schedule->removeItems optimization fix for deleting the current playing track
2014-11-20 09:57:37 -05:00
767562922a
Schedule->removeItems optimization fix for deleting the current playing track
2014-11-19 17:09:54 -05:00
766c827094
Removed undefined index from show info array
2014-11-19 16:04:06 -05:00
c627342e28
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2014-11-19 15:21:14 -05:00
48ae8ac69c
Scheduler->removeItems optimization
2014-11-19 15:13:33 -05:00
5fdca78041
Scheduler->removeItems optimization
2014-11-19 14:30:18 -05:00
755df62a00
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
airtime_mvc/application/models/StoredFile.php
2014-11-18 18:18:44 -05:00
c829b6bf95
Fix bad merge
2014-11-18 18:17:19 -05:00
dd3b54f8ed
Actually delete files from the database via the media REST API
2014-11-18 18:15:45 -05:00
4f7f64af7a
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-11-18 17:45:08 -05:00
11a31375df
Slightly more robust fix for the last issue
2014-11-18 17:41:44 -05:00
162995bb49
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-11-18 17:14:01 -05:00
6460854fda
Fixed 'clear' button not working when files failed to import
2014-11-18 17:13:48 -05:00
e7e1926896
CC-5950: Fix for issue where clear button in Recent Uploads didn't work
...
sometimes
2014-11-18 17:11:09 -05:00
34453b5548
Removed setting the directory for cloud files
2014-11-18 10:57:21 -05:00
501b22c48d
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-18 10:32:28 -05:00
3c73abc786
SAAS-491: Edit meta data not working
...
Fixed: Propel 1.7 does not cast string types to integers
2014-11-18 10:32:03 -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
91e7f7053d
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-18 09:16:25 -05:00
fcbb1c2ee7
String updates
2014-11-14 10:01:06 -05:00
21ea2a2933
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/models/Show.php
2014-11-13 14:22:25 -05:00
51274920e1
Cosmetic updates
2014-11-13 10:20:58 -05:00
7d86ea3115
Better error handling on media PUT request
2014-11-13 09:41:46 -05:00
2827db8ba3
Fix bad merge
2014-11-13 09:05:02 -05:00
864352c6a7
Merge branch 'cc-5709-airtime-analyzer' into saas
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/status_reporter.py
2014-11-12 17:04:00 -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
f1fa4929ae
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
python_apps/airtime_analyzer/setup.py
2014-11-12 14:51:18 -05:00
95517cac87
Fix exception thrown when the analyzer doesn't return filesize with the metadata
2014-11-12 14:45:50 -05:00
c132cac43d
Code cleanup
2014-11-12 14:42:34 -05:00
c580e8a569
Removed references to show instance description
2014-11-11 19:07:33 -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
b304e2fa34
Bug fix
2014-11-11 13:56:17 -05:00
769e0e1d82
Fixed 'clear' button not working when files failed to import
2014-11-10 16:07:51 -05:00
4893d087e2
Bug fix
2014-11-10 12:53:07 -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
4b10e024da
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-07 12:35:23 -05:00
f6bf2f8cc5
Changed tabs to spaces
2014-11-07 12:05:29 -05:00
1dc72d5ebe
Changed Amazon S3 download URL format so it works with S3_EU_WEST region.
...
Updated amazon config file path in the downloader class
2014-11-07 11:51:11 -05:00
8fc7178d82
Added several global constants for reoccurring strings in Airtime to aid dynamic translations
2014-11-06 18:40:19 -05:00
efd05c4b77
Added the _initTranslationGlobals function to bind PHP globals to javascript vars for dynamic translation purposes
2014-11-06 18:40:06 -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
62a915f109
Added global define for application name
2014-11-06 11:57:05 -05:00
4d263ce897
Merged 2.5.x into saas
2014-11-05 17:36:58 -05:00
e5e7942b42
Added getUserLocale function to pull locale data into the Login form
2014-11-05 17:24:54 -05:00
eecd3fa188
Added setDefaults call to initialize the locale field to user's locale, or the station default; removed unnecessary field
2014-11-05 17:24:08 -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
e24b4f43fd
Made AirtimeAnalyzerServer.read_config_file static so CloudStorageUploader can use it.
...
Reverted MessageListener.msg_received_callback and MessageListener.spawn_analyzer_process back to static methods.
Moved cloud storage settings out of MessageListener and into CloudStorageUploader
2014-11-05 16:25:11 -05:00
6adb33e89b
Made AirtimeAnalyzerServer.read_config_file static so CloudStorageUploader can use it.
...
Reverted MessageListener.msg_received_callback and MessageListener.spawn_analyzer_process back to static methods.
Moved cloud storage settings out of MessageListener and into CloudStorageUploader
2014-11-05 16:24:03 -05:00
02be09b5ff
Fixed issue with improper array initialization
2014-11-05 10:15:16 -05:00
00e85de3c8
Updated preEditShowValidationCheck to behave properly when dealing with shows with cc_show_days rows in the past, updated serialized form data in add-show to accommodate the change
2014-11-05 10:06:59 -05:00
0f3c1914e1
CC-5948 - Fixed bug where user couldn't edit repeating instances of a show while another instance was playing
2014-11-04 18:38:31 -05:00
eef7116142
Updated i18n to use multiple domains
2014-11-04 17:03:52 -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
f147fb34bb
Cloud storage upgrade script
2014-11-03 16:56:25 -05:00
6cda01fba9
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
2014-11-03 13:15:21 -05:00
27b8f0ac13
Removed delete-success view script because action no longer exists.
2014-11-03 13:15:04 -05:00
87d5d3cb02
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
...
Conflicts:
airtime_mvc/application/modules/rest/Bootstrap.php
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-11-03 13:11:22 -05:00
5f98151009
Removed unused route from rest Media Controller
2014-11-03 12:57:41 -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
e23649173d
Added comments to CcFiles and CloudFile classes.
2014-10-30 12:12:47 -04:00
359727fc66
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
...
Conflicts:
airtime_mvc/application/modules/rest/controllers/MediaController.php
2014-10-29 18:01:31 -04:00
ceb51100ec
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-10-29 17:58:56 -04:00
c590869311
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
2014-10-29 17:57:25 -04:00
fd39db2e24
Merge pull request #75 - Saas relder csrf delete file
2014-10-29 17:55:42 -04:00
dd5176c209
Merge pull request #76 from RobertElder/saas-relder-cors-localhost
...
Don't throw exceptions for localhost in CORSHelper.
2014-10-29 17:35:25 -04:00
2f96885d65
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2014-10-28 13:30:16 -04:00
53c4301024
Wrapped json_encode call in PHP version check
2014-10-28 13:29:35 -04:00
10f3c0a290
Merge branch '2.5.x' into saas
2014-10-28 10:29:42 -04:00
1d3180cc80
CC-5932: Update is_scheduled query is too slow
...
Forgot to remove some debugging statements
2014-10-28 10:29:25 -04:00
64a68c972d
Merge branch '2.5.x' into saas
2014-10-28 10:26:14 -04:00
eae1b4e17c
CC-5932: Update is_scheduled query is too slow
2014-10-28 10:25:40 -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
d4e8eed51d
Marked old functions for API calls as deprecated
2014-10-27 15:52:58 -04:00
e6cf1c7cb9
Updated occurrence of GetPlayOrderRange to use old version for backwards compatibility
2014-10-27 15:52:14 -04:00
7018f45c0a
Check filesize is greater than zero before deleteing a file from library
2014-10-27 12:39:02 -04:00
a88c0233d6
Don't throw exceptions for localhost in CORSHelper.
2014-10-27 15:07:12 +00:00
7edd993fa3
Reverted pypo's copy file method to how it was without cloud files
...
and instead directly call the cloud file's downloader method.
2014-10-24 15:50:52 -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
c02ed026f4
Support for tokens in multipart file upload using API.
2014-10-24 03:57:35 +00:00
70ff67374b
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
...
Conflicts:
python_apps/airtime_analyzer/airtime_analyzer/filemover_analyzer.py
2014-10-22 17:16:46 -04:00
8134687c24
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2014-10-22 17:13:42 -04:00
9726fb80d2
Removed amazon s3 signature from pypo cache file name.
...
Stopped pyppo from downloading amazon s3 files if it already exists in the pypo cache dir.
2014-10-22 14:17:44 -04:00
aec189089a
Merge branch '2.5.x' into saas
2014-10-22 14:46:32 +00:00
f29f30e3ac
Include base_dir in session namespaces.
2014-10-22 14:37:47 +00:00
f775bedb49
Stopped returning filesize in delete functions.
...
Created an Amazon S3 wrapper class around Zend_Service_Amazon_S3 to add more functionality.
2014-10-21 16:05:50 -04:00
fe291cdc8c
Added sort tracks by upload time to smart blocks criteria
2014-10-19 23:02:40 -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
0196aa21f5
Fixed testcases to account for show image path in and show instance description
2014-10-09 09:39:50 -04:00
6ade74163d
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2014-10-08 18:03:16 -04:00
a84e0761ca
Updated file deletion to remove cc_files rows properly when deleting from the Library
2014-10-08 18:01:06 -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
9a21b99fdf
Merge pull request #70 from RobertElder/more-tokens
...
More tokens
2014-10-07 10:10:14 -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
29b05343bd
Tokens for add User.
2014-10-01 19:36:36 +00:00
dbed915469
Tokens for preferences form.
2014-10-01 19:36:17 +00:00
2be4a5f9d0
Add form tokens to several forms.
2014-09-30 23:09:27 +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
bc603ddd33
Merge branch '2.5.x' into saas
2014-09-19 15:42:05 -04:00
3c797c044a
Undoing make API on by default for now. This needs to be done in the db
2014-09-19 15:41:55 -04:00
36b908b4d1
Merge branch '2.5.x' into saas
2014-09-19 15:30:16 -04:00
66b97158b7
Make API on by default - fix
2014-09-19 15:30:06 -04:00
a0b40e1f7d
Merge branch '2.5.x' into saas
2014-09-19 15:00:58 -04:00
28399b70cc
Make API on by default
2014-09-19 14:57:43 -04:00
365184c2b1
Merging upstream pull
2014-09-19 13:15:53 -04:00
9952c2b58f
Auto generated schema file updates
2014-09-19 13:03:09 -04:00
0789de9392
Updated Show services to account for added show instance description field
2014-09-19 13:02:38 -04:00
2630d88a03
Updated SQL queries to include instance descriptions for API calls
2014-09-19 13:00:44 -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
abc9481a58
Updated to conform to naming conventions
2014-09-19 12:55:47 -04:00
3a1efa39eb
Added instance description field
2014-09-19 12:55:02 -04:00
05a8fdf091
Removed disk quota check from image upload, updated doc for processUploadedImage function
2014-09-18 18:23:13 -04:00
be90839dbe
Added description field to database calls for getting API information
2014-09-18 18:21:27 -04:00
c65fa8ce37
Added button to remove current show logo
2014-09-18 16:38:18 -04:00
d5f6e8a682
Moved validation workaround for show logo in from Schedule Controller, added check to prevent warning about invalid path in readfile
2014-09-18 16:37:03 -04:00
5dfadf6ecc
Changed check for image deletion
2014-09-18 16:35:32 -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
5e18e1881f
Removed unnecessary validator override functions
2014-09-18 16:30:47 -04:00
28824219f8
Added delete images endpoint to ShowController
2014-09-18 16:30:03 -04:00
b525638829
Changed extension check to MIME-type checking
2014-09-18 10:36:40 -04:00
080b2581b6
Changed RestAuth functions to static for ease-of-access
2014-09-18 10:35:26 -04:00
323f53d6ac
Changed data uri method to return empty string instead of malformed uri when given an incorrect path (oddball case)
2014-09-18 10:34:38 -04:00
096556fa74
Added show_logo_name field to data object to avoid deleting current logo when none is being uploaded
2014-09-18 10:32:56 -04:00
1cf3a5ca3a
Fixed always deleting file tree for show image even if directory was non-existant
2014-09-17 19:53:23 -04:00
17ea198ea4
Added accessor function for Show image path
2014-09-17 19:49:22 -04:00
45939138cd
Added previews of uploaded and current show images
2014-09-17 19:48:17 -04:00
b505f16b8f
Commented out $calendar_info logging
2014-09-17 19:47:05 -04:00
c08252bc99
Added function to convert static image file in stor to data URI for display
2014-09-17 19:45:45 -04:00
c4b38043e8
Removed unnecessary image_path field from showData and ccShow object
2014-09-17 19:43:26 -04:00
f2eecebeed
Checkout commit
2014-09-17 13:07:18 -04:00
f724d86b6a
Updated mkdir call to allow for creation of nested directories
2014-09-17 12:16:35 -04:00
d6476fffcd
Added Logging to image upload
2014-09-17 12:05:39 -04:00
6e1244ca33
Added Logging to imag upload
2014-09-17 12:02:55 -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
3f754c032a
Updated Show model to include show image path
2014-09-16 18:28:39 -04:00
940d74ce39
Files auto-updated by Propel
2014-09-16 18:26:18 -04:00
f5a607ad90
Added functionality for deleting saved images when the show is deleted, updating the show image, and returning the showId to be used by ShowController
2014-09-16 18:24:22 -04:00
f3548ff893
Moved functionality for uploading to RESTful ShowController class
2014-09-16 18:18:26 -04:00
3be8e10691
Removed unneccessary upload-image view
2014-09-16 18:16:28 -04:00
8494f813ee
Updated sql schema to include image_path in Cc_Show table
2014-09-16 18:13:46 -04:00
3655c261ac
Shifted Auth functions into separate class to avoid code duplication (not moved from MediaController yet)
2014-09-16 18:11:41 -04:00
e31eb17cfa
Added ShowController to handle show image uploads
2014-09-16 18:10:29 -04:00
da293f610f
Added setNoRender call to MediaController and removed unnecessary views
2014-09-16 18:06:45 -04:00
afffd0c876
Added requires for REST controllers to Bootstrap
2014-09-16 18:04:22 -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
ac60a927d4
Merge branch '2.5.x' into saas
2014-09-12 16:31:58 -04:00
2729202dc4
Corrected japanese locale from ja to ja_JP
2014-09-12 16:29:47 -04:00
662f9d3486
LocaleController path fix
2014-09-08 21:18:57 -04:00
2a96c6ec5b
Merge branch '2.5.x' into saas
2014-09-08 20:49:55 -04:00
f7b6e3379e
Enable Japanese locale
2014-09-08 20:49:08 -04:00
142060d600
Merge remote-tracking branch 'origin/2.5.x' into saas
2014-09-08 20:47:38 -04:00
a21b4f177d
Fixed a bug where we weren't checking if a variable was empty before using it
2014-09-08 13:14:23 -04:00
6598401266
Fixed a bug where we weren't checking if a variable was empty before using it
2014-09-08 11:48:18 -04:00
ef46b1facc
Whitelist account.sourcefabric.com for CORS
2014-09-04 19:11:09 -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
2cc7557cb7
Remove php short tag for better compatibility
2014-08-29 17:10:55 -04:00
ace883c975
Merge branch 'cc-5709-airtime-analyzer' into saas-fix-modules-bootstrap-14-04
...
Conflicts:
airtime_mvc/application/configs/application.ini
airtime_mvc/application/controllers/plugins/Acl_plugin.php
airtime_mvc/application/models/Cache.php
2014-08-28 17:01:03 -04:00
0ccc7e7dc9
SAAS-470: Zend Rest module doesn't work on Ubuntu 14.04
...
The Bootstrap.php in the modules directory didn't like
short php tags.
2014-08-28 16:52:47 -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
716cc5a754
Disable the APC cache for Ubuntu 14.04. APC is deprecated now so we need a better solution anyways.
2014-08-27 18:51:06 -04:00
77ff4ffc3a
Merge branch '2.5.x' into saas
2014-08-26 13:34:09 -04:00
d1971b6d2b
Remove cc_locale table and add Selenium running script
...
* Fixes CC-5906
2014-08-26 13:32:35 -04:00
20a5649dbe
Removed unused code.
...
Changed linked show warning message in the edit show form.
2014-08-25 18:33:29 -04:00
10cb5484fe
Removed unused function.
...
Removed commented out code.
Renamed fillNewLinkedInstances to fillLinkedInstances.
Streamline show instance content if a show goes from unlinked to linked.
2014-08-25 18:33:15 -04:00
32e06a7456
Clean up and simplifcation of linked show filling
2014-08-25 18:33:00 -04:00
e3596dfed3
Added comments and removed some unused code
2014-08-25 18:32:41 -04:00
29c07f2438
Removed old comments
2014-08-25 18:32:27 -04:00
d81de5c6eb
Better way of getting the linked show schedule and moved that into its own function.
...
Store the ids of the new, created show instances so we can pass them to the
fillNewLinkedInstances function
2014-08-25 18:32:08 -04:00
57c1e76dc7
Added criteria parameter to CcShow->getFutureInstanceIds so we can retrieve results from database instead of cache
2014-08-25 18:31:58 -04:00
08e82cb32e
CC-5904: New linked show instances may get an old copy of the schedule
...
Change the way get the show stamp
2014-08-25 18:31:45 -04:00
9a6e617f7c
CC-5904: New linked show instances may get an old copy of the schedule
...
Better way of getting show stamp
Renamed variables
2014-08-25 18:31:33 -04:00
81357bc51f
CC-5904: New linked show instances may get an old copy of the schedule
2014-08-25 18:31:20 -04:00
ee52c7692c
CC-5902: Linked Shows -> Replace content check assumes content of shows have the same number of tracks
...
Conflicts:
airtime_mvc/application/services/SchedulerService.php
2014-08-25 18:30:27 -04:00
afc3d981e8
Commented out unnecessary functions using too much memory
2014-08-25 18:26:46 -04:00
192c4e884f
Bugfix in LocaleController
2014-08-25 18:19:11 -04:00
c55a3a4d74
Use SSL with Recaptcha to fix it
2014-08-25 18:19:00 -04:00
d438587ddc
Merge branch '2.5.x' into saas
...
Conflicts:
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/airtime/CcShow.php
airtime_mvc/application/services/SchedulerService.php
airtime_mvc/application/services/ShowService.php
2014-08-25 18:09:51 -04:00
80b9bcdfc6
Use SSL with Recaptcha to fix it
2014-08-25 14:45:04 -04:00
0fb9429a9e
Bugfix in LocaleController
2014-08-25 14:18:23 -04:00
55682dc7a9
Bugfix in Airtime 2.5.3 upgrader class
2014-08-25 14:04:25 -04:00
bc63669853
Removed unused code.
...
Changed linked show warning message in the edit show form.
2014-08-21 17:12:54 -04:00
6249deb1ac
Removed unused function.
...
Removed commented out code.
Renamed fillNewLinkedInstances to fillLinkedInstances.
Streamline show instance content if a show goes from unlinked to linked.
2014-08-21 16:40:01 -04:00
11de8bd988
Clean up and simplifcation of linked show filling
2014-08-21 13:39:25 -04:00
2a2b4bd05a
Added comments and removed some unused code
2014-10-15 17:11:38 -04:00
660b1a0596
Removed old comments
2014-08-21 09:47:54 -04:00
4c03e12ea1
Better way of getting the linked show schedule and moved that into its own function.
...
Store the ids of the new, created show instances so we can pass them to the
fillNewLinkedInstances function
2014-08-20 16:37:44 -04:00
a5704eac6e
Added criteria parameter to CcShow->getFutureInstanceIds so we can retrieve results from database instead of cache
2014-08-20 16:35:59 -04:00
4a124a8faf
CC-5904: New linked show instances may get an old copy of the schedule
...
Change the way get the show stamp
2014-08-18 19:27:42 -04:00
3fa15913c0
CC-5904: New linked show instances may get an old copy of the schedule
...
Better way of getting show stamp
Renamed variables
2014-08-18 18:55:03 -04:00
b9ecd00d33
CC-5904: New linked show instances may get an old copy of the schedule
2014-08-18 18:10:45 -04:00
62f8a65573
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
...
Conflicts:
airtime_mvc/application/services/SchedulerService.php
2014-08-18 13:03:22 -04:00
2cfc20d0c1
CC-5902: Linked Shows -> Replace content check assumes content of shows have the same number of tracks
2014-08-18 12:59:43 -04:00
60f4d112e7
Optimized linked shows schedule filling
...
* Fairly big improvement in memory usage and execution time for 24 hour linked
shows (memory usage no longer grows with show length)
2014-08-15 18:18:57 -04:00
f072d60ff1
Optimized linked shows schedule filling
...
* Fairly big improvement in memory usage and execution time for 24 hour linked
shows (memory usage no longer grows with show length)
2014-08-15 18:17:23 -04:00
33f397f577
remove memory usage log statements
2014-08-15 16:25:37 -04:00
f863f4dfcf
More mem usage logs
2014-08-15 15:41:00 -04:00
2bc8f6d403
Logging memory usage
2014-08-15 15:36:13 -04:00
26b210ded9
Commented out unnecessary functions using too much memory
2014-08-15 15:32:52 -04:00
f2929d02f6
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Commented function
2014-08-15 15:41:55 -04:00
22218079af
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Refactored show creation into separate function
2014-08-15 15:35:58 -04:00
7bd443f668
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Commented function
2014-08-15 11:09:05 -04:00
20bd2ad9d5
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Refactored show creation into separate function
2014-08-15 11:08:55 -04:00
fe8e004d87
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Create and fill show instances when pypo requests the schedule
Changed getCcShowInstancess function to return all instances
Changed some function calls to retrieve only show instances scheduled in the future
2014-08-15 11:07:26 -04:00
520387fcad
CC-5898: Future repeating shows may not get generated and/or filled with content
...
Create and fill show instances when pypo requests the schedule
Changed getCcShowInstancess function to return all instances
Changed some function calls to retrieve only show instances scheduled in the future
2014-08-16 11:05:55 -04:00
ca62086e16
Removed cloud file deletion from Airtime Analyzer. Deletion is done from PHP now.
2014-08-12 12:59:50 -04:00
879e776c8d
CC-5888: Handle file deletion if the file is stored in the cloud
2014-08-12 12:32:49 -04:00
46228341b2
Audio preview fix
2014-08-12 11:39:29 -04:00
35c450be3f
Audio preview fix
2014-08-12 11:33:10 -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
0203be0f10
Revert zend routing changes to fix uploads
2014-08-01 15:30:37 -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
aa8a26271c
Fix zend routing on Trusty (weird error due to REST module)
2014-08-01 11:51:20 -04:00
02ea553f43
Removed media api delete-success callback because it's no longer in use
2014-07-31 23:21:39 -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
8c2754972e
CC-5896: Store cloud files in separate table, inherited from cc_files
...
Refactored storedfile->delete()
Added a deletePhysicalFile function to CcFile and CloudFile
Cleaned up schedule events that get passed to Pypo
2014-07-29 15:07:51 -04:00
b7d1852fc0
CC-5896: Store cloud files in separate table, inherited from cc_files
2014-07-28 16:11:05 -04:00
6fa7ddba9a
CC-5896: Store cloud files in separate table, inherited from cc_files
...
Added delete on cascade for cloud files
2014-07-28 16:03:57 -04:00
f6aa2e5a3b
CC-5896: Store cloud files in separate table, inherited from cc_files
...
For cloud files, return the original filename when downloading a file instead of the cloud object name
2014-07-28 16:02:06 -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
4b4554476a
Error checking if a locale isn't installed
2014-07-28 11:35:19 -04:00
e759b8969b
Fix undefined variable
2014-07-25 15:18:17 -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
b38f3d7e03
CC-5895: Upgrade Propel to 1.7
...
Add vendor directory to include path
2014-07-23 16:13:55 -04:00
7490c81a8f
CC-5895: Upgrade Propel to 1.7
...
Moved composer.json to top level of repo so propel will get installed there
Updated install scripts to reflect this change
2014-07-23 15:56:23 -04:00
41ff0cce67
CC-5896: Store cloud files in separate table, inherited from cc_files
...
Using Class Table Inheritance - delegate behaviour, created a cloud_file
table to store cloud files
2014-07-23 15:22:42 -04:00
72841de714
CC-5895: Upgrade Propel to 1.7
...
Used composer to download Propel 1.7
The Propel library will no longer be stored in the Airtime repo
2014-07-23 15:03:51 -04:00
c09457ce7c
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2014-07-16 15:03:39 -04:00
82d7f09382
Small code cleanup
2014-07-16 12:44:09 -04:00
7ca6b91cdf
CC-5888: Handle file deletion if the file is stored in the cloud
2014-07-16 12:03:22 -04:00
aaee522ec6
CC-5888: Handle file deletion if the file is stored in the cloud
2014-07-15 17:20:04 -04:00
490a9c0d06
Merge branch 'cc-5709-airtime-analyzer' into saas
2014-07-15 16:46:20 -04:00
7438ecd2b4
Use track metadata from Airtime in playout engine
...
* Resolves CC-5893: Metadata not updated on Airtime Pro
* Report track metadata in the schedule API, and make pypo pass that
along to Liquidsoap via annotations.
* Move HTTP response sanitization for file metadata out of the REST module and into CcFiles
* Slightly improved the terrible exception handling in pypo
2014-07-15 16:41:55 -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
8e714bcb64
CC-5888: Handle file deletion if the file is stored in the cloud
2014-07-15 07:26:39 -04:00
b8a9d72da6
Give Submit Order button an ID for GTM
2014-07-11 16:37:48 -04:00
9d0f564190
Prevent analyzer from crashing if it is reporting a failure to Airtime
2014-07-11 16:17:13 -04:00
039a51121b
CC-5885: Factor out cloud storage code into separate class
2014-07-11 16:16:30 -04:00
e7dfc08128
CC-5892: Handle when a file is downloaded from the Airtime library
2014-07-10 17:59:27 -04:00
c2411b6f41
CC-5884: Modify Pypo -> Download files from cloud storage
2014-07-10 17:56:41 -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
9b3a26c19a
Fix user deletion, remove spurious logging
2014-07-08 17:45:22 -04:00
2750b6aa0b
Fixed unit tests in saas branch
2014-07-07 15:30:18 -04:00
0b41cd1d38
Validate VAT every time the Account Plans page loads
2014-07-07 15:20:41 -04:00
2b704178ea
Set resource_id and directory to 'cloud' type on PUT request
2014-07-04 16:35:01 -04:00
aeb3bb7aa0
SAAS-447: Cloud Storage
...
Added resource_id column to cc_files table
2014-07-04 16:34:00 -04:00
3c88f66162
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
2014-07-03 17:13:06 -04:00
64d3cb7b1b
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-03 17:12:50 -04:00
63113b4e75
Fix for Chrome radio button disabling
2014-07-03 17:12:33 -04:00
e18a281991
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
2014-07-03 16:53:11 -04:00
e8bc6a3080
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-03 16:53:01 -04:00
dea68878f4
Fix for radio button disabling bug in Billing view
2014-07-03 16:51:59 -04:00
20a4323af9
Merge branch 'cc-5709-airtime-analyzer-buy-now-saas' into saas
2014-07-03 16:49:37 -04:00
a831fbe5b7
Merge branch 'cc-5709-airtime-analyzer-buy-now' into cc-5709-airtime-analyzer-buy-now-saas
2014-07-03 16:49:28 -04:00
c551097d57
Default to monthly billing for invalid values
2014-07-03 16:46:25 -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
cda812dd73
Trialbox: Don't open My Account in new window
2014-07-02 14:49:11 -04:00
758423a7f7
Billing page fix for customers with multiple stations
2014-07-02 14:47:10 -04:00
Albert Santoni
drigato
Albert Santoni
Daniel James
Duncan Sommerville
Mark Lewis
Robert Elder
Robbt