7bc4151741
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-02-06 16:29:41 -05:00
3c0d7955b5
Merge branch 'devel' of https://github.com/sematuszewski/Airtime into devel
2013-02-06 16:29:34 -05:00
0ed5d18e95
CC-4920: Now Playling js error
...
-fixed
2013-02-06 13:25:48 -05:00
8db71eac52
CC-4914: Update is_scheduled after tracks play out
...
-done
2013-02-05 16:52:25 -05:00
cff865ef55
Polish locale update (full - 100%)
...
Polish locale full version.
2013-02-05 20:02:55 +01:00
2ac66e81b0
Polish locale update (full - 100%)
...
Contribution of radioaktywne.pl (Lucy Pałys & Marcin Tym-Czarnocki)
2013-02-03 20:44:20 +01:00
93ec4c001b
Merge branch '2.3.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/models/StoredFile.php
2013-02-02 21:07:34 -05:00
71b811348b
Merge branch '2.2.x' into 2.3.x
2013-02-02 20:59:47 -05:00
6c6953a5d8
Merge branch 'cc-4630-2' of https://github.com/rgrinberg/Airtime into 2.2.x
2013-02-02 20:59:23 -05:00
1f4cfa8f65
fix pypo not auto restarting
2013-02-02 08:50:44 -05:00
8309593a0f
CC-4904: Library -> Sort by status doesn't work
...
- added 2 columns to cc_files (is_scheduled, is_playlist)
- split library status column into two columns (scheduled, playlist)
- is_scheduled gets updated when a track plays out, or when a file gets added/removed from/to a show
- is_playlist gets updated when a file gets added/removed from/to a playlist/block, when a playlist/block gets deleted, or when a playlist/block's contents is cleared
2013-02-01 17:47:07 -05:00
384298f680
CC-4109: Playlist Builder: Add a button to remove all the items in the current editing playlist
2013-02-01 12:06:01 -05:00
149b744ba7
remove using self in a static method
2013-02-01 01:40:48 -05:00
0eb6b596ad
Polish locale update (not full - 75%)
2013-02-01 00:02:01 +01:00
f145ede01b
CC-4905: Unit tests for Pypo
...
-whitespace removal
2013-01-31 17:45:57 -05:00
d4e89df94e
CC-4895: Remove all json die() statements from code
2013-01-31 14:06:45 -05:00
0795ac3d96
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-01-31 12:33:20 -05:00
8adb4b259c
CC-4905: Unit tests for Pypo
2013-01-31 12:33:14 -05:00
3bc2876f27
CC-4903: Library -> Show/hide columns -> Status Column needs label
...
-fixed
2013-01-31 11:41:00 -05:00
e1c69ebca2
CC-4902: Library -> Status column does not update when you add a file to a show
...
-fixed
2013-01-31 11:28:54 -05:00
617e1049aa
fix changelog mistakes
2013-01-30 23:31:24 -05:00
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
cf2ed25bfb
CC-4900: Indicate in the library if a webstream is scheduled in the future or belongs to a playlist
...
-done
2013-01-30 16:53:59 -05:00
4f5d7869d8
Removed html from Library/contents-feed and StoredFile model
...
Added new Library column to indicate if a file is scheduled in the future or belongs to a playlist/smart block
2013-01-30 15:38:25 -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
7238790c41
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-01-30 11:51:35 -05:00
595429e6e5
CC-4897: XSS exploit on library page
...
-fixed
2013-01-30 11:51:27 -05:00
e459f739f2
indentation error fix
2013-01-30 11:29:28 -05:00
2a0cc9e45f
fix indentation
2013-01-30 11:23:20 -05:00
043fbd1dfb
CC-4886: Warn if track is part of a playlist when deleting from library.
...
-done
2013-01-30 10:55:24 -05:00
694c54f272
Merge branch 'cc-4887-show-whether-track-is-scheduled-in-the-future-on-Library-page' into devel
2013-01-30 10:35:29 -05:00
9d99b8ae90
CC-4887: Show whether track is scheduled in the future on Library page
2013-01-30 10:33:26 -05:00
d4742577c9
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-01-30 10:20:27 -05:00
c45440482a
CC-4887: Show whether track is scheduled in the future on Library page
2013-01-30 08:57:59 -05:00
b15c4569eb
CC-4894: Need to filter output for potential XSS exploits
...
-fixed few areas
2013-01-29 15:17:29 -05:00
9d4e0d2dd1
Merge branch 'martin' into 2.3.x
2013-01-29 12:17:36 -05:00
28c01760dd
be more gentle to Liquidsoap when sending lots of commands
2013-01-29 12:17:05 -05:00
db4e6bb94a
CC-4889: API client URL request is not wrapping in try/catch
...
-fixed
2013-01-29 10:29:29 -05:00
9d8a9faca8
make code formatting easier on eyes
2013-01-28 17:00:35 -05:00
d7358338f0
improved logging in pypo fetch
2013-01-28 17:00:16 -05:00
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
f1215c10fd
CC-4882: Scheduled item does not take into account cue_out - cue_in time
...
-fixed
2013-01-28 14:21:11 -05:00
b389e44001
take liquidsoap by the horns if it misbehaves.
2013-01-27 15:00:56 -05:00
c93b90cc54
prepare for improvements to way pypo communicates with LS
2013-01-26 20:05:31 -05:00
2ef8604c31
remove unnecessary code
2013-01-25 16:23:12 -05:00
807aa6b4a6
fix restart liquidsoap being sent as default no arguments for pypo-notify
2013-01-25 15:14:40 -05:00
f02e0b6cab
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-01-25 14:17:07 -05:00
8dd7ffee8c
locks should occur inside try/catch
2013-01-25 14:16:53 -05:00
Martin Konecny
denise
Sebastian Matuszewski
Marcin Tym-Czarnocki
drigato