Commit graph

7693 commits

Author SHA1 Message Date
denise
31bb07b4f0 CC-84: Smart Playlists
- removed modifier array list from form and populate in javascript
- fixed remove functionality to handle the extra criteria value used
  for 'is in the range' modifier
- moved 'add' button to last row
2012-07-12 13:02:02 -04:00
denise
e8a2f23856 CC-84: Smart Playlists
- dynamically change modifier list depending on criteria type
- added extra text box for 'is in the range' modifier
2012-07-11 18:53:28 -04:00
denise
c27b886817 CC-84: Smart Playlists
-0-indexed form elements
2012-07-11 16:15:44 -04:00
denise
4842f1a5a1 CC-84: Smart Playlists
-removed limit checkbox
2012-07-11 15:52:46 -04:00
denise
7358b00c81 CC-84: Smart Playlists
-disabled non-visible form elements
2012-07-11 15:18:47 -04:00
denise
5fb0364f2d CC-84: Smart Playlists
-switched action names for static/dynamic
2012-07-11 11:57:13 -04:00
denise
fe75ba0e93 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist 2012-07-11 11:50:52 -04:00
denise
1afe1e4d32 CC-84: Smart Playlists
-added in save/generate functionality in the UI
2012-07-11 11:50:40 -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
Martin Konecny
fb09149b26 Merge branch 'cc-84-smart-playlist' of dev.sourcefabric.org:airtime into cc-84-smart-playlist
Conflicts:
	airtime_mvc/application/controllers/PlaylistController.php
2012-07-11 10:46:47 -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
denise
72dd48e33e CC-84: Smart Playlists
-created form and view script
2012-07-10 15:25:29 -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
Rudi Grinberg
5b16a44455 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-09 16:31:16 -04:00
Rudi Grinberg
32c3e877a5 fix typo 2012-07-09 16:30:54 -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
dec68649c1 code cleanup
-changed module name to correct naming convention
-remove some unused imports
2012-07-06 10:20:44 -04:00
Martin Konecny
9612adf72e CC-430: Audio normalization (Replaygain Support)
-add required package dependencies on full install
2012-07-05 23:35: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
Martin Konecny
70a0dce26e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
	python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
2012-07-05 21:57:12 -04:00
Martin Konecny
a687e48d80 CC-430: Audio normalization (Replaygain Support)
-Added support on media-monitor's side
2012-07-05 21:54:44 -04:00
James
68089790ff Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-07-05 18:25:17 -04:00
James
31f1d5879e CC-4076: Library: make doubleclick trigger adding files to playlist/timeline
- done
2012-07-05 18:24:07 -04:00
James
f3fbaf89f5 CC-4076: Library: make doubleclick trigger adding files to playlist/timeline
- done
2012-07-05 18:23:34 -04:00
Rudi Grinberg
6fe48547d9 Make sure md['MDATA_KEY_FILEPATH'] is always normalized 2012-07-05 16:46:25 -04:00
Rudi Grinberg
e67be25b85 Fixed typo from copy pasting 2012-07-05 16:32:54 -04:00
Rudi Grinberg
38dbc28e1c get rid of pypo permissions since it now runs as root 2012-07-05 16:32:54 -04:00
Rudi Grinberg
5e9302d912 Removed unnecessary whitespace 2012-07-05 16:32:54 -04:00
Rudi Grinberg
7f4e6f98f5 fixed is_audio_file to handle extensionless files. made sure is_user_readable closes opened filehandle 2012-07-05 16:32:54 -04:00
Rudi Grinberg
1916ea8b0e Put duplicate code into mediamonitorcommon. Removed unnecessary blank lines 2012-07-05 16:32:54 -04:00
Rudi Grinberg
6c1af8a96e Changed uses of 'find' to respect supported_file_formats list 2012-07-05 16:32:54 -04:00
Rudi Grinberg
3dfb35d2d1 Fixed typo. Made supported_file_formats static because they should be same for all instances 2012-07-05 16:32:54 -04:00
Rudi Grinberg
2317a3eba8 removed more code duplication 2012-07-05 16:32:54 -04:00
Rudi Grinberg
5f1b2d23bf fixed code duplication and replaced manual path concatenation with os.path.join 2012-07-05 16:32:54 -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