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 |
|
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 |
|
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
|
81dbb17922
|
CC-4961: Show linking
-moved show deletion into show service
|
2013-04-03 11:46:46 -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 |
|
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
|
894887bd62
|
Merge branch '2.3.x' into devel
|
2013-03-26 15:02:17 -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
|
265ac49f2e
|
remove duplicate cc_config
|
2013-03-24 23:11:55 -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 |