Martin Konecny
|
61f8e64329
|
Merge branch '2.3.x' into devel
|
2013-04-03 17:59:04 -04:00 |
|
Martin Konecny
|
3c68a295b4
|
CC-5039:
Encoded forward slash causing lots of apache error logs
-fixed: data should have been sent as POST rather than GET
|
2013-04-03 17:57:29 -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 |
|
Martin Konecny
|
e2e6a4263c
|
Merge branch '2.3.x' into devel
|
2013-04-03 16:48:19 -04:00 |
|
Martin Konecny
|
ec7c898f5a
|
fix some problems with invalid Liquidsoap PID file
|
2013-04-03 16:47:46 -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
|
bfb252edf5
|
CC-4417: Opus codec support
|
2013-04-03 11:40:57 -04:00 |
|
Daniel James
|
d2455fa9c3
|
Updated translation credits
|
2013-04-03 10:51:08 +01:00 |
|
Daniel James
|
49929495f7
|
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
|
2013-04-02 17:38:20 +01:00 |
|
Daniel James
|
08a4802300
|
Updated credits file
|
2013-04-02 17:37:54 +01:00 |
|
Martin Konecny
|
563f5b64d2
|
Merge branch '2.3.x' into devel
Conflicts:
debian/postinst
|
2013-04-02 12:31:48 -04:00 |
|
Martin Konecny
|
142ce9c3d2
|
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
|
2013-04-02 12:30:37 -04:00 |
|
Martin Konecny
|
0bb7fa4975
|
don't change monit monitor state on service start/stop
|
2013-04-02 12:30:15 -04:00 |
|
Daniel James
|
ffe11465ec
|
Added translators to credits file
|
2013-04-02 17:26:49 +01: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 |
|
Daniel James
|
7f729cb038
|
Explicit dependency on libc-bin and locales packages so we can check or set UTF-8 locale
|
2013-04-02 10:31:58 +01:00 |
|
Martin Konecny
|
811abc4baf
|
don't change monit monitor state on service start/stop
|
2013-04-01 19:31:13 -04:00 |
|
Martin Konecny
|
5ac51e289d
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2013-04-01 19:15:02 -04:00 |
|
Martin Konecny
|
6ae8da98e4
|
removing logging
|
2013-04-01 19:14:55 -04:00 |
|
denise
|
ab10ae68a2
|
CC-5036: Add back edit show instance functionality
|
2013-04-01 14:42:35 -04:00 |
|
denise
|
1eba09fc4c
|
Show linking
|
2013-03-28 16:19:05 -04:00 |
|
denise
|
d0691b114c
|
Show linking
|
2013-03-28 14:25:40 -04:00 |
|
denise
|
731b86b36c
|
Added back editing a repeating show instance feature
|
2013-03-27 16:25:39 -04:00 |
|
denise
|
e259639d1a
|
Removed scheduleController private variable, currentUser
Removed showService private variable, currentUser
|
2013-03-27 09:02:49 -04:00 |
|
Daniel James
|
254dbafd1b
|
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
|
2013-03-27 12:34:14 +00:00 |
|
Daniel James
|
3323029507
|
Prompt user to run airtime-install script with -d option for custom Apache setups
|
2013-03-27 12:33:47 +00:00 |
|
Martin Konecny
|
ee617c8a70
|
Merge branch '2.3.x' into devel
Conflicts:
airtime_mvc/application/controllers/UserController.php
|
2013-03-26 16:34:11 -04:00 |
|
Martin Konecny
|
d9646994e9
|
remove airtime-demo specific code
|
2013-03-26 16:33:14 -04:00 |
|
Martin Konecny
|
5dc0a4477b
|
disable deletion of users
|
2013-03-26 16:10:42 -04:00 |
|
denise
|
418bf0b5ff
|
Created calendar service and moved the context menu creation there
|
2013-03-26 16:03:53 -04:00 |
|
Martin Konecny
|
6b57462ca1
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2013-03-26 15:02:30 -04:00 |
|
Martin Konecny
|
894887bd62
|
Merge branch '2.3.x' into devel
|
2013-03-26 15:02:17 -04:00 |
|
Martin Konecny
|
caa2413fd8
|
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
|
2013-03-26 15:02:08 -04:00 |
|
Martin Konecny
|
7237d48ef6
|
fix missing import
|
2013-03-26 15:01:53 -04:00 |
|
Martin Konecny
|
d79bfaaef9
|
-fix infinite loop on invalid files
|
2013-03-26 15:01:44 -04:00 |
|
Martin Konecny
|
5ab52b12c7
|
CC-4417:
Opus codec support
|
2013-03-26 15:00:41 -04:00 |
|
denise
|
230d1a6aa9
|
Fixed bug where shows weren't populating when moving forward in the calendar
|
2013-03-26 10:33:06 -04:00 |
|
denise
|
ef8f87df5d
|
Show linking
|
2013-03-25 16:28:53 -04:00 |
|
denise
|
5b69761833
|
CC-4961: Show linking
Populate repeat show form correctly when a show is repeating monthly
on the same day of the week
|
2013-03-25 13:48:11 -04:00 |
|
Martin Konecny
|
7779cde824
|
Merge branch '2.3.x' into devel
|
2013-03-24 23:12:10 -04:00 |
|
Martin Konecny
|
265ac49f2e
|
remove duplicate cc_config
|
2013-03-24 23:11:55 -04:00 |
|
Martin Konecny
|
38f8a0d231
|
more robust handling if system permissions go wrong
|
2013-03-24 22:58:13 -04:00 |
|
Martin Konecny
|
1c49320d95
|
Merge branch '2.3.x' into devel
|
2013-03-24 22:26:01 -04:00 |
|
Martin Konecny
|
89983bd4f8
|
remove unnecessary file delete
|
2013-03-24 22:25:38 -04:00 |
|
Martin Konecny
|
b1160afeab
|
cleanup
|
2013-03-22 18:05:49 -04:00 |
|
Martin Konecny
|
d12f793578
|
remove potential password change exploit in airtime-demo
|
2013-03-22 18:05:34 -04:00 |
|
denise
|
327d0dd6c9
|
CC-4961: Show linking
Add front-end for creating a show with monthly repeats on same day of week
|
2013-03-22 15:57:15 -04:00 |
|