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
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
ace68bd363
CC-3029
...
Signed-off-by: lukabazuka <vladimir.stefanovic@sourcefabric.org>
2011-11-15 21:00:14 +01:00
9c649259dd
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-15 20:30:19 +01:00
4c26cb868b
CC-2959
...
Signed-off-by: lukabazuka <vladimir.stefanovic@sourcefabric.org>
2011-11-15 20:29:37 +01:00
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
fdff88cb76
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-15 12:38:18 -05:00
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
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
63d0163f15
CC-3047 : getting full calendar events setting editable flag incorrectly
2011-11-15 16:32:07 +01:00
6f91a9b107
CC-3046 : Show contents for Rebroadcast in wrong timezone
2011-11-15 15:56:52 +01:00
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
fe5191eac1
CC-3042: Disappearing shows from beginning when clicking edit.
...
-initial commit
2011-11-15 00:34:48 -05:00
c2639b895a
CC-2997: Daylight savings time affects repeating shows.
...
-fix upgrade script
2011-11-15 00:08:31 -05:00
3c6410aebd
-make it so that uninstaller doesn't exit on first error. Should try to remove everything.
2011-11-14 23:55:23 -05:00
e3395ae1e5
CC-3036: Deleted Show instances reappear
...
-done.
2011-11-14 23:54:47 -05:00
2fc46cd29b
CC-3039: Install script doesnt check whether virtualenv exists (Ubuntu 11.10)
...
-fixed
-moved virtualenv version check into virtualenv-install.sh
2011-11-14 21:28:27 -05:00
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
709582b47d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-14 17:53:37 -05:00
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
00f37296e8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-14 16:23:42 -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
de33d3ccaf
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-14 16:08:54 -05:00
60281f4e90
CC-2972: Find better way to determine domain which pypo should download from.
...
-fixed
2011-11-14 16:08:45 -05:00
aa610c2a61
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-14 16:07:01 -05:00
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
a5dedced31
-add debian support for liquidsoap compile scripts
2011-11-14 14:15:41 -05:00
469c9c59fe
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-14 14:12:18 -05:00
7a9e53fa04
CC-3040: Debian Squeeze requires the Liquidsoap natty binary instead of the generic one
...
-done
2011-11-14 14:12:12 -05:00
c3429cbe2a
CC-2952: Put in final Liquidsoap 1.0 binaries
...
-set binaries to executable
2011-11-14 13:08:26 -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
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
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
20fc49b7be
CC-3027: Current Show progress bar is wrong
...
-looks like it's working.
2011-11-12 00:04:37 -05:00
1a45a38055
-add function comments to Show.php
2011-11-11 22:55:46 -05:00
f7fb6ddff0
-better naming of show instance functions
2011-11-11 22:24:37 -05:00
1c5b2dc813
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-11 17:26:06 -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
74d3c3aebc
CC-3030: Repeating shows is broken in devel branch.
2011-11-11 10:58:27 -05:00
6a22f3667f
CC-2438: Add a button to listen to the stream immediately
...
- fixed
2011-11-11 10:25:24 -05:00
bc2d27ec9f
CC-2848: Misc bugs from demo service
...
- cleaning up some code
2011-11-11 10:16:33 -05:00
6f78f1d82d
CC-2952: Put in final Liquidsoap 1.0 binaries
...
-auto-compile script
2011-11-10 23:58:06 -05:00
901333bf6d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2011-11-10 23:55:33 -05:00
9270ff01a2
CC-2952: Put in final Liquidsoap 1.0 binaries
...
-Done
2011-11-10 23:55:15 -05:00
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
8d3d14860d
CC-2959: Stream Setting: Status box design for each stream
...
- integration with new status box design
2011-11-10 16:32:56 -05:00
Martin Konecny
James
Yuchen Wang
lukabazuka
Naomi Aro
Yuchen Wang
james
James