Commit Graph

659 Commits

Author SHA1 Message Date
Martin Konecny 9ab47d5eba CC-3036: Deleted Show instances reappear
-Renamed deleted_instance to modified_instance
2011-11-18 12:20:25 -05:00
Martin Konecny c773c5c674 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-18 11:59:27 -05:00
Martin Konecny f3e1f63226 CC-3060: Apache errors: Undefined index: deleted_instance
-fixed
2011-11-18 11:59:15 -05:00
James e5ac2b75d4 CC-3059: Record and Rebroadcast: not able to set rebroadcast too close to
recorded show

- fixed.
- extra fix: layout was broken when error is displayed
2011-11-18 11:36:20 -05:00
Yuchen Wang 15c84ddfdb CC-2950: Tell users if they are running an out-of-date version or not
- changed default url to "http://airtime.sourcefabric.org"
2011-11-17 23:25:46 -05:00
Yuchen Wang 52052bd573 CC-2950: Tell users if they are running an out-of-date version or not
- added error checking to curl call
- added regex validation when storing link to latest version
2011-11-17 15:33:29 -05:00
Yuchen Wang eae90862b1 CC-2950: Tell users if they are running an out-of-date version or not
Get rid of hardcoded url for downloading the latest version, and use the url
stored in the stat server instead
2011-11-17 14:10:26 -05:00
james ad708d9983 CC-2156: Searching for a host and hitting ENTER submits the show form
- done. Had to port the code manually
2011-11-16 18:14:10 -05:00
james 590a74b8ce CC-3053: Stream settings -> the collapse/expend arrow is pointing the wrong way
- fixed
2011-11-16 17:57:07 -05:00
james 1f9b2559ab CC-3032: Airtime -> Help -> About. shows variable name instead of value
- fixed
2011-11-16 16:46:54 -05:00
Yuchen Wang 1fd29def27 CC-2436: Save pulldown settings
Move the code that updates the database for the "show entries" dropdown to
a more appropriate place.
2011-11-16 16:12:58 -05:00
Yuchen Wang 4820bb617b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-16 15:52:31 -05:00
Yuchen Wang a0bf7c90ba CC-2436: Save pulldown settings
Fixing the issue of "show entries" dropdown setting not being saved.
After some investigation, it seems like we're destroying the calendar
everytime we modify the dropdown value, and create a new one,
which explains why the new setting is not being saved.

Fixed by moving the code that handles the updating to the place after
we create the new calendar. This makes the code cleaner as well.
2011-11-16 15:52:05 -05:00
Martin Konecny 4f2adc3068 CC-3050: Comb through source code for dates being generated with date() function
-done
2011-11-16 14:06:59 -05:00
Martin Konecny 2f63a65e03 CC-3054: After recording show, recorded file is not imported properly.
-fixed
2011-11-16 13:34:58 -05:00
Martin Konecny a5939afd3f -fix minor typo 2011-11-16 12:59:01 -05:00
Martin Konecny 1e79363263 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-16 12:35:44 -05:00
Martin Konecny 17e59f61be CC-3036: Deleted Show instances reappear
-Make sure we ignore deleted show instances in
 all areas of Airtime.
2011-11-16 12:35:02 -05:00
Naomi Aro 12172e5ad5 CC-3035 : Should be able to resize a show, have it affect all future instances of the show
added a new resize function to Shows.php,
should not use ShowInstance resize method, since you cannot resize just one instance currently.
2011-11-16 16:32:04 +01:00
Yuchen Wang 129feb573b Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-15 16:38:00 -05:00
Yuchen Wang 46a87ea534 CC-2992: 404 "Help" link doesnt work
Somehow my last change disappeared...submit again
2011-11-15 16:37:41 -05:00
James aafd53b456 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-15 16:27:54 -05:00
James 6229ca46d5 CC-2959: Stream Setting: Status box design for each stream
- integrated new status boxes
2011-11-15 16:27:23 -05:00
Martin Konecny e257c1043a Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-15 16:14:18 -05:00
Martin Konecny 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
James 3374e09242 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-15 16:10:58 -05:00
Martin Konecny a0217f715f CC-3037: Nowplaying bar not showing current show
-fixed
2011-11-15 16:10:45 -05:00
James 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
Yuchen Wang af1b376cdf CC-3029: Graphic design for the version notification feature
- use classes in VersionNotify.php for displaying icons instead of inline styling
- change underscore to hyphen so that naming convention is consistent with the
  rest in style.css
2011-11-15 16:08:05 -05:00
Yuchen Wang 383fa35fc5 CC-2950: Tell users if they are running an out-of-date version or not
- Hide tooltip and close button on mouseout when current version is up to date
- Return version diff instead of tooltip msg in VersionNotify.php,
  make js side responsible for picking the msg
2011-11-15 14:24:14 -05:00
Yuchen Wang fdff88cb76 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-15 12:38:18 -05:00
Yuchen Wang f6f58c9399 CC-3044: Error in system status seen in apache log
- Added check for length > 0 before trying to get property
- Got rid of repeating code
2011-11-15 12:37:54 -05:00
Naomi Aro 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
Naomi Aro 63d0163f15 CC-3047 : getting full calendar events setting editable flag incorrectly 2011-11-15 16:32:07 +01:00
Naomi Aro 6f91a9b107 CC-3046 : Show contents for Rebroadcast in wrong timezone 2011-11-15 15:56:52 +01:00
Naomi Aro 61d8fa7baa CC-3034 Record/Rebroadcast Shows have time problems
fixing some UTC to non UTC comparisons,
adding offsets properly to create a rebroadcast show's start/end time.
2011-11-15 15:20:33 +01:00
Martin Konecny fe5191eac1 CC-3042: Disappearing shows from beginning when clicking edit.
-initial commit
2011-11-15 00:34:48 -05:00
Martin Konecny e3395ae1e5 CC-3036: Deleted Show instances reappear
-done.
2011-11-14 23:54:47 -05:00
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
Yuchen Wang 709582b47d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-14 17:53:37 -05:00
Yuchen Wang 51c563f80b CC-2950: Tell users if they are running an out-of-date version or not
1. changed the behavior so that the tooltip comes up on hover
2. changed stat server link to "http://stat.sourcefabric.org/airtime_latest_version"
3. only updates the db if version returned by stat server is valid
2011-11-14 17:52:50 -05:00
James 00f37296e8 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-14 16:23:42 -05:00
James 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
Martin Konecny de33d3ccaf Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-14 16:08:54 -05:00
Martin Konecny 60281f4e90 CC-2972: Find better way to determine domain which pypo should download from.
-fixed
2011-11-14 16:08:45 -05:00
James 11a38476c3 SAAS-43: Automatically fill in customer info in the automated feedback system
on signup, do not display popup on login

- title needs to update with db access since airtime-saas can change title
- storing it to session variable is not an option
2011-11-14 16:05:19 -05:00
Yuchen Wang becaf7a152 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-14 00:35:27 -05:00
Yuchen Wang 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
james 8e283c9e02 SAAS-66: Ability to set the stream values from the command line
- done
- extra fix: Fixed a javascript issue when it always changed bitrate to 48,
when type is set to ogg
2011-11-13 15:34:26 -05:00
james 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
Martin Konecny 20fc49b7be CC-3027: Current Show progress bar is wrong
-looks like it's working.
2011-11-12 00:04:37 -05:00
Martin Konecny 1a45a38055 -add function comments to Show.php 2011-11-11 22:55:46 -05:00
Martin Konecny f7fb6ddff0 -better naming of show instance functions 2011-11-11 22:24:37 -05:00
Martin Konecny 42cde33648 CC-3030: Repeating shows is broken in devel branch.
-working towards using only DateTime objects
2011-11-11 17:25:49 -05:00
Martin Konecny 74d3c3aebc CC-3030: Repeating shows is broken in devel branch. 2011-11-11 10:58:27 -05:00
James 03a81e642e CC-2438: Add a button to listen to the stream immediately
- moved listen button under the "ON AIR"
2011-11-10 16:36:17 -05:00
James 5503ebc6e5 SAAS-35: "Trial Period" box
- done
2011-11-10 15:54:38 -05:00
James 56a6da51a9 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-10 15:35:52 -05:00
James 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
James 17016e5d40 CC-3028: Entry in a cc_show table never gets deleted
- fixed
2011-11-10 15:17:06 -05:00
Yuchen Wang 5d741d84ee CC-3001: Preferences->"Submit" button renamed to "Save", and should be at the top and the bottom of the screen
Changed all other buttons that says "Submit" to "Save.
Also added some CSS stuff so that the "Save" button at the top of Preference page
have some space between itself and the form below.
2011-11-09 16:03:32 -05:00
Yuchen Wang 38719b1a4e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-09 15:36:09 -05:00
Yuchen Wang 8f75bf1870 CC-2966: Remove minimum and maximum logo sizes - make them recommended instead
Fixed by:
1. change wording
2. attach custom filter to the logo upload form, the filter scales down the image
if it's larger than 600x600
2011-11-09 15:35:14 -05:00
James c3d35df55c CC-3026: Schedule Media: The show time displayed in this window is UTC time
- fixed
2011-11-09 14:29:52 -05:00
James 6c740effde SAAS-52: New auto-feedback metrics: 1) Debian or manual install,
2) SaaS or Non-SaaS

- done
2011-11-09 13:13:21 -05:00
James a551e08fce - cleaning up a dirty code 2011-11-09 11:27:17 -05:00
James 4b12b4e01e SAAS-63: airtime-saas: Something is broken in Preference.php
- fixed
2011-11-09 10:15:44 -05:00
Yuchen Wang 04bcc28b5e CC-3001: Preferences->"Submit" button renamed to "Save", and should be at the top and the bottom of the screen
Fixed by:
1. changing label to say "Save"
2. wrap the preference form inside another form;
   within the wrapper form, add a submit button at the top
2011-11-07 17:43:38 -05:00
Yuchen Wang 963976b87e Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-04 16:58:01 -04:00
Yuchen Wang 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
James 9448728d63 CC-2904: Space missing between two boxes on "Playlist Builder"
- fixed
2011-11-03 16:08:01 -04:00
James 6eff9d124e CC-2994: Upgrade: database change for SoundCloud upload
- changed soundcloud_link_to_file length to 4096
2011-11-03 10:30:01 -04:00
Martin Konecny 4c5386c0f3 1.9.5 preparations 2011-11-02 15:19:27 -04:00
James 8f6804155f CC-2934: Phone Home Stat: it should work with new airtime-check-system
- initial commit
2011-11-01 14:52:27 -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 153e0df409 CC-2989: airtime-check-system should deal with the case when the web server is not accessible
-fixed some more inaccessible issues
2011-10-27 17:13:36 -04:00
James 0188dc6c06 CC-2995: Remove "Done Editing" button
- done
2011-10-27 10:20:57 -04:00
James 5d4486b08f CC-2926: Clicking "Choose File" in support settings to upload image
defaults to "Audio/MPEG" type in Chrome

- done
2011-10-27 10:14:39 -04:00
Martin Konecny d26e410799 CC-2997: Daylight savings time affects repeating shows.
-should work now
2011-10-25 16:49:44 -04:00
Martin Konecny 08b97c4583 CC-2991: Repeating a show is broken
-working
2011-10-24 17:26:45 -04:00
Martin Konecny 04b88d4344 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-24 16:59:16 -04:00
Martin Konecny 858990eb8c CC-2991: Repeating a show is broken 2011-10-24 16:58:55 -04:00
Yuchen Wang a65fb97aec CC-2986: Long show description causes Add Show or Edit Show to fail silently
Added StringLength validators for the UI fields. This way when user gave more than what
they should gave as the input, it's going to display an error msg.

The maximum length for the fields is queried from the database before the
fields were initialized.
2011-10-24 13:27:53 -04:00
Yuchen Wang 6d15308e1d Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-10-24 12:06:18 -04:00
Yuchen Wang 4db6636b06 CC-2646: Set a calendar view default (Day/week/month) that's remembered
1. If the preference is not user-specific, or if id is null, set subjid to null

2. Rewrote the code for the setValue logic, added comments. Should be easier
to read and understand
2011-10-24 12:05:55 -04:00
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 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