drigato
|
a686eabb96
|
Disabling cue point analyzer
|
2015-01-23 17:33:57 -05:00 |
|
drigato
|
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 |
|
drigato
|
ef6572aea9
|
Merge branch '2.5.x' into saas
Conflicts:
airtime_mvc/tests/application/services/database/datasets/test_ccShowInsertedIntoDatabase.xml
|
2015-01-23 16:24:09 -05:00 |
|
drigato
|
7d00f5213d
|
SAAS-559: Turn off sql notices during upgrade
|
2015-01-23 16:08:22 -05:00 |
|
drigato
|
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 |
Albert Santoni
|
239aae029e
|
Added image_path to unit tests.
|
2015-01-22 17:30:29 -05:00 |
|
drigato
|
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 |
|
Albert Santoni
|
6ebe8ec6c8
|
Pin python-daemon to 1.6 because 2.0.3 breaks setuptools
|
2015-01-22 12:42:05 -05:00 |
|
Albert Santoni
|
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 |
|
Albert Santoni
|
476128ce87
|
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
|
2015-01-22 11:29:47 -05:00 |
|
Albert Santoni
|
230cdcccb4
|
Merge branch '2.5.x' into cc-5709-airtime-analyzer
Conflicts:
CREDITS
|
2015-01-22 11:29:38 -05:00 |
|
drigato
|
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 |
|
drigato
|
38a2924849
|
SAAS-555: Analyzer calculates wrong cue out
|
2015-01-22 11:08:34 -05:00 |
|
Albert Santoni
|
fd42c67b0b
|
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
|
2015-01-21 18:08:05 -05:00 |
Duncan Sommerville
|
a40067ca55
|
Moved REST authorization boilerplate to Zend Acl_plugin
|
2015-01-21 17:20:04 -05:00 |
|
Duncan Sommerville
|
2c2f7ebc5f
|
Initial commit for update to ACL for REST module; NEEDS TESTING
|
2015-01-21 15:34:15 -05:00 |
|
Duncan Sommerville
|
7e2cc65f32
|
Merge branch '2.5.x' into saas
|
2015-01-21 15:15:58 -05:00 |
|
Duncan Sommerville
|
6492128ce9
|
Hide Now Playing toolbar for Guest users
|
2015-01-21 15:15:22 -05:00 |
|
Duncan Sommerville
|
345b2b5d26
|
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
|
2015-01-21 15:14:34 -05:00 |
|
Albert Santoni
|
e649863dff
|
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
|
2015-01-21 12:15:14 -05:00 |
|
Albert Santoni
|
39445c945f
|
Added upgrade.py helper script (for development only)
|
2015-01-21 12:14:44 -05:00 |
|
drigato
|
62f2a0babf
|
CC-5981: Admin users can't delete webstreams created by other users
|
2015-01-21 11:31:28 -05:00 |
|
drigato
|
2fadc8f8f1
|
Merge branch '2.5.x' into saas
Conflicts:
CREDITS
|
2015-01-20 11:44:53 -05:00 |
|
drigato
|
6ac5a2950f
|
SAAS-551: Cannot schedule shows due to overlapping show check bug
|
2015-01-20 11:32:15 -05:00 |
|
Albert Santoni
|
c399250fbf
|
Updated credits
|
2015-01-19 15:39:52 -05:00 |
Albert Santoni
|
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 |
localizer
|
974d419951
|
updated translation resources
|
2015-01-19 13:52:08 +00:00 |
|
localizer
|
5980f599e7
|
updated translation resources
|
2015-01-19 13:02:11 +00:00 |
|
drigato
|
38882abd1a
|
SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download
|
2015-01-16 15:15:37 -05:00 |
|
drigato
|
527d2851af
|
SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download
|
2015-01-16 15:15:14 -05:00 |
|
drigato
|
19626ed4f5
|
SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download
|
2015-01-16 13:26:55 -05:00 |
|
drigato
|
775008b274
|
SAAS-542: ryerson.airtime.pro file doesn't play, preview, or download
|
2015-01-16 12:13:04 -05:00 |
|
drigato
|
57a7218a79
|
SAAS-540: Change the Provisioning Controller's terminate endpoint to reflect new S3 file prefix
|
2015-01-16 11:09:13 -05:00 |
|
drigato
|
7930ae97ae
|
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
|
2015-01-15 17:23:15 -05:00 |
|
drigato
|
29c5cf5de0
|
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
|
2015-01-15 17:21:26 -05:00 |
|
drigato
|
52a66632c6
|
SAAS-539: Analyzer can return values in scientific notation which are not compatible with Airtime
Fix unit tests
|
2015-01-15 17:17:29 -05:00 |
|
Albert Santoni
|
620029c04e
|
Stop Chrome from flashing white between page loads
|
2015-01-15 16:45:14 -05:00 |
|
Albert Santoni
|
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 |
|
Albert Santoni
|
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 |
|
drigato
|
f8ce7110ee
|
Merge branch 'cc-5709-airtime-analyzer-cloud-storage' into cc-5709-airtime-analyzer-cloud-storage-saas
|
2015-01-15 13:46:26 -05:00 |
|
drigato
|
89e760fd98
|
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
|
2015-01-15 13:45:40 -05:00 |
|
drigato
|
7d0f1655d2
|
SAAS-539: Analyzer can return values in scientific notation which are not compatible with Airtime
|
2015-01-15 13:44:48 -05:00 |
|
Albert Santoni
|
4ba4559f01
|
Merge pull request #85 from danielhjames/2.5.x
2.5.x Fix link to user manual
|
2015-01-15 13:30:48 -05:00 |
Daniel James
|
cfe3527b93
|
Fix link to user manual
|
2015-01-15 16:33:03 +00:00 |
|
Daniel James
|
f9a006e11b
|
Merge branch '2.5.x' of git://github.com/sourcefabric/Airtime into 2.5.x
Conflicts:
debian/changelog
debian/compat
debian/control
debian/copyright
debian/etc/airtime.ini
debian/etc/apache.vhost.tpl
debian/install
debian/po/templates.pot
debian/postinst
gen-snapshot.sh
|
2015-01-15 16:26:16 +00:00 |
|
Duncan Sommerville
|
a5cc529c4a
|
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
|
2015-01-15 11:24:16 -05:00 |
|
localizer
|
c614f4d711
|
updated translation resources
|
2015-01-15 11:12:14 +00:00 |
|
drigato
|
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 |
|
Albert Santoni
|
609a46dfa3
|
Comment Airtime_Decorator_SuperAdmin_Only
|
2015-01-14 15:12:20 -05:00 |
|
Albert Santoni
|
c24a040689
|
Fixed my SuperAdmin_Only decorator
|
2015-01-14 14:34:14 -05:00 |