Commit graph

10728 commits

Author SHA1 Message Date
denise
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
Martin Konecny
103ad6fe6d CC-4909: php warning
-fixed
2013-02-04 16:32:03 -05:00
Martin Konecny
60d6f5585b CC-4913: System -> Media Folder: Exception happens when media folder's path contains '<' 2013-02-04 16:27:09 -05:00
Martin Konecny
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
Martin Konecny
e2472f1f5d CC-4913: System -> Media Folder: Exception happens when media folder's path contains '<' 2013-02-04 16:21:56 -05:00
Martin Konecny
5ce86b33ef Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-04 16:06:05 -05:00
Martin Konecny
331386f74f CC-4910: Need to properly handle non-200 http status codes in api client
-fixed
2013-02-04 16:05:58 -05:00
denise
b45f71e8f9 CC-4897: XSS exploit on library page 2013-02-04 12:44:14 -05:00
denise
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
denise
d63865625d Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-02-04 11:06:53 -05:00
denise
1f0b9fa5dc CC-4897: XSS exploit on library page 2013-02-04 11:06:46 -05:00
Marcin Tym-Czarnocki
2ac66e81b0 Polish locale update (full - 100%)
Contribution of radioaktywne.pl (Lucy Pałys & Marcin Tym-Czarnocki)
2013-02-03 20:44:20 +01:00
Martin Konecny
34eee60bee CC-4910: Need to properly handle non-200 http status codes in api client
-wrap all service calls in exception
2013-02-03 00:40:41 -05:00
Martin Konecny
0ea7cca966 Merge branch '2.3.x' into 2.3.x-saas 2013-02-02 21:00:04 -05:00
Martin Konecny
71b811348b Merge branch '2.2.x' into 2.3.x 2013-02-02 20:59:47 -05:00
Martin Konecny
6c6953a5d8 Merge branch 'cc-4630-2' of https://github.com/rgrinberg/Airtime into 2.2.x 2013-02-02 20:59:23 -05:00
Martin Konecny
04a956217f Merge branch '2.3.x' into 2.3.x-saas 2013-02-02 08:51:06 -05:00
Martin Konecny
1f4cfa8f65 fix pypo not auto restarting 2013-02-02 08:50:44 -05:00
Martin Konecny
27ccefbf0f Merge branch '2.3.x' into 2.3.x-saas 2013-02-01 01:41:16 -05:00
Martin Konecny
149b744ba7 remove using self in a static method 2013-02-01 01:40:48 -05:00
Sebastian Matuszewski
0eb6b596ad Polish locale update (not full - 75%) 2013-02-01 00:02:01 +01:00
Martin Konecny
f145ede01b CC-4905: Unit tests for Pypo
-whitespace removal
2013-01-31 17:45:57 -05:00
Martin Konecny
2a36ecbebf simplification of saas only code 2013-01-31 16:34:10 -05:00
Martin Konecny
9053266a14 Merge branch '2.3.x' into 2.3.x-saas 2013-01-31 12:33:38 -05:00
Martin Konecny
0795ac3d96 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-31 12:33:20 -05:00
Martin Konecny
8adb4b259c CC-4905: Unit tests for Pypo 2013-01-31 12:33:14 -05:00
Martin Konecny
617e1049aa fix changelog mistakes 2013-01-30 23:31:24 -05:00
Martin Konecny
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
Martin Konecny
3553ebc2ee fix upgrade script so that cue out of files is not 00:00:00 by default 2013-01-30 18:21:46 -05:00
Martin Konecny
216b580395 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-30 14:40:47 -05:00
Martin Konecny
52d96241da CC-4754: Replay gain modifier
-fix regression
2013-01-30 14:40:29 -05:00
Martin Konecny
cc5acf3c9e improved logging for boolean vars 2013-01-30 14:34:06 -05:00
denise
7238790c41 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-30 11:51:35 -05:00
denise
595429e6e5 CC-4897: XSS exploit on library page
-fixed
2013-01-30 11:51:27 -05:00
Martin Konecny
e459f739f2 indentation error fix 2013-01-30 11:29:28 -05:00
Martin Konecny
2a0cc9e45f fix indentation 2013-01-30 11:23:20 -05:00
denise
d4742577c9 Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x 2013-01-30 10:20:27 -05:00
Martin Konecny
b15c4569eb CC-4894: Need to filter output for potential XSS exploits
-fixed few areas
2013-01-29 15:17:29 -05:00
Martin Konecny
9d4e0d2dd1 Merge branch 'martin' into 2.3.x 2013-01-29 12:17:36 -05:00
Martin Konecny
28c01760dd be more gentle to Liquidsoap when sending lots of commands 2013-01-29 12:17:05 -05:00
drigato
db4e6bb94a CC-4889: API client URL request is not wrapping in try/catch
-fixed
2013-01-29 10:29:29 -05:00
Martin Konecny
9d8a9faca8 make code formatting easier on eyes 2013-01-28 17:00:35 -05:00
Martin Konecny
d7358338f0 improved logging in pypo fetch 2013-01-28 17:00:16 -05:00
denise
5f3f2cd97c CC-4881: Cue in time can be greater than Cue out time in some situations
-fixed
2013-01-28 16:46:11 -05:00
denise
f1215c10fd CC-4882: Scheduled item does not take into account cue_out - cue_in time
-fixed
2013-01-28 14:21:11 -05:00
Martin Konecny
b389e44001 take liquidsoap by the horns if it misbehaves. 2013-01-27 15:00:56 -05:00
Martin Konecny
c93b90cc54 prepare for improvements to way pypo communicates with LS 2013-01-26 20:05:31 -05:00
Martin Konecny
d47469be25 read num bytes used from file instead of calculating manually 2013-01-25 16:36:57 -05:00
Martin Konecny
3d103aed0f fix merge conflict 2013-01-25 16:24:45 -05:00
Martin Konecny
2ef8604c31 remove unnecessary code 2013-01-25 16:23:12 -05:00