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
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
cfe3527b93
Fix link to user manual
2015-01-15 16:33:03 +00:00
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
c614f4d711
updated translation resources
2015-01-15 11:12:14 +00: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
9e90e8af63
Added cc_show image_path and cc_show_instances description fields to schema
2015-01-13 17:07:23 -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
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
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
f08970822d
Merge branch '2.5.x' into saas
2015-01-07 12:37:26 -05:00
3225fcc6bc
Fix syntax errors in fdkaac.liq
2015-01-07 11:35:43 -05:00
fc912923ce
Force the use of FDK-AAC and significantly boost AAC sound quality
2015-01-06 12:58:11 -05:00
59d7c23450
updated translation resources
2014-12-23 10:10:38 +00:00
a0f5e33855
Added "Help Center" link to Help menu for Josh
2014-12-17 16:10:04 -05:00
e29675a6b4
Remove debian/ directory and gen-snapshot. They're moving to the
...
packaging repo.
2014-12-17 11:31:10 -05:00
7927a035be
Bring snapshots up to date with current packaging
2014-12-17 16:01:30 +00:00
d5fc90e9d3
Merge branch '2.5.x' into saas
2014-12-15 10:50:25 -05:00
8766519c71
Another tweak to Opus sound quality. Liquidsoap picks undocumented poor
...
defaults for almost every encoder.
2014-12-15 10:49:21 -05:00
3b88b0ce22
Boost the Opus sound quality
2014-12-15 10:42:45 -05:00
797bafa453
Make the LiveChat changes from yesterday slightly more reslient to
...
missing database keys.
2014-12-12 11:57:16 -05:00
b65cf15ddd
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-12-12 11:34:00 -05:00
ad56d6cafb
Show the plan and station URL in Live Chat
2014-12-11 17:40:34 -05:00
cceddd57d8
updated translation resources
2014-12-05 10:33:17 +00: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
37e358630d
updated translation resources
2014-11-27 14:57:16 +00: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
b037bfdf97
Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x
2014-11-24 13:20:03 -05:00
3d0d148169
Fix race condition in selenium tests
2014-11-24 10:44:36 -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
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
Albert Santoni
Albert Santoni
Daniel James
localizer
Duncan Sommerville
Mark Lewis