Commit Graph

4386 Commits

Author SHA1 Message Date
martin 61d80b4710 Merge branch '1.8.2' into devel 2011-06-06 20:11:11 -04:00
martin 97f297a6eb updated changed log for 1.8.2 RC3 2011-06-06 17:13:08 -04:00
james 80c17f6c38 Merge branch '1.8.2' of dev.sourcefabric.org:airtime into 1.8.2 2011-06-06 16:47:45 -04:00
james 93562d2319 CC-2362:Recorded show wrong file name
Fixed bug on sending wrong file name to soundcloud
2011-06-06 16:46:32 -04:00
martin c921348f36 cc-2364: past non-recorded shows have "upload to soundcloud" context menu option
-fixed
2011-06-06 15:15:47 -04:00
james ff031cde76 CC-2362:Recorded show wrong file name
- removed logging
2011-06-06 14:25:46 -04:00
james 4247f8c7a7 CC-2362:Recorded show wrong file name
- not finished yet. Temp commit
2011-06-06 14:10:12 -04:00
Naomi Aro c8219e3b97 Merge branch 'cc-2326-edit-show-end-date-problems' into 1.8.2 2011-06-06 20:06:24 +02:00
Naomi Aro 0f942d149d CC-2326 Edit a show (End Date problems)
not clearing options array.
2011-06-06 20:05:35 +02:00
Naomi Aro 02e259c0ea CC-2365 Shows from the past can be dragged into the future
adding a backend check if the show has started in the past.
2011-06-06 19:06:22 +02:00
martin 1de4777de3 cc-2362: upload to soundcloud with the wrong name after show rename.
-make sure to remove all rebroadcasts of recorded shows when editing.
2011-06-06 12:20:44 -04:00
Paul Baranowski 901206bd3a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-06-06 12:11:48 -04:00
martin ebf7dd0e0d Merge branch '1.8.2' of dev.sourcefabric.org:airtime into 1.8.2 2011-06-06 12:01:58 -04:00
martin d591858528 cc-2362: upload to soundcloud with the wrong name after show rename.
-changed so that recorded shows are not deleted by default
-changed static method to non-static.
2011-06-06 12:01:37 -04:00
Naomi Aro a370a4e812 Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' of dev.sourcefabric.org:airtime into cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention
Conflicts:
	python_apps/media-monitor/MediaMonitor.py
2011-06-06 11:36:47 +02:00
Naomi Aro 850701a9bb CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 2011-06-06 11:26:16 +02:00
Naomi Aro f27b58dda2 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
enabling uninstall of media monitor.
2011-06-06 11:26:16 +02:00
Naomi Aro c7198819aa CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
enabling media monitor changes.
2011-06-06 11:26:16 +02:00
Naomi Aro bd5e5be981 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
adding ability to drag music into stor folder.
2011-06-06 11:26:16 +02:00
Naomi c30eeaf5bd CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
searching database by filename to retrieve file.
Checking if is supported audio file/temp audio file.
2011-06-06 11:26:15 +02:00
Naomi 377f77dff4 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
naming convention in fallback order

stor/artist/album/track - title.ext
stor/artist/album/title.ext
stor/artist/album/originalfilename.ext
stor/artist/track - title.ext
stor/artist/title.ext
stor/artist/originalfilename.ext
stor/originalfilename.ext
2011-06-06 11:23:30 +02:00
Naomi Aro cb2ca87516 Merge branch 'cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention' of dev.sourcefabric.org:airtime into cc-1799-put-airtime-storage-into-a-human-readable-file-naming-convention
Conflicts:
	python_apps/media-monitor/MediaMonitor.py
2011-06-06 11:22:40 +02:00
Naomi Aro 7c65623477 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention 2011-06-06 11:06:34 +02:00
Naomi Aro b1d4b3442b CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
enabling uninstall of media monitor.
2011-06-06 10:56:50 +02:00
Naomi Aro f7e86100af CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
enabling media monitor changes.
2011-06-06 10:53:58 +02:00
Naomi Aro f271f31ad8 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
adding ability to drag music into stor folder.
2011-06-06 10:53:58 +02:00
Naomi 6dfad55b89 CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
searching database by filename to retrieve file.
Checking if is supported audio file/temp audio file.
2011-06-06 10:53:58 +02:00
Naomi efc8d0664c CC-1799 Put Airtime Storage into a Human Readable File Naming Convention
naming convention in fallback order

stor/artist/album/track - title.ext
stor/artist/album/title.ext
stor/artist/album/originalfilename.ext
stor/artist/track - title.ext
stor/artist/title.ext
stor/artist/originalfilename.ext
stor/originalfilename.ext
2011-06-06 10:53:57 +02:00
Naomi Aro 1f045c8c7b CC-2356 Default genre when uploading to Soundcloud doesn't work
somehow variable names must have changed.
2011-06-04 15:45:08 +02:00
Naomi Aro 27075ad369 CC-2356 Default genre when uploading to Soundcloud doesn't work
function call changed incorrectly.
2011-06-04 15:45:08 +02:00
martin f97cd4d635 -remove apache2 as a daemon start prerequisite since apache may be remote. 2011-06-03 17:40:58 -04:00
martin 1540e593e4 Merge branch '1.8.2' into devel
Conflicts:
	airtime_mvc/application/models/Dashboard.php
	python_apps/media-monitor/airtime-media-monitor-start
	python_apps/pypo/airtime-pypo-start
	python_apps/show-recorder/airtime-show-recorder-start
2011-06-03 17:29:55 -04:00
martin eee885f746 cc-2344: wrong song displayed
-removed unnecessary code.
2011-06-03 17:06:47 -04:00
martin e69f9497ed cc-2344: wrong song displayed
-fixed #2
2011-06-03 17:03:11 -04:00
martin c9c9ecf2cd cc-2344: wrong song displayed
-fixed
2011-06-03 16:36:13 -04:00
martin 19e52e81b5 cc-2351: updating a bi-weekly repeating show is incorrect
-fixed
2011-06-03 14:51:17 -04:00
martin e969baee1c cc-2359: record check box is disabled after update show
-fixed
2011-06-03 14:01:58 -04:00
martin f5b55ce52b -remove sudo requirement for airtime-check-system 2011-06-03 12:51:14 -04:00
martin 23d25ef5d7 cc-2055: switch to init.d
-updated log file locations in airtime-check-system
2011-06-03 11:49:50 -04:00
martin f6ae2aaa91 cc-2055: switch to init.d
-enabled media-monitor in the installs scripts.
2011-06-03 11:30:08 -04:00
Martin Konecny 7e0db3b76c cc-2055: switch to init.d
-fix recorder not starting after upgrade
2011-06-02 18:07:48 -04:00
Martin Konecny fffa9d4ffb cc-2055: switch to init.d
-better way to disable daemontool daemons.
2011-06-02 18:07:48 -04:00
martin 48e05e4b7f cc-2055: switch-to-init.d
-return proper return value when exception is raised in recorder.py
2011-06-02 18:07:48 -04:00
martin bfb5dc4e58 cc-2055: switch to init.d
-need to verify is pid from pid file actually is running
 (for airtime-check-system)
2011-06-02 18:07:48 -04:00
Martin Konecny 963351c6f2 cc-2055: switch-to-init.d
-fix error where python would quit inside an exception due to
 out of bounds array index
2011-06-02 18:07:48 -04:00
Martin Konecny 7d7dc223ce cc-2055: switch to init.d
-use full path of stop commands
2011-06-02 18:07:48 -04:00
martin e64c8da414 cc-2055: switch to init.d
-enable upgrade script
2011-06-02 18:07:48 -04:00
martin 49589c284d cc-2055: switch to init.d
-fix some upgrade script issues
2011-06-02 18:07:48 -04:00
martin d516b963e4 cc-2055: switch to init.d
-initial upgrade script
2011-06-02 18:07:48 -04:00
martin 4c9c86bf4f cc-2055: switch to init.d
-remove update-rc.d on uninstall
-remove unecessary imports in install/uninstall scripts
-all daemons now wait until apache2 is available before starting (LSB Init Script)
2011-06-02 18:07:48 -04:00