Commit Graph

5998 Commits

Author SHA1 Message Date
James f2bf92297a CC-2745: Show status of liquidsoap/icecast connection on Stream Settings page
- fixed a case where it was displaying "OK" when liquidsoap was not running
2011-10-23 06:29:06 -04:00
James fb8735588d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-22 11:34:43 -04:00
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 6237a199af CC-2968: Folder icons missing when choosing Import Folder
Changed the path to the img resource. Icon shows up fine now.
2011-10-19 14:01:51 -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 0989a1c13f CC-2073: Select Days checkboxes are confusing
Increased the space between a checkbox and the label to its right.
Should make it better to tell which checkbox belongs to which label.
2011-10-18 10:24:01 -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
Yuchen Wang 3e441dc72f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-17 14:25:07 -04:00
Yuchen Wang 8d3c6192d7 CC2646: Set a calendar view default (Day/week/month) that's remembered
In my last commit, left out the "var" keyword in a piece of code
2011-10-17 14:24:33 -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 e3093b98a5 CC-2870: Create testing infrastructure for testing upgrades
-shuffle and rename some functions
2011-10-14 14:26:10 +02: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 292b8f5c5d CC-2975: Require python-virtualenv version >= 1.4.9 for Airtime installations.
-fixed
2011-10-14 01:34:17 +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 c0d46e1226 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-13 23:36:47 +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
Yuchen Wang 2e4b8d82ee Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-12 17:14:19 -04:00
Yuchen Wang 36c36d2a97 CC-1976: Auto-expand the playlist box as the list grows
Fixing issue introduced by my last commit, which made the click and drop area very small.
Also removed the wasted space at the bottom of the click and drop area.
2011-10-12 17:14:03 -04:00
James 96b186558e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-12 16:54:06 -04:00
James 1d2a9709a8 CC-2872: Playlist builder: Metadata tooltip displays in upper left
hand corner when changing number of rows to display on the screen

- The metadata is now displayed on right click
2011-10-12 16:38:07 -04:00
Yuchen Wang a317d3904b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-12 15:18:58 -04:00
Yuchen Wang bae33b3e20 CC-1976: Auto-expand the playlist box as the list grows
Fixed.
2011-10-12 15:18:35 -04:00
Martin Konecny 64a4409099 -update airtime-nuke 2011-10-12 16:15:37 +02:00
Martin Konecny ba6b4ed1f6 -add missing dependency for liquidsoap 2011-10-12 14:52:54 +02:00
Martin Konecny 3fee646e35 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-12 14:45:20 +02:00
Martin Konecny aa3460963f CC-2929: More janitorial fixes for Debian/Ubuntu compatibility 2011-10-12 14:45:12 +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
Martin Konecny 55b039c162 CC-2870: Create testing infrastructure for testing upgrades
-ignore an error where airtime-full-install would return a non-zero return value.
2011-10-12 14:24:27 +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 42d2393bdd Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-11 14:40:45 -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
Martin Konecny 3727709e86 CC-2870: Create testing infrastructure for testing upgrades
-option for downloading devel branch and testing it
2011-10-11 17:49:35 +02:00
Martin Konecny d8e805c0d3 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-11 16:16:49 +02:00
Martin Konecny 632fd91ac1 CC-2870: Create testing infrastructure for testing upgrades
-fix various bugs
2011-10-11 16:16:38 +02:00
James d8c6b722ac Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-11 10:00:39 -04:00
James 6751b290d9 Merge branch 'liquidsoap-on-error-callback' into devel 2011-10-11 10:00:23 -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