Commit graph

487 commits

Author SHA1 Message Date
Martin Konecny
c19b7f7c6e Merge branch '1.9.1' into devel
Conflicts:
	VERSION
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/models/MusicDir.php
	install_full/ubuntu/airtime-full-install
	install_minimal/include/airtime-upgrade.php
	python_apps/api_clients/api_client.py
	python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
2011-11-14 21:19:56 -05:00
Martin Konecny
7a9e53fa04 CC-3040: Debian Squeeze requires the Liquidsoap natty binary instead of the generic one
-done
2011-11-14 14:12:12 -05:00
Martin Konecny
c3429cbe2a CC-2952: Put in final Liquidsoap 1.0 binaries
-set binaries to executable
2011-11-14 13:08:26 -05:00
Martin Konecny
9270ff01a2 CC-2952: Put in final Liquidsoap 1.0 binaries
-Done
2011-11-10 23:55:15 -05:00
Martin Konecny
c2eae518c4 CC-2978: Install fails on Ubuntu 11.10
-fixed for oneiric version of rabbitmq
2011-11-10 14:42:46 -05:00
James
32743ca780 CC-3016: Import files doesn't work on Debian(1.9.5, 2.0)
- added extra comment
2011-11-09 13:36:08 -05:00
James
f2b3ef1b73 CC-3016: Import files doesn't work on Debian(1.9.5, 2.0)
- added extra comment
2011-11-09 13:35:22 -05:00
Martin Konecny
b33ced99c8 CC-2954: Exception in media monitor using Dropbox
-Need to check if size is >=2, not 3.
2011-11-03 22:12:03 -04:00
James
8e88c56bc6 CC-2954: Exception in media monitor using Dropbox
- This will take care of the exception issue
2011-11-03 16:05:52 -04:00
James
a156548ba6 CC-3016: Import files doesn't work on Debian(1.9.5, 2.0)
- adding comment
2011-11-03 15:35:30 -04:00
James
b75935abc3 CC-3016: Import files doesn't work on Debian(1.9.5, 2.0)
- adding comment
2011-11-03 15:35:04 -04:00
James
905eaa9ec8 CC-3016: Import files doesn't work on Debian(1.9.5, 2.0)
- fixed
2011-11-03 15:26:10 -04:00
James
a85f284296 CC-3016: Import files doesn't work on Debian(1.9.5, 2.0)
- fixed
2011-11-03 15:25:09 -04:00
Martin Konecny
4c5386c0f3 1.9.5 preparations 2011-11-02 15:19:27 -04:00
Martin Konecny
6291c67ace Merge branch '1.9.1' into devel 2011-11-02 10:39:00 -04:00
Martin Konecny
5d0f36f130 CC-3013: Media Monitor throws exception when trying to convert String to Int.
-fixed
-also specified base 10 radix
2011-11-02 10:36:00 -04:00
Martin Konecny
b14f2e894d CC-3012: Media-monitor crash: "Exception: list index out of range"
-fixed
2011-11-02 10:10:28 -04:00
Martin Konecny
38a0f8697a CC-2758: Make airtime-install script Debian/Ubuntu compatible
-cleanup
2011-11-01 22:43:12 -04:00
martin
f2ef006385 CC-2758: Make airtime-install script Debian/Ubuntu compatible
-cosmetic changes
2011-11-01 15:21:09 -04:00
Martin Konecny
fccaa554f5 CC-2758: Make airtime-install script Debian/Ubuntu compatible
-further tweaks
2011-10-28 17:24:38 -04:00
Martin Konecny
56edfe4e68 CC-2758: Make airtime-install script Debian/Ubuntu compatible
-uninstall script added
2011-10-28 12:35:58 -04:00
Martin Konecny
b25b0c7ea0 CC-2758: Make airtime-install script Debian/Ubuntu compatible
-rename old files
2011-10-27 16:16:36 -04:00
Martin Konecny
87970740a0 CC-2758: Make airtime-install script Debian/Ubuntu compatible
-install complete
2011-10-27 15:53:54 -04:00
Martin Konecny
cd0ff848fc Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-27 15:22:49 -04:00
Martin Konecny
cf4f151302 CC-2758: Make airtime-install script Debian/Ubuntu compatible
-fixes
2011-10-27 15:22:35 -04:00
James
83c0f7db9b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-27 14:37:57 -04:00
James
455f10f815 CC-2954: Exception in media monitor using Dropbox
- This will take care of the exception issue
2011-10-27 14:34:03 -04:00
Martin Konecny
7496d26032 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-27 14:02:15 -04:00
Martin Konecny
8cafc52cad CC-2758: Make airtime-install script Debian/Ubuntu compatible
-initial commit
2011-10-27 14:01:59 -04:00
james
cdcc8ee5ad CC-2935: Upgrade: delete virtualenv dir and reinstall virtualenv
- done
- we reinstall virtualenv on anycase, so we don't need virtualenv-check
2011-10-26 10:41:21 -04:00
James
efbd2f53d0 CC-2745: Show status of liquidsoap/icecast connection on Stream
Settings page

- temp commit
2011-10-11 14:40:30 -04:00
James
d8c6b722ac Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-11 10:00:39 -04:00
Martin Konecny
8fe10830d5 -fixed on-air light not working. 2011-10-11 13:36:07 +02:00
james
d3833f9a32 CC-2745: Show status of liquidsoap/icecast connection on Stream Settings
page

- initial commit
2011-10-10 20:14:27 -04:00
Martin Konecny
ffeeabc7c9 -need to install natty liquidsoap binary for oneiric 2011-10-09 02:29:16 -04:00
James
c35f77a9aa CC-2932: Recorder: When show is recorded, the file name is generated
with UTC time.

- fixed
- new pybundle is created with 'pytz' package
2011-10-05 17:27:00 -04:00
martin
8d5efd7752 -update liquidsoap to pre-release 1.0 version 2011-10-05 11:44:44 -04:00
James
b90b69ebde CC-2926: Clicking "Choose File" in support settings to upload image
defaults to "Audio/MPEG" type in Chrome

- fixed
- extra fix: removing debugging code from api_client.py
2011-10-05 11:21:13 -04:00
James
6e25ae5abf CC-2795: Give option to set download flag of recorded shows uploaded
to Soundcloud by default

- removed debugging code
2011-10-04 17:27:57 -04:00
James
973e934151 CC-2927: Media Monitor: if new dir is generated in the process of
importing a file, airtime doesn't import the file.

- fixed
2011-10-04 17:23:42 -04:00
James
2786d40db8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
	python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
2011-10-04 17:22:19 -04:00
James
d56a3ee9d6 CC-2927: Media Monitor: if new dir is generated in the process of
importing a file, airtime doesn't import the file.

- fixed
2011-10-04 17:20:22 -04:00
martin
cb3060623c Merge branch '1.9.1' into devel
Conflicts:
	airtime_mvc/application/controllers/LibraryController.php
	python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
2011-10-04 14:01:48 -04:00
martin
5190a0c24c Merge branch '1.9.1' into devel
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/MusicDir.php
	python_apps/media-monitor/airtimefilemonitor/airtimeprocessevent.py
2011-10-04 13:59:27 -04:00
martin
e80a9330f5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-04 13:50:16 -04:00
martin
b0f6f1e39b CC-2925: Airtime scripts broken with Liquidsoap 1.0 pre-release
-fixed
-also updated the liquidsoap library scripts
2011-10-04 13:50:03 -04:00
James
109bd5d044 CC-2919: Media Monitor: recorded show doesn't show on library after
recording is done

- comments were added
- timestamps updates with IN_MODIFY
2011-10-04 10:20:25 -04:00
James
8d21e4ea95 CC-2919: Media Monitor: recorded show doesn't show on library after
recording is done

- comments were added
- timestamps updates with IN_MODIFY
2011-10-04 10:19:44 -04:00
James
b4d4c54c31 CC-2795: Give option to set download flag of recorded shows uploaded
to Soundcloud by default

- fixed name of Soundcloud Model class
2011-10-03 18:02:01 -04:00
James
dcda08e17a CC-2919: Media Monitor: recorded show doesn't show on library after
recording is done

- fixed
- extra fix: Airtime wasn't updating file when updating metadata

Conflicts:

	airtime_mvc/application/controllers/LibraryController.php
2011-10-03 14:17:56 -04:00