Commit graph

722 commits

Author SHA1 Message Date
James
f160ded6bc CC-2993: Playlist Builder: add "View on SoundCloud" option on the menu
- fixed
- extra fix: handles the case when username or password is empty
2011-10-22 11:34:04 -04:00
Yuchen Wang
d9186a3bf2 CC-2951: Allow users to select the starting day of the week
Added system preference in Preference page for user to select the start day of a week
(defaults to Sunday).

Calendar will utilize this information and update the calendar UI accordingly.
2011-10-19 12:42:22 -04:00
Yuchen Wang
d2fe46baf0 CC-2436: Save pulldown settings
For week and day views under Calendar page, save the change to pref db table when
user updates the interval dropdown. Same thing goes for the "show XXX entries"
dropdown found under Playlist Builder page.

When visiting these pages, we retrieves the entry from database for current user
and use those values. Defaults to 30m for interval and 10 entries for "show xxx entries"
if values were never set.
2011-10-18 10:10:35 -04:00
Martin Konecny
959a239118 Merge branch '1.9.1' into devel 2011-10-17 13:36:40 +02:00
Martin Konecny
7548abc1b1 -fix undefined function error 2011-10-17 13:36:16 +02:00
Martin Konecny
74e8abe820 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-15 00:27:34 +02:00
Yuchen Wang
8b2a23b88a CC2646: Set a calendar view default (Day/week/month) that's remembered
Updated the calendar page so that when user chooses a different time scale to display(day/week/month),
the new setting is stored in the pref database. Each user id has its own entry in the database.

When visiting the calendar, we retrieves the entry from database for current user
and show that time scale; defaults to monthly view if no entry found.
2011-10-14 14:17:06 -04:00
Martin Konecny
ca2a535b24 CC-2908: Add "Live Stream" title to live stream popup window
-fixed logo size being too big.
2011-10-14 14:25:28 +02:00
Martin Konecny
5a83c5b81e Merge branch '1.9.1' into devel
Conflicts:
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Schedule.php
	airtime_mvc/application/models/StoredFile.php
2011-10-14 01:38:52 +02:00
Martin Konecny
f1864e79d8 CC-2973: Api key is being used for downloads in the "Show Content" window + "Playlist Builder" page.
-fixed
2011-10-14 00:12:33 +02:00
Martin Konecny
d8bcb3f03d CC-2972: Find better way to determine domain which pypo should download from.
-Done
2011-10-14 00:07:53 +02:00
Martin Konecny
33d33a19d8 Merge branch '1.9.1' into devel 2011-10-13 23:37:04 +02:00
Martin Konecny
38f2290214 CC-2972: Find better way to determine domain which pypo should download from.
-remove basePort and baseUrl from code + config file, since it isn't used anywhere.
2011-10-13 23:35:18 +02:00
james
faba5aec57 CC-2745: Show status of liquidsoap/icecast connection on
Stream Settings page

- commit w/o design
2011-10-13 14:22:28 -04:00
Martin Konecny
3fee646e35 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-12 14:45:20 +02:00
Martin Konecny
24e208d1d6 CC-2438: Add a button to listen to the stream immediately
-but is now available. Need to ask Vladimir to position it under the "On-Air"
2011-10-12 14:26:18 +02:00
James
e16c8f3411 CC-2945: Change "Storage Folder" to "Import Folder"
- fixed
2011-10-11 17:29:49 -04:00
James
600c480ac3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-11 17:27:12 -04:00
James
701094b743 CC-2946: "Record" should be renamed to "Record from Line In"
- fixed
2011-10-11 17:26:56 -04:00
Yuchen Wang
45aa38111c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-11 16:48:56 -04:00
Yuchen Wang
37e4fac560 CC-2387: Changing admin password requires entering first / last name
Entering first and last name is no longer required when changing password.
2011-10-11 16:47:53 -04:00
James
20e9002310 CC-2956: Undefined variable: endDateTime in
/usr/share/airtime/application/models/Show.php on line 807,
referer: http://localhost/Schedule

- fixed
2011-10-11 16:36:01 -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
d3833f9a32 CC-2745: Show status of liquidsoap/icecast connection on Stream Settings
page

- initial commit
2011-10-10 20:14:27 -04:00
James
1059cee80c CC-2922: Manage media folders text
- done
2011-10-06 15:39:42 -04:00
James
04bcd47a31 CC-2936: Soundcloud: handle the case where the soundcloud server
is not responsive

- fixed
2011-10-05 17:48:25 -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
James
75f57fc18c CC-2933: Add From When: Create custom decorator(phtml) for
the section

- done
2011-10-05 12:22:54 -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
3f495e7532 CC-2795: Give option to set download flag of recorded shows uploaded
to Soundcloud by default

- changed function name
- changed database flag name
2011-10-04 17:38:21 -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
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
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
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
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
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
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
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