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 |
denise
|
0171212e9b
|
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
|
2012-07-10 13:19:19 -04:00 |
denise
|
81eb751c9f
|
- shortened height on Add/Remove content dialog window
|
2012-07-10 13:19:03 -04:00 |
James
|
df5cc8aa38
|
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
|
2012-07-10 13:09:12 -04:00 |
James
|
78acd4f805
|
CC-4093: Timeline -> Alert for deleting track(s) appears twice by clicking
context menu
- fixed
|
2012-07-10 13:08:36 -04:00 |
Martin Konecny
|
2e5b1d9ca8
|
CC-4092: Not checking for return type "None" on some function calls in media-monitor
-fixed
|
2012-07-10 10:48:44 -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 |
Martin Konecny
|
aecee0574d
|
Random commits gathered and put into one
-since we had an accidental merge between devel and 2.1.x, I'm rounding
up these changes that need to be in 2.1.x and putting them here.
|
2012-07-09 18:58:22 -04:00 |
James
|
b7ca858506
|
CC-3921: Add mobile phone number field to user record
- added a line to upgrade.sql which takes care of db upgrade
|
2012-07-09 16:50:51 -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 |
Cliff
|
d8e0466721
|
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
|
2012-07-05 15:22:37 -04:00 |
Cliff
|
7f6828024f
|
add support for precise 64&32, and will change the filename to liquidsoap_*_amd64/i386
|
2012-07-05 15:15:27 -04:00 |
denise
|
1cbb0345b3
|
improved error message for overlapping shows
|
2012-07-05 11:33:03 -04:00 |