e257c1043a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-15 16:14:18 -05:00
e5fc5d623d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/application/models/DateHelper.php
airtime_mvc/application/models/Show.php
2011-11-15 16:14:00 -05:00
3374e09242
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-15 16:10:58 -05:00
a0217f715f
CC-3037: Nowplaying bar not showing current show
...
-fixed
2011-11-15 16:10:45 -05:00
a723430462
SAAS-69: Support Settings: Change/hide some sections for SaaS
...
- Some sections are hidden when saas is enabeld
as described in the ticket.
2011-11-15 16:10:40 -05:00
4bdf866aca
CC-3035 : Should be able to resize a show, have it affect all future instances of the show
...
resizing is only working for single instance currently like the past.
2011-11-15 18:22:21 +01:00
6f91a9b107
CC-3046 : Show contents for Rebroadcast in wrong timezone
2011-11-15 15:56:52 +01:00
fe5191eac1
CC-3042: Disappearing shows from beginning when clicking edit.
...
-initial commit
2011-11-15 00:34:48 -05:00
2529570546
SAAS-67: "Hardware Audio Out" shows when SaaS is enabled
...
- minor fix.
- it was returning error when saving stream setting.
2011-11-14 16:23:23 -05:00
becaf7a152
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-14 00:35:27 -05:00
1a1db1892f
CC-2950: Tell users if they are running an out-of-date version or not
...
Initial implementation.
- added some code in phone_home_stat to retrieve latest version from stat server
and store result in db
- created new view helper VersionNotify.php, which queries and calculates version
difference, then returns the necessary information in html to the view files
- created new javascript file versiontooltip.js, which sets up the qtip stuff so that
when the version notification icon is clicked, a tooltip is displayed
2011-11-14 00:34:53 -05:00
68f142470a
SAAS-67: "Hardware Audio Out" shows when SaaS is enabled
...
- "Hardware Audio Out" is not visible when plan-level is not diabled
2011-11-13 13:58:47 -05:00
f7fb6ddff0
-better naming of show instance functions
2011-11-11 22:24:37 -05:00
42cde33648
CC-3030: Repeating shows is broken in devel branch.
...
-working towards using only DateTime objects
2011-11-11 17:25:49 -05:00
b04b7ff010
CC-2848: Misc bugs from demo service
...
- Handling concurrency issue playlist section and show(canlendar) section
2011-11-10 15:35:27 -05:00
c3d35df55c
CC-3026: Schedule Media: The show time displayed in this window is UTC time
...
- fixed
2011-11-09 14:29:52 -05:00
6ffecf80c8
CC-2965: Frontend widget displays shows in UTC time
...
Not only were frontend widgets showing UTC time,
the SQL query was also comparing UTC timestamp with local timestamps,
causing widgets to display shows in the wrong day, etc.
Another problem was that "On air today" widget was simply calling
GetNextShows which returns shows within next 48 hours.
Fixed by:
1. Under models/Show.php:
In the GetCurrentShow/GetNextShows/GetShowsByDayOfWeek functions,
added code to convert UTC timestamp to local timestamp or vice versa,
depending on which one is more suitable, in SQL queries, thus
removing inconsistency in timezones. Also, before returning query result,
added code to convert result to local timezone.
In GetNextShows, added an optional parameter endTime to limit the interval
of shows to get. This is useful for the "On air today" widget.
2. Under models/DateHelper.php:
Added a few timezone functions to help converting timezones easier in Show.php.
3. Under controller/ApiController.php:
Added todayInfoAction which is to be used by "On Air Today" widget.
2011-11-04 16:57:24 -04:00
56edfe4e68
CC-2758: Make airtime-install script Debian/Ubuntu compatible
...
-uninstall script added
2011-10-28 12:35:58 -04:00
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
fb8735588d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-10-22 11:34:43 -04:00
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
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
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
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
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
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
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
d3833f9a32
CC-2745: Show status of liquidsoap/icecast connection on Stream Settings
...
page
- initial commit
2011-10-10 20:14:27 -04:00
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
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
929e29182b
CC-2908: Add "Live Stream" title to live stream popup window
...
-custom logo
2011-10-04 17:18:36 -04:00
7dd14efe27
CC-2750: Ability to query health status for pypo,
...
liquidsoap, media monitor, and recorder
2011-10-04 15:49:02 -04:00
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
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
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
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
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
83e8a610df
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-10-03 14:13:15 -04:00
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
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
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
bf15b4cf0d
Merge branch '1.9.1' of dev.sourcefabric.org:airtime into 1.9.1
2011-09-29 15:22:40 -04:00
3775e5f4a7
CC-2882: Airtime cannot delete watched folder when is been renamed
...
- done
2011-09-29 15:02:34 -04:00
46146d1216
cc-2882: Airtime cannot delete watched folder when is been renamed
...
- initial commit
Conflicts:
airtime_mvc/application/models/MusicDir.php
2011-09-29 15:02:30 -04:00
1c652b6416
CC-2873: Soundcloud plugin doesn't log any error when there is an error
...
with soundcloud uploading through api controller
- Changed constant names
- added -1 constant
2011-09-29 10:30:40 -04:00
4e105e6151
CC-2891: Unicode error with metadata that contains unicode strings
...
-fixed
2011-09-28 16:04:40 -04:00
28f1d885f2
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-09-28 13:46:10 -04:00
d1542b0d89
CC-2882: Airtime cannot delete watched folder when is been renamed
...
- done
2011-09-28 13:45:21 -04:00
f697e475fd
CC-2750: Ability to query health status for pypo, liquidsoap, media monitor, and recorder
...
-remove icecast monitoring for now
2011-09-28 12:45:19 -04:00
b1fa8901ca
cc-2882: Airtime cannot delete watched folder when is been renamed
...
- initial commit
2011-09-27 14:49:03 -04:00
Martin Konecny
James
Naomi Aro
Yuchen Wang
james
Yuchen Wang
Martin Konecny
James
Paul Baranowski