a061464ffb
Merge branch '2.3.x' into 2.3.x-saas
2013-04-04 15:14:04 -04:00
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
eb3fda8423
Merge branch '2.3.x' into 2.3.x-saas
2013-04-03 17:12:14 -04:00
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
863c2c11cc
Merge branch '2.3.x' into 2.3.x-saas
2013-03-26 16:34:28 -04:00
d9646994e9
remove airtime-demo specific code
2013-03-26 16:33:14 -04:00
5dc0a4477b
disable deletion of users
2013-03-26 16:10:42 -04:00
01cca88c58
Merge branch '2.3.x' into 2.3.x-saas
2013-03-26 15:02:43 -04:00
265ac49f2e
remove duplicate cc_config
2013-03-24 23:11:55 -04:00
43ffa2aece
Merge branch '2.3.x' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/SystemstatusController.php
2013-03-06 13:47:21 -05:00
7ca178295f
CC-4993: airtime-check-system reports airtime-liquidsoap as down
...
-fixed
2013-03-06 13:43:22 -05:00
1c80701488
Merge branch '2.3.x' into 2.3.x-saas
2013-03-05 16:21:47 -05:00
d7d1170ee1
CC-5003:
...
Some tracks are being cut off before fully playout out
-fixed
2013-03-04 18:52:51 -05:00
00d577fd5b
CC-4985: Ensure files deleted via the UI are deleted from stor directory.
...
-temporary fix. We know rabbitmq received the message, but we don't know
if media-monitor actually acted on it.
2013-03-04 15:22:09 -05:00
3f7ccf6967
fix missing closing parentheses
2013-03-04 11:41:42 -05:00
b744ab74ee
Merge branch '2.3.x' into 2.3.x-saas
2013-03-01 18:22:12 -05:00
ae503121d8
CC-4984: Exception for replaygain
...
-fixed
2013-02-28 18:26:15 -05:00
e08732fba7
CC-4975: airtime-silan cmd error
...
-fixed
2013-02-25 19:45:26 -05:00
8bec9dea55
Merge branch '2.3.x' into 2.3.x-saas
2013-02-20 14:41:55 -05:00
f2773fcb01
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-15 16:32:43 -05:00
fe611e7c6a
CC-4957 : Replay Gain undefined error, json response not being sent back properly.
2013-02-15 16:32:05 -05:00
2c1fa283da
CC-4941: Dynamic Smart Block ignores the silan check
...
-fixed for playlists that contain dynamic blocks
2013-02-11 14:17:18 -05:00
51ade73e85
CC-4941: Dynamic Smart Block ignores the silan check
...
-fixed
2013-02-11 13:45:51 -05:00
3c73535f70
Convert clip length seconds to interval format before inserting into cc_playlistcontents / cc_blockcontents
2013-02-11 12:37:20 -05:00
6071dea839
CC-4940: Playlist editor in Library ignores cue points set by silence detection when displaying item time
...
-small fix on where to set clip length
2013-02-11 12:32:20 -05:00
69054806c4
CC-4940: Playlist editor in Library ignores cue points set by silence detection when displaying item time
...
- fixed by setting length to cue_out - cue_in when tracks get added to playlist/block
2013-02-11 12:24:06 -05:00
e8bde50909
CC-4939: All webstreams in a playlist will have 0 length in Schedule
...
- set cuein and cueout of playlist item if it is a webstream
2013-02-11 11:17:00 -05:00
c39b99da6c
CC-4839: Nginx doesn't allow liquidsoap to check uploaded file, which blocks uploading any file
...
-fixed
2013-02-07 15:42:06 -05:00
ad334d9e74
CC-4926: System-> Preference: Please limit the default fade value less than 60
...
- added a range validator of 0 - 59.9 on default fade
2013-02-06 15:44:52 -05:00
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
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
8e82db1bc7
CC-4921: Now Playing: Cannot insert items into current playing show
...
-filler time in cc_schedule was not setting cue_in and cue_out
-since we made those colunns not null and removed a default value, we always have to set a value
2013-02-05 17:57:21 -05:00
909f2c95c4
XSS exploit prevention - audio preview
2013-02-05 17:24:39 -05:00
50bfcb7eb8
XSS exploit prevention
...
- Calendar -> show content
2013-02-05 15:37:00 -05:00
23c29455d9
Modified schema.xml - made cue_in and cue_out required columns in cc_scheuled and removed default values
2013-02-05 13:18:25 -05:00
63439c276d
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-05 10:56:54 -05:00
74bc485b4b
XSS exploit prevention
...
- Calendar - Show Contents
- Playlist tooltip in Library page
- Adding track to a show
- Widgets
- Playlist/Webstream title and description
- Smart block expansion
2013-02-05 10:56:38 -05:00
103ad6fe6d
CC-4909: php warning
...
-fixed
2013-02-04 16:32:03 -05:00
60d6f5585b
CC-4913: System -> Media Folder: Exception happens when media folder's path contains '<'
2013-02-04 16:27:09 -05:00
c398ce930b
Merge branch '2.3.x' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
2013-02-04 16:22:35 -05:00
e2472f1f5d
CC-4913: System -> Media Folder: Exception happens when media folder's path contains '<'
2013-02-04 16:21:56 -05:00
b45f71e8f9
CC-4897: XSS exploit on library page
2013-02-04 12:44:14 -05:00
20a3f674b4
CC-4897: XSS exploit on library page
...
-fixed where this was happening on Calendar - show content
2013-02-04 12:12:57 -05:00
d63865625d
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-04 11:06:53 -05:00
1f0b9fa5dc
CC-4897: XSS exploit on library page
2013-02-04 11:06:46 -05:00
0a198ae424
Merge branch '2.3.x' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/models/User.php
2013-01-30 18:31:45 -05:00
216b580395
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-01-30 14:40:47 -05:00
52d96241da
CC-4754: Replay gain modifier
...
-fix regression
2013-01-30 14:40:29 -05:00
cc5acf3c9e
improved logging for boolean vars
2013-01-30 14:34:06 -05:00
595429e6e5
CC-4897: XSS exploit on library page
...
-fixed
2013-01-30 11:51:27 -05:00
Martin Konecny
Naomi
denise