8e2366f6fb
Remove Rabbitmq.php dependency on Amazon S3 stuff (which was the main purpose of the last commit)...
2015-01-26 13:19:48 -05:00
dbba5a7427
Decouple Billing and S3 cloud storage stuff from Zend
2015-01-26 13:10:10 -05:00
49667e3d2d
Squash logging
2015-01-26 12:12:27 -05:00
9e75c2a479
Stopped adding apt.sourcefabric to sources in installer for compatibility with Ubuntu Saucy
2015-01-26 09:57:31 -05:00
43c6475f1b
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
2015-01-26 09:18:32 -05:00
6adaf7a91a
Disabling cue point analyzer
2015-01-26 09:17:53 -05:00
a686eabb96
Disabling cue point analyzer
2015-01-23 17:33:57 -05:00
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
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
7d00f5213d
SAAS-559: Turn off sql notices during upgrade
2015-01-23 16:08:22 -05:00
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
6e43505379
Merge branch '2.5.x' into 2.5.x-installer
2015-01-22 17:36:12 -05:00
239aae029e
Added image_path to unit tests.
2015-01-22 17:30:29 -05:00
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
6ebe8ec6c8
Pin python-daemon to 1.6 because 2.0.3 breaks setuptools
2015-01-22 12:42:05 -05:00
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
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
230cdcccb4
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
CREDITS
2015-01-22 11:29:38 -05:00
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
38a2924849
SAAS-555: Analyzer calculates wrong cue out
2015-01-22 11:08:34 -05:00
fd42c67b0b
Merge branch 'saas' of github.com:sourcefabric/Airtime into saas
2015-01-21 18:08:05 -05:00
a40067ca55
Moved REST authorization boilerplate to Zend Acl_plugin
2015-01-21 17:20:04 -05:00
2c2f7ebc5f
Initial commit for update to ACL for REST module; NEEDS TESTING
2015-01-21 15:34:15 -05:00
7e2cc65f32
Merge branch '2.5.x' into saas
2015-01-21 15:15:58 -05:00
6492128ce9
Hide Now Playing toolbar for Guest users
2015-01-21 15:15:22 -05:00
345b2b5d26
Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas
2015-01-21 15:14:34 -05:00
e649863dff
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2015-01-21 12:15:14 -05:00
39445c945f
Added upgrade.py helper script (for development only)
2015-01-21 12:14:44 -05:00
62f2a0babf
CC-5981: Admin users can't delete webstreams created by other users
2015-01-21 11:31:28 -05:00
ca9724ec5f
Fixed small issue where doing an in-place install over an existing 2.5.1 install would fail
2015-01-21 10:50:58 -05:00
7034c8e00d
Initial fix for apache 2.4 vhost file
2015-01-20 17:31:59 -05:00
b58891f1fa
Added additional checks to ensure services are running properly
2015-01-20 13:42:41 -05:00
2fadc8f8f1
Merge branch '2.5.x' into saas
...
Conflicts:
CREDITS
2015-01-20 11:44:53 -05:00
6ac5a2950f
SAAS-551: Cannot schedule shows due to overlapping show check bug
2015-01-20 11:32:15 -05:00
a0193f6d39
Fix to overly optimistic service reporting
2015-01-19 17:40:21 -05:00
905981114f
Merge branch '2.5.x-installer' of https://github.com/sourcefabric/Airtime into 2.5.x-installer
2015-01-19 16:41:56 -05:00
aee36c62b4
Updated README since dependencies are now on by default
2015-01-19 16:41:41 -05:00
dec7dddd83
Merge branch '2.5.x' into 2.5.x-installer
2015-01-19 15:40:07 -05:00
c399250fbf
Updated credits
2015-01-19 15:39:52 -05:00
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
57e4ba5292
requirements.apt for Ubuntu Precise
2015-01-19 15:05:49 -05:00
c5a60d2f09
Last updates before 2.5.2 RC, mainly small fixes for Ubuntu Precise
2015-01-19 15:05:13 -05:00
2cb26db84b
SAAS-547: Refactor upgrade procedure in 2.5.x-installer branch
...
* Start using "schema_version" key instead of "system_version"
* Refactored the upgrade code a bit and make it be automatically invoked
from the Zend bootstrap if a schema update is needed.
* Fixed error logging in certain cases
* Fixed an exception in Show related to image_path
2015-01-19 13:41:23 -05:00
974d419951
updated translation resources
2015-01-19 13:52:08 +00:00
5980f599e7
updated translation resources
2015-01-19 13:02:11 +00:00
5abe364a69
Forgot to rename the 2.5.5 upgrade.sql to 2.5.2
2015-01-16 17:31:11 -05:00
b1d3dece48
Merge branch '2.5.x-installer' of github.com:sourcefabric/Airtime into 2.5.x-installer
2015-01-16 17:27:59 -05:00
c03dd38c00
Merge branch '2.5.x' into 2.5.x-installer
...
Conflicts:
airtime_mvc/application/Bootstrap.php
airtime_mvc/application/models/Show.php
2015-01-16 17:27:52 -05:00
c22f2cd5f0
Clean up readability of installer
2015-01-16 17:20:50 -05:00
44018b2cbf
Changed status page to use config-check (tentative) and removed time-intensive check in index routing
2015-01-16 16:15:16 -05:00
Albert Santoni
Duncan Sommerville
drigato
Albert Santoni
localizer