Commit Graph

691 Commits

Author SHA1 Message Date
Naomi Aro 40b99dfc0f CC-3085 : Repeating shows get added to the wrong days 2011-11-24 19:39:08 +01:00
Naomi Aro 54ef9f2b03 CC-3102 : Show Editing, how it uses day of the week
not sure if this change should be here anymore yet.
2011-11-24 17:10:49 +01:00
Naomi Aro e68d7afa3f CC-3102 : Show Editing, how it uses day of the week 2011-11-24 16:20:17 +01:00
Naomi Aro 5c7828c1f5 CC-3102 : Show Editing, how it uses day of the week 2011-11-24 11:56:24 +01:00
Martin Konecny 37c89d96d9 CC-3095: Context menu of rebroadcasting show doesn't work
-fixed
2011-11-23 18:24:11 -05:00
James eb19d461fe Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-23 17:10:25 -05:00
James a886b53d74 CC-3077: Preference/stream-setting page has no Vorbis metadata option
- done
2011-11-23 17:03:30 -05:00
Yuchen Wang 980c8b2fae Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-23 16:17:40 -05:00
Yuchen Wang ef9a4cd850 CC-3093: SoundCloud preferences do not have email or password as required fields + firefox auto-fills the password field
Forgot to stage this file in last commit...
2011-11-23 16:17:21 -05:00
Yuchen Wang 008278c7ec CC-3093: SoundCloud preferences do not have email or password as required fields + firefox auto-fills the password field
Fixing bug introduced by last commit...Should test more thoroughly next time...

Fixed by creating and adding a custom validator that checks if the field is empty only when some other
fields have specific values, in this case, when 'UploadToSoundcloudOption' has a value of '1'.
2011-11-23 16:15:51 -05:00
James 7ac13d26f0 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-23 14:12:34 -05:00
James ab0dc64ba9 CC-3086: When uploading a file to /tmp filename collisions can occur
- mktemp is used to generate temp name within /tmp dir
- it generate temp file when the file gets uploade to /tmp and then copy to
organize folder as original file name
2011-11-23 14:12:14 -05:00
Naomi Aro 87886b039f CC-3083 Must convert to UTC start/end times using the timezone start/end times 2011-11-23 19:11:48 +01:00
Naomi Aro ab98bad5b4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-23 18:53:47 +01:00
Yuchen Wang d3df4b14d2 CC-3093: SoundCloud preferences do not have email or password as required fields + firefox auto-fills the password field
- Make the form fields required
- Append "Required" label to the fields
- Disable autocomplete for the fields
2011-11-23 12:52:35 -05:00
Naomi Aro 685e5e03c4 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-23 18:49:13 +01:00
Naomi Aro 65fb00ad8d CC-3083 Must convert to UTC start/end times using the timezone start/end times 2011-11-23 18:47:44 +01:00
Yuchen Wang 161fa80d64 CC-3091: Widget "Today's Program" doesn't show any content
It's not showing anything because I thought it's not suppose to display the currently playing show.
Fixed by retrieving the currently playing show along with next shows, and display them.

todayInfoAction is no longer needed since liveInfoAction does the same thing.
2011-11-23 12:00:54 -05:00
Yuchen Wang 37da2bf0c5 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-23 10:39:40 -05:00
Yuchen Wang 8766cade49 CC-3092: Station Information: not able to upload logo
- Adding a return statement fixed it...I don't what was I thinking...

- Some indention seems messed up, fixed it
2011-11-23 10:39:05 -05:00
Martin Konecny 8231df6c44 CC-3080: Select stream: drop-down menu does not really select stream, makes no difference to output quality on Firefox 3.6
-should be fixed.
2011-11-23 10:30:39 -05:00
Martin Konecny 212205b0ff CC-3070: Scheduling show on the 31st of a month causes problem to months that don't have 31 days
-fixed.
2011-11-22 18:03:47 -05:00
Yuchen Wang 72553a257d CC-3066: "Now Playing" Widget doesn't display the currently playing show when it should be
Convert to UTC time before calling model functions
2011-11-21 18:10:29 -05:00
Yuchen Wang ac74ca2449 Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-21 18:04:19 -05:00
Yuchen Wang 86729475f6 CC-3067: Shows in frontend widgets appear on the wrong day after changing timezone
- Converting times to UTC timezone in ApiController before sending them to model functions

- Added utility functions in DateHelper.php

- GetShowsByDayOfWeek has been removed due to bugs caused by using local timezone
based variable like $day, which represents day of the week in local time, in db query,
which has times saved in UTC timezone. Converting stuff like day of the week from local
to UTC is messy. GetNextShows(...) can do the job so WeekInfoAction now uses it instead
2011-11-21 18:03:56 -05:00
James 65f2dd065b CC-3063: Live Stream Window: It doesn't play Shoutcast stream
- fixed. need special string appended when the stream is from shoutcast
- ';stream/1' need to be appended on shoutcast url.(that's how jplayer works)
2011-11-21 11:57:36 -05:00
James d4a02a655c Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-21 11:39:42 -05:00
James 19eb5abe12 CC-3063: Live Stream Window: It doesn't play Shoutcast stream
- fixed. flash fallback point was invalid.
2011-11-21 11:38:56 -05:00
Martin Konecny 21bbb983ac CC-3065: When editing a show after changing timezone, the time listed under "When" displays time in old timezone
-fixed
2011-11-20 14:46:01 -05:00
James db9cadbfcd CC-3064: Stream Setting: enabled stream section has to be expanded
- done
2011-11-18 14:35:55 -05:00
James b30c95887f Merge branch 'devel' of dev.sourcefabric.org:airtime into devel 2011-11-18 14:07:00 -05:00
James 08f0aae761 CC-3053: Stream settings -> the collapse/expend arrow is pointing the wrong way
- reversing image between close and open
2011-11-18 14:06:47 -05:00
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