Commit graph

12176 commits

Author SHA1 Message Date
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
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
localizer
59d7c23450 updated translation resources 2014-12-23 10:10:38 +00:00
Albert Santoni
e29675a6b4 Remove debian/ directory and gen-snapshot. They're moving to the
packaging repo.
2014-12-17 11:31:10 -05:00
Daniel James
7927a035be Bring snapshots up to date with current packaging 2014-12-17 16:01:30 +00:00
Albert Santoni
8766519c71 Another tweak to Opus sound quality. Liquidsoap picks undocumented poor
defaults for almost every encoder.
2014-12-15 10:49:21 -05:00
Albert Santoni
3b88b0ce22 Boost the Opus sound quality 2014-12-15 10:42:45 -05:00
Albert Santoni
b65cf15ddd Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-12-12 11:34:00 -05: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
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
b037bfdf97 Merge branch '2.5.x' of github.com:sourcefabric/Airtime into 2.5.x 2014-11-24 13:20:03 -05:00
Albert Santoni
3d0d148169 Fix race condition in selenium tests 2014-11-24 10:44:36 -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
12550112fd Remove base URL from selenium tests to make the Selenium IDE happy 2014-11-19 11:28:03 -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
localizer
ee0d89913b updated translation resources 2014-11-14 09:59:25 +00:00
Albert Santoni
0a0e7cb8f3 Regenerate the .po files... 2014-11-13 14:31:41 -05:00
localizer
9e74b26fc4 updated translation resources 2014-11-13 19:07:10 +00:00
Albert Santoni
0681e80afd Regenerated the .po files 2014-11-13 13:56:47 -05:00
Duncan Sommerville
c580e8a569 Removed references to show instance description 2014-11-11 19:07:33 -05:00
Duncan Sommerville
f6bf2f8cc5 Changed tabs to spaces 2014-11-07 12:05:29 -05:00
Duncan Sommerville
4dab2abf4e Replaced reoccurring strings with string formatting to aid dynamic translations 2014-11-06 18:40:19 -05:00
Duncan Sommerville
8fc7178d82 Added several global constants for reoccurring strings in Airtime to aid dynamic translations 2014-11-06 18:40:19 -05:00
Duncan Sommerville
efd05c4b77 Added the _initTranslationGlobals function to bind PHP globals to javascript vars for dynamic translation purposes 2014-11-06 18:40:06 -05:00
Duncan Sommerville
795e239ff3 Made several reoccurring strings into application constants and altered any static strings containing them to use these constants in string format calls. 2014-11-06 18:39:48 -05:00
Duncan Sommerville
62a915f109 Added global define for application name 2014-11-06 11:57:05 -05:00
Duncan Sommerville
3046003a1b Removed unnecessary cookie declaration for default locale 2014-11-05 17:27:41 -05:00
Duncan Sommerville
3b588dcce8 Removed unnecessary call to set locale data on the Login page 2014-11-05 17:27:08 -05:00
Duncan Sommerville
534b56351e Added styles to completely hide csrf elements on the page; changed tabs to spaces 2014-11-05 17:26:05 -05:00
Duncan Sommerville
e5e7942b42 Added getUserLocale function to pull locale data into the Login form 2014-11-05 17:24:54 -05:00
Duncan Sommerville
eecd3fa188 Added setDefaults call to initialize the locale field to user's locale, or the station default; removed unnecessary field 2014-11-05 17:24:08 -05:00
Duncan Sommerville
b94d34f719 Removed calls to set user locale and timezone on user creation; these calls were updating the current user instead of the created user, and so served no purpose 2014-11-05 17:22:13 -05:00