James
b644a94363
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-30 16:29:50 -05:00
James
80970efa9c
SAAS-174: Ability to add Google Analytics to the demo instance
...
- done
2012-01-30 16:29:35 -05:00
James
c5f3e40397
SAAS-174: Ability to add Google Analytics to the demo instance
...
- done
2012-01-30 16:28:27 -05:00
james
e05e2ea49c
CC-3284: Version the javascript directories so that upgrades
...
work correctly for clients.
- appended timestamp of last modified time on all js and css file import
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
2012-01-27 15:37:53 -05:00
james
fd92f7ba2f
Merge branch '2.0.0-javascript-cache' into 2.0.x
2012-01-27 15:31:30 -05:00
james
9f2d0fc8d5
CC-3284: Version the javascript directories so that upgrades
...
work correctly for clients.
- appended timestamp of last modified time on all js and css file import
2012-01-27 15:30:44 -05:00
Naomi Aro
3f3117cf0e
CC-3174 : Show builder
...
creating a scheduling system to work with the new timeline in mind using propel.
2012-01-27 21:06:04 +01:00
Naomi Aro
f5761fd03c
CC-3174 : show builder
...
status icon on left side of table
static check mark in the footer currently
2012-01-26 19:10:37 +01:00
Martin Konecny
10abf0447a
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-01-26 09:57:22 -05:00
Naomi Aro
b0c3bace1c
CC-3174 : show builder
...
made sure the column reordering/visibility selection works with
modified show header/footer rows (their td spans the entire tr)
2012-01-26 15:21:04 +01:00
James
5026da56cb
SAAS-178: Demo instance should prevent changing of admin password
...
- Error msg is returned when try to update admin account
2012-01-25 14:14:27 -05:00
James
192c30bacc
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-01-25 14:12:42 -05:00
James
2027db3609
SAAS-178: Demo instance should prevent changing of admin password
...
- Error msg is returned when try to update admin account
2012-01-25 14:12:19 -05:00
Martin Konecny
9cf8bdcad8
set max bitrate to 320 on airtime-upgrade
2012-01-25 09:16:39 -05:00
Martin Konecny
6215eb0dba
-fix upgrade for large result sets.
2012-01-25 05:01:56 -05:00
Martin Konecny
c0e71dc58d
-Some user-friendly changes to upgrade script
2012-01-25 02:26:46 -05:00
Martin Konecny
f4bca04edc
CC-3270: Update "airtime-update-db-settings.py" fails
...
-fixed. We no longer need to run phing.
2012-01-24 17:26:45 -05:00
Naomi Aro
1080bf692f
CC-3277 : Overbooking a show to include 24+ hours of audio
...
truncating time values greater that the max allowed for time without timezone
2012-01-24 18:08:39 +01:00
Naomi Aro
ecaebbeb67
CC-3174 : Show builder, working on date choice pickers, make sure they accomodate client/server timezones.
2012-01-23 19:07:07 +01:00
James
438340ff9a
CC-3266: Pypo: pypopush will perfom better if it only process the
...
lastest msg from the rabbitMQ queue
- done
2012-01-18 17:52:09 -05:00
James
863de54fc8
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2012-01-18 10:29:19 -05:00
Yuchen Wang
93dfb253c1
CC-3239: Create show form->Date start doesnt consider "Week starts on" parameter
...
Fixed
2012-01-18 10:28:41 -05:00
Naomi Aro
cc20db5d30
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2012-01-18 16:22:22 +01:00
Naomi Aro
fa872894f3
CC-3259 : change repeating state of show.
2012-01-18 16:21:46 +01:00
Martin Konecny
cdda1b0101
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2012-01-17 16:56:54 -05:00
Martin Konecny
deceb56f70
CC-3263: Add an "Upgrading database, may take several minutes, please wait"
...
-done
2012-01-17 16:56:30 -05:00
Paul Baranowski
07bd5dacae
Improved tooltip for Stream Settings: Icecast Vorbis Metadata
2012-01-17 16:03:41 -05:00
James
087d893a60
Merge branch 'airtime-2.0.x' into devel
2012-01-17 14:48:04 -05:00
James
3a8ba36e0d
SAAS-155: Add possibility to show additional information on
...
login page (for demo site)
- username and password are auto filled on demo site
- added informative msg on demo site about username and password
2012-01-17 14:47:26 -05:00
James
ff428d2c4f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-17 11:35:48 -05:00
James
dae7e73a84
CC-3250: UI design for mount monitor for media monitor
...
( Manage Media Folder and Playlist Builder screen)
- initial commit
2012-01-17 11:35:31 -05:00
Naomi Aro
63b2fa94de
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2012-01-17 14:11:26 +01:00
Naomi Aro
3588cca654
CC-3258 : Deleting a rebroadcasting show deletes also the recorded show
2012-01-17 14:11:12 +01:00
Daniel James
695d9c5f3c
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2012-01-17 12:06:30 +00:00
Daniel James
7a9b1710ad
Updated information about phing (CC-3237)
2012-01-17 12:05:19 +00:00
Naomi Aro
169141d530
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2012-01-17 12:46:49 +01:00
Naomi Aro
a69be24831
CC-3256 : Recorded/repeated/rebroadcast is invalid after show update
...
only the original rebroadcasts are left when toggling the repeat option.
2012-01-17 12:45:05 +01:00
Daniel James
908401841b
Removed mention of phing from license file (CC-3237)
2012-01-17 11:34:26 +00:00
Naomi Aro
424206b9a9
CC-3174 : Show Builder
...
data tables column resizing, starting separating out events.
2012-01-17 11:18:17 +01:00
Martin Konecny
54ee177f7d
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-16 13:58:45 -05:00
Martin Konecny
1b3433e7a8
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2012-01-16 13:57:07 -05:00
Martin Konecny
9a64c49ef0
CC-3237: Remove phing dependency of end user database installation
...
-Done
2012-01-16 13:48:43 -05:00
Martin Konecny
9d7a0f31ca
CC-3254: lsb-release package should be installed by install_full scripts
...
-fixed
2012-01-16 13:47:50 -05:00
Naomi Aro
df33a457b1
Merge branch 'devel' into CC-3174
2012-01-16 09:58:02 +01:00
Naomi Aro
859213b760
CC-3174 Show Builder
...
experimenting
2012-01-16 09:56:57 +01:00
martin
6add525fb1
Merge branch 'airtime-2.0.x' of dev.sourcefabric.org:airtime into airtime-2.0.x
2012-01-13 18:31:21 -05:00
martin
229db4cdb0
-small fix for debian upgrade-test script
2012-01-13 18:30:59 -05:00
James
c82394b7a0
CC-3246: Hardware audio output cannot be switched off
...
- fixed
2012-01-13 16:57:02 -05:00
James
ccef97190a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-01-13 16:56:29 -05:00
James
bcbbf42f62
CC-3246: Hardware audio output cannot be switched off
...
- fixed
2012-01-13 16:56:02 -05:00