Commit Graph

5420 Commits

Author SHA1 Message Date
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 929e29182b CC-2908: Add "Live Stream" title to live stream popup window
-custom logo
2011-10-04 17:18:36 -04:00
martin 7dd14efe27 CC-2750: Ability to query health status for pypo,
liquidsoap, media monitor, and recorder
2011-10-04 15:49:02 -04:00
martin 0af749dd20 CC-2806: Create upgrade template file
-minor tweaks
2011-10-04 15:40:58 -04:00
martin d54066fca8 -undo weird automerge by git. 2011-10-04 14:11:20 -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 b682c2cd10 CC-2902: Broken link in interface: "Click the box below to advertise
your station on Sourcefabric.org"

- fixed
2011-10-04 12:04:09 -04:00
James fed9c62b43 CC-2917: Adding show, when inputting time and specifying a bogus
time (like 55555), then Nan-Nan-Nan shows up(possibly when tabbing)

- adding info about the meioMask in LICENSE_3RD_PARTY
2011-10-04 11:38:20 -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
martin ed8cdc7db3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-03 23:13:44 -04:00
martin 8adecdcd10 -add colors to airtime-check-system 2011-10-03 23:13:36 -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 d4063a8234 CC-2873: Soundcloud plugin doesn't log any error when there is an
error with soundcloud uploading through api controller

- changed constant name to 'SOUNDCLOUD_NOT_UPLOADED_YET'
2011-10-03 17:38:57 -04:00
James 7f2acb072b CC-2895: Manage Media Folder: Title disappears after adding watched
folder

- fixed
2011-10-03 17:35:43 -04:00
James 7648c8e318 CC-2917: Adding show, when inputting time and specifying a bogus time
(like 55555), then Nan-Nan-Nan shows up(possibly when tabbing)

- minified js file
2011-10-03 17:22:29 -04:00
James ec42876266 CC-2901: Uninstall script should remove 'distribute' tarball if it was
installed previously

- fixed
2011-10-03 17:11:16 -04:00
James 64a46294c9 CC-2910: Ability to collapse stream sections in "Stream Settings"
- done
- only stream 1 is expanded by default
2011-10-03 17:00:39 -04:00
James e2ff0a6a94 CC-2920: Playlist: soundcloud icon appears multiple time when
click on reupload to soundcloud

- fixed
2011-10-03 16:50:50 -04:00
James 0e29dfa617 CC-2917: Adding show, when inputting time and specifying a bogus
time (like 55555), then Nan-Nan-Nan shows up(possibly when tabbing)

- fixed by implementing masking on the fields
- used meioMask jquery plugin
2011-10-03 16:43:32 -04:00
James 79519e25c2 CC-2875: Soundcloud error icon
- fixed
2011-10-03 15:48:43 -04:00
James aebcfb9450 CC-2905: Add indentation on checkboxes on SoundCloud setting
- fixed
2011-10-03 15:35:31 -04:00
James 441b983665 CC-2748: Make Airtime look good in IE
- fixed
2011-10-03 15:27:10 -04:00
James 3ac50b0183 CC-2904: Space missing between two boxes on "Playlist Builder"
- fixed
- extra change: bug on flag name change
2011-10-03 15:25:55 -04:00
James 1d172ca630 CC-2904: Space missing between two boxes on "Playlist Builder"
- fixed
2011-10-03 14:26:10 -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
James 83e8a610df Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-03 14:13:15 -04:00
James 4f11428b60 CC-2920: Playlist: soundcloud icon appears multiple time when
click on reupload to soundcloud

- fixed
2011-10-03 14:13:02 -04:00
James 5e9aec93a8 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
2011-10-03 14:10:47 -04:00
martin 27892c8b46 CC-2906: Airtime Volume Control is invisible when turned on.
-fixed
2011-09-30 15:48:12 -04:00
martin 20c2405f20 CC-2907: Stream player window gets a 404 when clicked
from "Stream settings" page

-fixed
2011-09-30 14:46:09 -04:00
martin 1bdcff1119 CC-2750: Ability to query health status for pypo,
liquidsoap, media monitor, and recorder

-renamed CcComponent to CcServiceRegister
2011-09-30 14:08:15 -04:00
martin a31920e982 CC-2438: Add a button to listen to the stream immediately
-Streams selectable by their description
-Repeatedly clicking on the ON-AIR, focus()es the window
 instead of reloading it.
2011-09-30 12:58:49 -04:00
martin 0613c6db3a CC-2908: Add "Live Stream" title to live stream popup window
-done
2011-09-30 12:07:44 -04:00
martin 1bd9cf84ea CC-2806: Create upgrade template file
-done
2011-09-30 12:04:58 -04:00
martin c469f51eb3 CC-2908: Add "Live Stream" title to live stream popup window
-done
2011-09-30 11:45:51 -04:00
martin 41dee5d263 CC-2911: Error in /usr/lib/airtime/utils/phone_home_stat script
-fixed
2011-09-30 10:56:38 -04:00
martin 3c6692ebce CC-2806: Create upgrade template file
-missing function
-comment out redundant code
-Create cc_component table on upgrade
2011-09-29 19:00:32 -04:00
martin d93a9edcd2 CC-2806: Create upgrade template file
-missing function
-comment out redundant code
2011-09-29 18:39:24 -04:00
martin 421f543f99 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-09-29 18:19:08 -04:00
martin b9863e660e CC-2806: Create upgrade template file
-initial commit
2011-09-29 18:18:08 -04:00
Paul Baranowski 44481d2776 SAAS-41: Changed name of boolean value from disable-stream-conf to
enable-stream-conf for easier logic.
2011-09-29 18:11:22 -04:00
James 7e3d25eeaa CC-2795: Give option to set download flag of recorded shows
uploaded to Soundcloud by default

- done
2011-09-29 17:10:17 -04:00
James 8ef8dbc668 CC-2886: changing file name 2011-09-29 15:45:04 -04:00
James 38c19ed3a3 CC-2886: changing file name 2011-09-29 15:41:16 -04:00
James bf15b4cf0d Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1 2011-09-29 15:22:40 -04:00