Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
10016 commits 3 branches 0 tags 405 MiB
Commit graph

10016 commits

This branch
This branch
All branches
Author SHA1 Message Date
martin
70511746d0 Merge branch '2.2.x' into devel 
Conflicts:
	airtime_mvc/public/js/airtime/library/library.js
 2012-11-30 17:58:00 -05:00
Martin Konecny
7249e36081 -2.2.1 upgrade scripts 2012-11-27 12:13:16 -05:00
denise
3b124e6f5d CC-4668: Blocks/Playlists: Length includes deleted tracks 
-saving block length was including files that do not exist
 2012-11-26 15:05:27 -05:00
denise
ddb6289c87 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-23 16:54:39 -05:00
denise
04f6ae5c1a CC-4607: Library: Please make the 'Add x items' following mouse's point 
-fixed
 2012-11-23 16:53:51 -05:00
martin
735640d40b Merge branch 'lsof_quote_fix' of https://github.com/rgrinberg/Airtime into devel 2012-11-23 16:18:23 -05:00
martin
50bdeeef26 CC-4702: Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule 2012-11-23 16:00:10 -05:00
martin
5ba964c783 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-23 14:03:51 -05:00
martin
75adf9b6a1 CC-4701: same webstream played twice in a row does not work. 
-fixed
 2012-11-23 14:03:31 -05:00
Martin Konecny
9399b357ba bump generated snapshot version to 2.3 2012-11-22 17:09:08 -05:00
James
8d3024d42e api_client fix 2012-11-22 15:59:37 -05:00
James
da6013b523 CC-4717: Lintian warnings from devel branch 
- fixed
 2012-11-22 15:14:55 -05:00
James
87d0383533 CC-4703: Now Playing duration column ignores any cue point set 
- fixed
 2012-11-22 14:37:57 -05:00
Martin Konecny
612ac415d2 cc-4708: cue points not working 
-fixed
 2012-11-22 12:24:59 -05:00
Martin Konecny
2fa8f05c3c Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-22 11:40:55 -05:00
Martin Konecny
3a1945a818 CC-4702Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule 
-fixed
 2012-11-22 11:40:44 -05:00
James
acf2ffc9d5 CC-4707: Webstream: Preview for Webstream in Scheduler is forbidden 
- fixed
 2012-11-22 11:18:42 -05:00
Daniel James
a819b20f55 Moved Flot license information into LICENSE_3RD_PARTY and debian/copyright files 2012-11-22 15:37:08 +00:00
James
8483439551 CC-4709: 
Exception happens when DJ try to click a Webstream not belongs to himself

- fixed
 2012-11-22 10:29:40 -05:00
James
dcc9a192d1 Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-22 10:15:35 -05:00
james
8cc162f7a9 CC-4716: Cannot hear fade in & fade out 
- fixed
 2012-11-21 17:34:07 -05:00
Rudi Grinberg
1f5a5fd294 typo 2012-11-21 17:24:31 -05:00
Rudi Grinberg
0e91188939 made a unique toucher file 2012-11-21 17:22:32 -05:00
denise
2a4e4c6405 CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs. 
-fixed
 2012-11-21 14:17:46 -05:00
Rudi Grinberg
8c97995c2f Added vulnerability where strings would not be escaped when pass to shell command 2012-11-21 12:55:57 -05:00
Martin Konecny
8aa11f7e8c Better error message for api client constructor 2012-11-21 12:26:37 -05:00
denise
48253b8d14 CC-4710: Preferences -> Default Fade in/out: Cannot add songs into schedule if the default fade value is set to int value, for instance, 5 secs. 
-fixed
 2012-11-21 10:19:21 -05:00
James
4242fecd34 CC-4615: Now Playing page: Fail to get soundcloud file id in Schedule 
- fixed
 2012-11-20 18:03:13 -05:00
James
f246a09b1a CC-4662: Media Monitor: Unable to add watched folder because it's read only, by airtime-import command 
- fixed
 2012-11-20 17:35:18 -05:00
James
0870b1f018 CC-4697: airtime-import script fails silently on FLAC files 
- fixed
 2012-11-20 17:21:13 -05:00
Martin Konecny
9abd7fa431 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-20 16:48:17 -05:00
Rudi Grinberg
ac6a5a11bf docstring fixes 2012-11-20 16:41:45 -05:00
James
8d9fa1976e Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x 2012-11-20 16:39:04 -05:00
James
3c1f80de68 CC-4658: Smart Block: Unable to drag songs into block directly 
- fixed
 2012-11-20 16:38:43 -05:00
Martin Konecny
fe44d23b74 CC-4715: Better management of tracks that are shorter than they claim to be. 2012-11-20 16:31:27 -05:00
Rudi Grinberg
3a682aeada cc-4585: fixed + added logging 2012-11-20 15:25:41 -05:00
Rudi Grinberg
7124cbe04d fixed bug where hidden files would be shown in library 2012-11-20 15:18:41 -05:00
Rudi Grinberg
20855c73b5 refactoring + fix typo 2012-11-20 15:10:38 -05:00
James
d69faef560 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-11-20 15:05:20 -05:00
James
4737232b21 CC-2401: Shuffle option in playlists 
- add delayed removing of success message
 2012-11-20 15:05:09 -05:00
Rudi Grinberg
383244f962 changed implementation of timer thread because using threading.Timer does not allow us to properly inject 
the AirtimeInstance object.
 2012-11-20 14:44:58 -05:00
Rudi Grinberg
95e757a52c removed file mediator because it seems to be useless and incompatible with saas 2012-11-20 14:44:24 -05:00
Rudi Grinberg
58d888a59f Small refactoring to let user be assignable from any class that inherits from HasUser 2012-11-20 14:43:48 -05:00
Rudi Grinberg
58662b42be fixed typo missing self 2012-11-20 12:11:31 -05:00
Martin Konecny
fed39077c0 Merge branch '2.2.x' into devel 2012-11-20 11:21:29 -05:00
Rudi Grinberg
c1959f936e added TODO + formatting 2012-11-19 20:16:06 -05:00
Rudi Grinberg
fdf8c9fb4e refactored EventRegistry to play nice with saas. 2012-11-19 20:13:19 -05:00
Rudi Grinberg
ebca3fa9f5 refactored file mediator to play nice with saas 2012-11-19 20:13:00 -05:00
Rudi Grinberg
8696571b02 refactor owner to be saas friendly 2012-11-19 19:57:33 -05:00
Martin Konecny
9c612d17a3 CC-4694: Apache/Zend error only specific to some users 2012-11-19 18:41:31 -05:00