Albert Santoni
|
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 |
|
Duncan Sommerville
|
61a47aeb27
|
Small fix to BPM sanitization
|
2015-02-20 14:01:29 -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 |
|
Albert Santoni
|
487ab9bd99
|
CC-5868: Make the BPM field less strict
|
2015-02-19 09:31:23 -05:00 |
|
Albert Santoni
|
17f1d0e96d
|
Simplify the metadata sanitization and bugfix it
* SAAS-376 and CC-5868
|
2015-02-18 16:29:08 -05:00 |
|
Albert Santoni
|
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 |
|
Duncan Sommerville
|
a07a1edcc0
|
SAAS-595 - Updated validation and sanitization
|
2015-02-17 12:17:49 -05:00 |
|
Duncan Sommerville
|
eb40379152
|
SAAS-595 - Changed Zend validation and added sanitization in file import process to throw out bad track number metadata
|
2015-02-17 11:44:31 -05:00 |
|
Albert Santoni
|
2a9790adf3
|
Backport ACL REST permission fix
|
2015-02-06 16:05:51 -05:00 |
|
Albert Santoni
|
4b6e5671c3
|
REST permission fix
|
2015-02-06 14:33:02 -05:00 |
|
Albert Santoni
|
e32a26956b
|
Fixed the unit tests again
|
2015-02-02 13:31:52 -05:00 |
|
Albert Santoni
|
9baed1b328
|
Make the unit tests pass again
|
2015-02-02 13:14:14 -05:00 |
|
Albert Santoni
|
536094ea50
|
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
|
2015-02-02 13:05:32 -05:00 |
|
Albert Santoni
|
3e6f3abb23
|
Merge branch 'cc-5709-airtime-analyzer' of github.com:sourcefabric/Airtime into cc-5709-airtime-analyzer
|
2015-02-02 12:26:36 -05:00 |
|
Albert Santoni
|
ee6862e731
|
Fixed quotation issue with playability analyzer
|
2015-02-02 12:26:22 -05:00 |
|
Albert Santoni
|
3f6983aa3e
|
Renabling CuePointAnalyzer
|
2015-02-02 12:18:33 -05:00 |
|
drigato
|
3f97ed3d55
|
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
|
2015-01-27 16:46:06 -05:00 |
|
drigato
|
ea868607b4
|
Enabling cuepoint analyzer because the silan bug has been fixed
|
2015-01-27 16:44:21 -05:00 |
|
drigato
|
43c6475f1b
|
Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-cloud-storage
|
2015-01-26 09:18:32 -05:00 |
|
drigato
|
6adaf7a91a
|
Disabling cue point analyzer
|
2015-01-26 09:17:53 -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 |
|
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
|
6492128ce9
|
Hide Now Playing toolbar for Guest users
|
2015-01-21 15:15:22 -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
|
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
|
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 |
|
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 |
|
localizer
|
c614f4d711
|
updated translation resources
|
2015-01-15 11:12:14 +00:00 |
|