Commit graph

9466 commits

Author SHA1 Message Date
Rudi Grinberg
67483f8bb2 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 17:01:45 -04:00
Rudi Grinberg
81dadb7f85 Removed annoying logging 2012-09-14 17:01:35 -04:00
Martin Konecny
4ea3d86121 remove unnecessary logging 2012-09-14 16:58:42 -04:00
Martin Konecny
39903be69a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 16:51:48 -04:00
Martin Konecny
c84a608747 CC-4438: Station Time is always UTC time no matter what the time zone setting is
-fixed
2012-09-14 16:51:39 -04:00
Martin Konecny
3ced92db7a CC-4415: Smart Block audio preview doesn't work 2012-09-14 16:51:14 -04:00
Rudi Grinberg
ec3e0a9b9f Added todo 2012-09-14 16:50:28 -04:00
Rudi Grinberg
29909f0bd9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 16:49:37 -04:00
Rudi Grinberg
bf651a96aa cc-4431: Fixed isUserType 2012-09-14 16:47:55 -04:00
denise
ee98c8fba5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 16:38:33 -04:00
denise
8ffaaaef25 -skip playable test if item is a smart block 2012-09-14 16:38:26 -04:00
Rudi Grinberg
b61abe2474 Hard coded mime for wav 2012-09-14 16:19:34 -04:00
Rudi Grinberg
ba08355c38 quick fix 2012-09-14 16:16:52 -04:00
Rudi Grinberg
76ba4bb6f0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 16:03:03 -04:00
denise
4201176b3a -small UI change 2012-09-14 15:59:34 -04:00
denise
da107f5120 -small UI fix 2012-09-14 15:55:55 -04:00
denise
0524e4e5d2 -implemented UI changes for playlist/block/webstream builder 2012-09-14 15:49:39 -04:00
Rudi Grinberg
05916a4d26 Code cleanup 2012-09-14 15:13:08 -04:00
Martin Konecny
198d15adc8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 14:53:32 -04:00
Martin Konecny
78460703a2 CC-4434: Make Application_Model_Preference::getValue and setValue private methods
-done
2012-09-14 14:53:25 -04:00
Rudi Grinberg
79ce7b572c cc-4202: Fixed 2012-09-14 14:51:50 -04:00
Martin Konecny
6e239d08e9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 14:43:15 -04:00
Rudi Grinberg
d0d9c5ecfc Refactored hack 2012-09-14 14:39:37 -04:00
Martin Konecny
239a228175 CC-4434: Make Application_Model_Preference::getValue and setValue private methods
-small fix
2012-09-14 14:36:31 -04:00
Rudi Grinberg
40bd5a0989 Changed xxx-owner_id.mp3 to owner_id/xxx.mp3 2012-09-14 14:27:04 -04:00
Rudi Grinberg
6c759ea06c Fixed a few typos 2012-09-14 12:57:32 -04:00
Rudi Grinberg
8a0c91fd44 Added moronic hack to barely support multi user file storage 2012-09-14 12:45:45 -04:00
Martin Konecny
e3c1a3ac0e CC-4434: Make Application_Model_Preference::getValue and setValue private methods
-initial commit
2012-09-14 12:09:40 -04:00
denise
d55d3a55cc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-14 12:09:02 -04:00
denise
c7f4ede766 -implemented UI changes for library page 2012-09-14 12:08:51 -04:00
Rudi Grinberg
53ec408249 Removed code duplication 2012-09-14 11:48:34 -04:00
Rudi Grinberg
7a46bdc4a2 Removed old comments 2012-09-14 11:23:21 -04:00
Rudi Grinberg
240881b8b4 Added TODO to shank md5 in code 2012-09-14 11:21:53 -04:00
denise
f581b0536e -fixed formatting 2012-09-14 11:18:13 -04:00
denise
bb38512bae -fixed formatting 2012-09-14 10:52:50 -04:00
Martin Konecny
cd530fc556 CC-4432: Change all database entries in database from audio/vorbis to audio/ogg on upgrade
-fixed
2012-09-13 19:53:56 -04:00
Rudi Grinberg
96f693687b cc-4426 2012-09-13 17:59:13 -04:00
Rudi Grinberg
d6ce1ec964 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 17:47:14 -04:00
Rudi Grinberg
6c75a086e1 cc-4421: Added for wav length 2012-09-13 17:47:04 -04:00
denise
97a0a82dc3 -renamed AIRTIME_DEV_README to AIRTIME_DEV_README_COLUMN_FILTER
-added new diff file for dataTables.ColVis.js
2012-09-13 17:19:08 -04:00
denise
c35c76351b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 17:11:10 -04:00
denise
8f48544bb7 -implemented UI changes for Now Playing page 2012-09-13 17:10:38 -04:00
James
d93fcec490 CC-4424: Clicking "edit" on playlist allows you to preview tracks that should be disabled
- fixed
2012-09-13 17:09:10 -04:00
James
43503475fd CC-4430: Block: Please don't count the removed files in when calculating how many files meet the criteria
- CRLF fix
2012-09-13 17:07:47 -04:00
James
d2f0b10552 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 17:05:56 -04:00
James
0b917f385e CC-4430: Block: Please don't count the removed files in when calculating how many files meet the criteria
- fixed
2012-09-13 17:05:40 -04:00
Rudi Grinberg
12e27e659a Extracted read_wave_duration out of code 2012-09-13 17:03:05 -04:00
Martin Konecny
fce060fc49 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 16:47:53 -04:00
Martin Konecny
3a0907b93b CC-4428: Make sure to remove *_datatable column on upgrade from cc_pref
-fixed
2012-09-13 16:47:45 -04:00
Rudi Grinberg
7586aa37f3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2012-09-13 16:28:54 -04:00