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
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
230cdcccb4
Merge branch '2.5.x' into cc-5709-airtime-analyzer
...
Conflicts:
CREDITS
2015-01-22 11:29:38 -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
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
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
Albert Santoni
620029c04e
Stop Chrome from flashing white between page loads
2015-01-15 16:45:14 -05:00
Daniel James
cfe3527b93
Fix link to user manual
2015-01-15 16:33:03 +00:00
localizer
c614f4d711
updated translation resources
2015-01-15 11:12:14 +00:00
Albert Santoni
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
Duncan Sommerville
9e90e8af63
Added cc_show image_path and cc_show_instances description fields to schema
2015-01-13 17:07:23 -05:00
Duncan Sommerville
a0e5c975dd
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
2015-01-13 15:50:38 -05:00
Albert Santoni
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
Mark Lewis
17a577fbbb
use is_numeric instead of is_int as values are strings
2015-01-09 13:02:25 -05:00
Mark Lewis
1b03bd7fbd
use new var instaead of calling getShowListContent again
2015-01-09 13:02:25 -05:00
Mark Lewis
fc8e65944e
added error checked for required params
2015-01-09 13:02:25 -05:00
Mark Lewis
1cc1f8a378
return error for missing instance_id on show-tracks action
2015-01-09 13:02:25 -05:00
Mark Lewis
174cf79d84
clean up shows endpoint, remove dependency on Show model
2015-01-09 13:02:25 -05:00
Mark Lewis
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
Mark Lewis
03dae5be2b
fix spacing in ApiController
2015-01-09 13:01:43 -05:00
Mark Lewis
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
Albert Santoni
05c9e21e48
Recognize audio/aac as a MIME type for webstreams
2015-01-09 10:44:24 -05:00
drigato
e5c806f658
Merge branch '2.5.x' into cc-5709-airtime-analyzer
2015-01-07 14:13:36 -05:00
localizer
59d7c23450
updated translation resources
2014-12-23 10:10:38 +00:00
localizer
cceddd57d8
updated translation resources
2014-12-05 10:33:17 +00:00
localizer
37e358630d
updated translation resources
2014-11-27 14:57:16 +00:00
drigato
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
Duncan Sommerville
86ce4673ab
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
2014-11-25 12:27:50 -05:00
Albert Santoni
7db571d103
Remove clearAction from the media REST API for security
2014-11-20 16:47:02 -05:00
Albert Santoni
8ffd70781b
Remove clearAction from the media REST API for security
2014-11-20 16:46:21 -05:00
drigato
00fbda193e
Schedule->removeItems optimization fix for deleting the current playing track
2014-11-20 09:57:37 -05:00
drigato
48ae8ac69c
Scheduler->removeItems optimization
2014-11-19 15:13:33 -05:00
Albert Santoni
c829b6bf95
Fix bad merge
2014-11-18 18:17:19 -05:00
Albert Santoni
dd3b54f8ed
Actually delete files from the database via the media REST API
2014-11-18 18:15:45 -05:00
Albert Santoni
11a31375df
Slightly more robust fix for the last issue
2014-11-18 17:41:44 -05:00
Duncan Sommerville
6460854fda
Fixed 'clear' button not working when files failed to import
2014-11-18 17:13:48 -05:00
Albert Santoni
e7e1926896
CC-5950: Fix for issue where clear button in Recent Uploads didn't work
...
sometimes
2014-11-18 17:11:09 -05:00
Duncan Sommerville
1e8df2b027
Merge branch '2.5.x' of https://github.com/sourcefabric/Airtime into 2.5.x
2014-11-14 10:02:01 -05:00
Duncan Sommerville
fcbb1c2ee7
String updates
2014-11-14 10:01:06 -05:00
localizer
b5575d9953
updated translation resources
2014-11-14 10:53:06 +00:00
localizer
9d29b84081
updated translation resources
2014-11-14 10:49:07 +00:00