Commit graph

705 commits

Author SHA1 Message Date
Rudi Grinberg
47893865cc cc-4105: clean up url construction in api client 2012-07-13 16:32:17 -04:00
James
ae9442d7f5 CC-84: Smart Playlists
- editing playlist
2012-07-13 15:58:23 -04:00
Rudi Grinberg
3b708fae6a fixed typo 2012-07-13 14:54:04 -04:00
Rudi Grinberg
a6d51bea8d created a new controller action for chunked requests from media monitor 2012-07-13 14:51:43 -04:00
James
bf46605ea1 CC-84: Smart Playlists
- changing field name in backend
- diabled loading criteria on edit temporarly
2012-07-13 14:32:05 -04:00
James
207582eb7e CC-84: Smart Playlists
- temp commit
2012-07-13 14:23:30 -04:00
James
3bce6b4999 CC-84: Smart Playlists
- db inserting into cc_playlistcriteria
- error validations
2012-07-12 17:58:44 -04:00
Martin Konecny
f0f033b4fb CC-430: Audio normalization (Replaygain Support) 2012-07-12 17:58:29 -04:00
James
f0134ba3fa CC-84: Smart Playlists
- validation on server side
- getting list of files from db which satisfies criteria
2012-07-12 15:27:51 -04:00
Martin Konecny
8f6d6058a2 CC-4100: Make number of shows displayed in widget customizable
-removed Logging message
2012-07-11 19:33:19 -04:00
Martin Konecny
bd51b4db02 CC-4100: Make number of shows displayed in widget customizable
-fixed
2012-07-11 19:31:24 -04:00
James
93b34bb079 CC-84: Smart Playlists
- controller skeleton
- playlist model dummy functions
2012-07-11 16:14:11 -04:00
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
b7cd90bc28 CC-84: Smart Playlists
-created form and view script
2012-07-11 10:42:51 -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
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
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
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
e91c96b90e CC-4090: Make code style PSR compliant
StreamSetting.php
2012-07-09 23:32:21 -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
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
1fa3da5bd0 CC-4069: Edit Show -> cannot edit show
-fixed
2012-07-04 18:58:22 -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
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
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
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
denise
8141dec3b5 CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
-added comment
2012-06-27 15:13:03 -04:00
denise
d5a5bdd310 CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
-added comment
2012-06-27 14:57:47 -04:00
denise
bdaa64d4d1 CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
-fixed (originally scheduled for 2.2 - adding for 2.1.3)
2012-06-27 13:13:07 -04:00
denise
1300593e8b CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
-fixed
2012-06-27 13:03:22 -04:00
James
c669d3cb47 CC-3969: Reset Password: specifying wrong e-mail keeps you on the same page
without possibility to navigate back gracefully

- done
2012-06-20 18:02:46 -04:00
denise
186b8ef1c2 CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
-fixed
2012-06-15 16:48:51 -04:00
denise
b0e93005e5 Merge branch '2.1.x' into devel 2012-06-15 15:04:18 -04:00
denise
87faf47c94 Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x 2012-06-15 14:42:37 -04:00
denise
d02607ed94 CC-3561: Add button to automatically rescan watched folders.
-done
2012-06-15 12:16:19 -04:00
James
73a7a76078 Merge branch 'CC-3963' into 2.1.x
Conflicts:
	airtime_mvc/public/js/airtime/preferences/streamsetting.js
2012-06-14 16:06:53 -04:00
denise
70bfe031ef Merge branch '2.1.x' into devel
Conflicts:
	airtime_mvc/application/models/Email.php
2012-06-14 15:30:33 -04:00
denise
295a8ea5fe CC-3561: Add button to automatically rescan watched folders.
-done
2012-06-14 13:44:56 -04:00
denise
f433fd89fe CC-3970: Password Reset: No UI error msg for no mail server founded
-done
2012-06-13 16:04:57 -04:00
James
b07b83f740 CC-3981: Record Show: Change streams settings during recording will
cause record fail

- added warning message
2012-06-13 14:44:38 -04:00