Commit graph

1314 commits

Author SHA1 Message Date
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
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
denise
ab10ae68a2 CC-5036: Add back edit show instance functionality 2013-04-01 14:42:35 -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
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
6766d208aa CC-4961: Show linking
Removed logic out of edit-show action
Created new SchedulerService
Fixed overlapping show bug
2013-03-21 16:31:05 -04:00
denise
a7601d290f CC-4961: Show linking
Refactored services
Removed ShowDaysService and ShowInstanceService
Combined all show actions into one ShowService
2013-03-21 10:05:11 -04:00
denise
bae9f1202a CC-4961: Show linking
Removed unused schedule controller actions
Fix bug where changing a show to repeat deletes the original show's content
2013-03-19 10:09:28 -04:00
denise
896e03d76b CC-4961: Show linking
Refactoring all services thus far
2013-03-15 16:56:22 -04:00
denise
c721b81a13 CC-4961: Show linking
Refactoring
2013-03-12 10:30:31 -04:00
denise
7347be35b1 Created a new service for show days
Created a new user service
Started refactoring edit show action
2013-03-11 16:18:40 -04:00
denise
1cc823ef0e Inital edit show reconfiguration changes 2013-03-08 17:10:35 -05:00
denise
116d98a81b Removed comment 2013-03-08 16:10:07 -05:00
denise
d8ced29dd0 Refactored adding show forms to the view 2013-03-08 16:08:43 -05:00
Martin Konecny
5ceeb88899 Merge branch '2.3.x' into devel 2013-03-06 13:46:01 -05:00
Martin Konecny
7ca178295f CC-4993: airtime-check-system reports airtime-liquidsoap as down
-fixed
2013-03-06 13:43:22 -05:00
denise
99c07272fd - Moved all form validation to it's own function in schedule service
- Moved show creation to it's own function in schedule service
2013-03-06 09:58:35 -05:00
drigato
bdab294fce Added comments to Schedule Service 2013-03-06 09:58:35 -05:00
denise
d08f6cf3e1 CC-4961: Show linking
-initial schedule service experimentation
2013-03-06 09:58:35 -05:00
Martin Konecny
cc69418215 Merge branch '2.3.x' into devel 2013-03-05 16:21:22 -05:00
Martin Konecny
ae503121d8 CC-4984: Exception for replaygain
-fixed
2013-02-28 18:26:15 -05:00
Martin Konecny
e08732fba7 CC-4975: airtime-silan cmd error
-fixed
2013-02-25 19:45:26 -05:00
denise
9113853e41 Removed logging messages from Library controller, index action 2013-02-19 11:51:26 -05:00
denise
c0c6ac5d75 CC-4954: Please make Library page remember the status per user
- it was only working if there was a playlist object set
- fixed so it works even if there isnt
2013-02-19 11:37:22 -05:00
denise
14f1d5572f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2013-02-19 10:59:03 -05:00
denise
d1301ff676 CC-4954: Please make Library page remember the status per user
-done
2013-02-19 10:58:48 -05:00
Naomi
542553bbc1 Merge branch '2.3.x' into devel 2013-02-15 17:05:36 -05:00
Naomi
f2773fcb01 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-15 16:32:43 -05:00
Naomi
fe611e7c6a CC-4957 : Replay Gain undefined error, json response not being sent back properly. 2013-02-15 16:32:05 -05:00
denise
ec159131a8 Merge branch '2.3.x' into devel 2013-02-13 16:09:53 -05:00
denise
04ed640756 CC-3885: Deleted open playlist is not closed until a new item is added to it
-fixed
2013-02-13 15:44:52 -05:00
denise
76cb04e296 CC-4538: Cannot edit title or change time of repeating show if first instance has ended
- fixed by populating the edit show form with the next repeating show that is not in the past
2013-02-13 11:55:27 -05:00
denise
4ff1e8e78a CC-4932: Library -> Update Scheduled column on 'Cancel current show' action
-fixed
2013-02-13 11:29:43 -05:00
denise
8124d096d0 Removed log message 2013-02-07 15:56:35 -05:00
denise
525b2dcb33 CC-4895: Remove all json die() statements from code
- removed json_encode
2013-02-07 15:41:47 -05:00
denise
ba4cb16171 CC-4925: Changing User permissions to a higher level ends up with show editing problems
-typo
2013-02-06 14:35:39 -05:00
denise
55970a4b20 CC-4925: Changing User permissions to a higher level ends up with show editing problems
- added check to ensure user is not an admin before assigning the 'dj-edit-show' action
2013-02-06 14:32:13 -05:00
denise
909f2c95c4 XSS exploit prevention - audio preview 2013-02-05 17:24:39 -05:00