Commit graph

1783 commits

Author SHA1 Message Date
Martin Konecny
646e028037 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-11 10:47:14 -04:00
denise
4bed5e647e CC-84: Smart Playlists
-moved smart_playlistbuilder.js into playlist folder
2012-07-11 10:45:24 -04:00
denise
a1ceb4bfa0 CC-84: Smart Playlists
-added in 'Add' and 'Remove' form elements functionality on the UI
2012-07-11 10:42:51 -04:00
denise
b7cd90bc28 CC-84: Smart Playlists
-created form and view script
2012-07-11 10:42:51 -04:00
Martin Konecny
7ce4934cdc CC-4090: Make code style PSR compliant
-removed all trailing whitespace in forms directory
-replace all tabs with 4 spaces
2012-07-10 18:55:44 -04:00
Martin Konecny
d9cde230cd CC-4090: Make code style PSR compliant
-removed all trailing whitespace
2012-07-10 18:53:06 -04:00
Martin Konecny
ee3447f903 CC-4090: Make code style PSR compliant
-User.php
-removed all trailing whitespace
2012-07-10 18:51:32 -04:00
denise
4301a221b7 CC-84: Smart Playlists
-added in 'Add' and 'Remove' form elements functionality on the UI
2012-07-10 18:20:23 -04:00
James
24a90700a1 CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by
others on some situation.
2012-07-10 17:24:57 -04:00
James
f174a2bcf3 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 17:09:46 -04:00
James
39506740eb CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by
others on some situation.

- fixed
2012-07-10 17:09:21 -04:00
Martin Konecny
f072be5d0e Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 16:41:48 -04:00
Martin Konecny
6d98cca9c3 SAAS-270: Apache2 errors on SaaS
-no reason to pass $pl since it is not even used. Fixed
2012-07-10 16:41:30 -04:00
denise
72dd48e33e CC-84: Smart Playlists
-created form and view script
2012-07-10 15:25:29 -04:00
James
d90d83200e Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-07-10 15:12:27 -04:00
James
62b0fec595 CC-4095: Media Library -> Playlist: dj user can delete the playlist owned by
others on some situation.

- fixed
2012-07-10 15:11:59 -04:00
denise
69bbc53b98 CC-4037: Remove SaaS specific code from Airtime codebase
-removed live chat popup
2012-07-10 15:09:28 -04:00
Martin Konecny
3d243468a7 CC-4090: Make code style PSR compliant
Subjects.php
2012-07-10 10:36:53 -04:00
Martin Konecny
dc2b4fed0a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-10 10:19:35 -04:00
Martin Konecny
00a2a19833 CC-4090: Make code style PSR compliant
Subjects.php
2012-07-09 23:41:00 -04:00
Martin Konecny
e91c96b90e CC-4090: Make code style PSR compliant
StreamSetting.php
2012-07-09 23:32:21 -04:00
denise
6369c85ed1 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-09 14:50:49 -04:00
denise
c6c0a70152 CC-4075: Calendar -> Can create overlapping show by repeating show
-fixed
2012-07-09 14:50:35 -04:00
James
c279e008d0 Merge branch '2.1.x' into devel 2012-07-06 15:52:09 -04:00
James
63856ea918 CC-4079: Apache error: missing $startDt variable
- fixed
2012-07-06 15:40:16 -04:00
denise
e4fb42cbd0 CC-4027: In the Calendar view, please have a little play icon indicating the currently playing show.
-done
2012-07-06 15:26:51 -04:00
Martin Konecny
24349e64d8 CC-430: Audio normalization (Replaygain Support)
-some minor fixes for default value (should be 0 dB not 1dB)
2012-07-05 23:30:53 -04:00
Martin Konecny
5c1af49252 CC-430: Audio normalization (Replaygain Support)
-Added support on Liquidsoap side
2012-07-05 23:24:34 -04:00
Martin Konecny
ce698d4123 CC-430: Audio normalization (Replaygain Support)
-Added support on server side
2012-07-05 22:37:40 -04:00
James
9bc1c66fe3 CC-2747: If the file contains '\' in its meta title, airtime doesn't
detect duplicate

- fixed
- extra fix: there was also problem with web UI upload and it's fixed
see the comment on the ticket for more detail.
2012-07-05 15:27:49 -04:00
denise
1cbb0345b3 improved error message for overlapping shows 2012-07-05 11:33:03 -04:00
denise
4441bf18b7 CC-4072: Improve the check overlapping shows function
-done
2012-07-05 11:24:49 -04:00
denise
771974433b CC-4071: Prevent shows from overlapping on drag and drop in calendar
-done
2012-07-05 11:01:48 -04:00
denise
1fa3da5bd0 CC-4069: Edit Show -> cannot edit show
-fixed
2012-07-04 18:58:22 -04:00
denise
cbf026412c CC-4056: Add Show -> Prevent shows from overlapping
-done
2012-07-04 11:34:18 -04:00
denise
598bf8942c Merge branch '2.1.x' into devel 2012-07-03 14:57:16 -04:00
james
7342ea4d4b CC-4053: Widget not showing correct day on Sunday
- fixed weekly widget
- also fixed today's show widget
2012-07-03 13:17:48 -04:00
denise
3e75b28c9d Merge branch '2.1.x' into devel
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
2012-07-03 10:42:29 -04:00
denise
46604fdf59 CC-4046: Timeline -> cannot drag and drog song into the posion between song's name and "show empty"
-fixed
2012-06-29 16:59:03 -04:00
denise
7ea106e0d3 CC-4051: Library -> First character gets cut off of file name when downloading a track from a watched folder
-fixed
2012-06-29 16:02:27 -04:00
James
6d823d01ab CC-4042: Media Library -> Non-admin user cannot see "File import in progress"
- fixed
2012-06-29 12:49:59 -04:00
James
b425fbd894 CC-4045: Logging: add file name and line number on logging function
- done
2012-06-29 12:47:14 -04:00
denise
001f0790f9 Merge branch '2.1.x' into devel 2012-06-29 12:26:45 -04:00
denise
335dd1516b Merge branch '2.1.x' into devel
Conflicts:
	python_apps/pypo/liquidsoap_scripts/ls_script.liq
2012-06-29 10:57:14 -04:00
James
0b069c2f54 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-29 10:56:55 -04:00
James
a8792a7b97 CC-4042: Media Library -> Non-admin user cannot see "File import in progress"
- fixed. See the comment for more detail.
2012-06-29 10:55:19 -04:00
denise
38cb439f53 CC-4036: Timeline -> A new Cursor will be selected when there are 2 shows and we add/delete items in timeline view
-fixed
2012-06-28 17:55:17 -04:00
James
6c83633933 CC-4008: Inconsistent button labels for Play/Preview in Now Playing page
- changed everyting to "Preview"
2012-06-28 13:33:01 -04:00
James
d13ade977a CC-4034: Files on Watched folder shouldn't be deleted physically.
- fixed
2012-06-28 13:28:45 -04:00
james
443537b2db CC-4020: Apache error found: Undefined variable: switch_start
- fixed
2012-06-27 22:50:46 -04:00