Commit Graph

4036 Commits

Author SHA1 Message Date
denise ff2fde0173 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-04-30 15:54:20 -04:00
denise ec2f36efa8 CC-5077: Calendar -> Context menu -> Show Content -> shows incorrect time filled on edited repeat instances
- We weren't updating the time_filled column in cc_show_instances when creating the new show
2013-04-30 15:54:04 -04:00
Martin Konecny decb12f6b8 Merge branch 'master' of dev.sourcefabric.org:airtime 2013-04-30 15:00:45 -04:00
Martin Konecny de4934a317 ensure that uploaded file is UTF-8 encoded 2013-04-30 15:00:31 -04:00
denise 4ca60ca676 CC-5074: Editing a linked instance sets incorrect schedule start times 2013-04-30 13:58:03 -04:00
denise 1384c5d39d Function call was missing an argument 2013-04-29 15:57:59 -04:00
denise 71526a94cc Merge branch 'cc-4961-show-linking'
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
2013-04-29 15:35:16 -04:00
denise de8f7b0ff7 CC-4961: Show linking 2013-04-29 15:27:14 -04:00
Martin Konecny acfc72f422 use sendJson, instead of manually disabling layouts + encoding data 2013-04-26 18:06:07 -04:00
Martin Konecny 3a931f27bf CC-4417: Opus codec support 2013-04-26 17:54:29 -04:00
denise a5264aac1e CC-4961: Show linking 2013-04-26 16:10:01 -04:00
Martin Konecny 6cc366b100 CC-5069:
Airtime 2.4 upgrade scripts

-initial commit
2013-04-26 13:43:40 -04:00
denise 52655ab375 CC-4961: Show linking 2013-04-26 13:43:30 -04:00
denise 0f1383d541 CC-4961: Show linking 2013-04-25 09:00:37 -04:00
Martin Konecny 0e3b4da52f clear unused function 2013-04-24 15:17:06 -04:00
Martin Konecny 8f6b583fcb CC-5061:
Use propel transactions for StoredFile class
2013-04-19 20:40:31 -04:00
Martin Konecny 243dda60f8 remove useless comment 2013-04-19 20:25:26 -04:00
Martin Konecny fd78ad29bf cleanup of function names 2013-04-19 20:24:05 -04:00
Martin Konecny 923f4ee180 CC-5062:
Add "error" logging level

-done
2013-04-19 20:11:33 -04:00
Martin Konecny f39f9329cc CC-4992:
Decouple pypo from Airtime install

-first commit
2013-04-19 20:10:51 -04:00
Martin Konecny 018ec9231e don't print out anything extra after printing json 2013-04-18 16:20:34 -04:00
denise a9b5d00d87 CC-4961: Show linking 2013-04-18 16:12:26 -04:00
Martin Konecny 479e69de12 CC-5009:
Use Silan to silently update track length in the background

-done
2013-04-18 15:40:33 -04:00
denise 1a2a05c3cf CC-4961: Show linking 2013-04-12 16:34:36 -04:00
denise 9b4a0ba9c1 CC-4961: Show linking
Removed stamp tables
2013-04-12 10:52:13 -04:00
Martin Konecny d46fef8eda SAAS-301: Calendar content indicator did not update automatically after adding content to a show
-fixed
2013-04-11 15:11:20 -04:00
Martin Konecny 3714f83757 Merge branch '2.3.x' 2013-04-11 15:06:21 -04:00
Martin Konecny 5cd6dd907b Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-04-11 15:04:29 -04:00
Martin Konecny 3000f543d8 SAAS-301:
Calendar content indicator did not update automatically after adding content to a show

-fixed
2013-04-11 15:04:16 -04:00
Daniel James a7cdaa9629 Updated translation files against current strings 2013-04-11 18:20:25 +01:00
Daniel James 1bb5f171a8 Updated Canadian localization, eh? :-) 2013-04-11 17:05:33 +01:00
Daniel James de6ccd9c72 Updated US English localization 2013-04-11 17:02:53 +01:00
Martin Konecny 0da0e798c6 make password input width same as text input width. Also make everything a little wider. 2013-04-10 18:19:46 -04:00
denise 9b2fb3bece CC-4961: Show linking 2013-04-09 15:55:18 -04:00
denise e64f6fb3fd CC-4961: Show linking
-modified db
2013-04-08 14:43:27 -04:00
denise 76bfce21b1 CC-4961: Show linking
-modified db
2013-04-08 14:42:37 -04:00
denise cfee74693b CC-4961: Show linking
moved move-show to calendar service
2013-04-05 17:44:30 -04:00
Martin Konecny 4595aab694 Merge branch '2.3.x' 2013-04-05 15:33:48 -04:00
Martin Konecny d1f655d79d CC-5038: Silan error: list index out of range
-fixed
2013-04-05 15:32:44 -04:00
denise 62d1b22fcc CC-4961: Show linking
created new cc_show_stamp table
2013-04-05 12:27:54 -04:00
denise f9d7167638 CC-4961: Show linking 2013-04-04 16:30:33 -04:00
Martin Konecny fcbac2a044 Merge branch '2.3.x' into devel 2013-04-04 15:15:19 -04:00
Martin Konecny 301115c035 CC-5039: Encoded forward slash causing lots of apache error logs
-fixed: data should have been sent as POST rather than GET
2013-04-04 15:12:52 -04:00
Martin Konecny d1e72cfeea Merge branch '2.3.x' into devel 2013-04-03 17:12:28 -04:00
Martin Konecny a748b05125 CC-5040:
All API actions need to have consistent return value

-temp fix. Correct fix will require ensuring api_client always sends
XmlHttpRequest
2013-04-03 17:11:36 -04:00
denise b40306cb1b Add comment to schema.xml to indicate what the broadcasted column is of cc_schedule 2013-04-03 16:21:30 -04:00
denise 81dbb17922 CC-4961: Show linking
-moved show deletion into show service
2013-04-03 11:46:46 -04:00
Martin Konecny 563f5b64d2 Merge branch '2.3.x' into devel
Conflicts:
	debian/postinst
2013-04-02 12:31:48 -04:00
Daniel James 860524a873 Added locales for English localizations 2013-04-02 17:19:48 +01:00
Daniel James ebbb9f1b9c Added Austrian German localization, thanks Hoerich! 2013-04-02 17:06:16 +01:00