Commit graph

3577 commits

Author SHA1 Message Date
Martin Konecny
0fee577c67 Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
Conflicts:
	airtime_mvc/application/Bootstrap.php
2012-02-02 14:13:04 -05:00
Martin Konecny
11e0f3ead8 CC-3296: Sometimes the Current Playing Item on the top Panel in the UI incorrectly shows "Nothing Scheduled" 2012-02-02 14:11:03 -05:00
Naomi Aro
60ac01dd41 CC-3174 : show builder
scheduled item keeps same id after being moved.
2012-02-02 18:38:56 +01:00
Naomi Aro
e001cd24c1 CC-3174 : show builder
darg into and drag around in the timeline is now working.
need to change schedule table to not have auto incrementing ids
to preserve an item's id for REST.
(might find another way)
2012-02-02 18:13:20 +01:00
Naomi Aro
0199f572bd CC-3174 : showbuilder
dragging into timeline is working
need to replace jjmenus
2012-02-02 15:51:15 +01:00
Naomi Aro
942cfaac25 CC-3174 : show builder
moving columns around in library to look better.
2012-02-02 01:29:50 +01:00
Naomi Aro
3aab811a3e CC-3174 : showbuilder
fixing some css/js for display.
2012-02-01 23:33:20 +01:00
Naomi Aro
f5b2a23eb1 CC-3174 : showbuilder
group add/delete is working
2012-02-01 18:47:08 +01:00
James
df73726961 CC-3293: Stream settings page does not remember the stream metadata format
- fixed
2012-02-01 12:10:31 -05:00
James
026bdebacc CC-3293: Stream settings page does not remember the stream metadata format
- fixed
2012-02-01 12:09:59 -05:00
James
3643c9caaf SAAS-174: Ability to add Google Analytics to the demo instance
- done
2012-02-01 11:44:20 -05:00
James
4ffe79a286 CC-3290: A file should be removed from playlists if it is removed
through the interface

- fixed
2012-02-01 10:59:04 -05:00
Daniel Franklin
5d02581d38 CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
Modified the error message to prepend a The, simple change.
2012-02-01 10:59:04 -05:00
Daniel Franklin
d495eac326 CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
-fixed using the return result of the rename call to verifty the upload worked.
2012-02-01 10:59:04 -05:00
James
8e40c95e9a SAAS-174: Ability to add Google Analytics to the demo instance
- done
2012-02-01 10:57:38 -05:00
Martin Konecny
b2ed751e9e Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x 2012-01-31 21:24:23 -05:00
Martin Konecny
7ee17ba07e CC-3291: Airtime is missing Australia and Arctic timezones
-fixed
2012-01-31 21:24:01 -05:00
Naomi Aro
3d502b748f CC-3174 : showbuilder
removing items recalulates everything correctly.
2012-01-31 21:39:34 +01:00
Daniel Franklin
de7bbbb479 CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
Modified the error message to prepend a The, simple change.
2012-01-31 15:17:53 -05:00
Daniel Franklin
026f49ab31 CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
-fixed using the return result of the rename call to verifty the upload worked.
2012-01-31 14:54:03 -05:00
Naomi Aro
fbda0e733b CC-3174 : showbuilder
check into issue that propel doesn't return DateTime object in UTC.
using table tools to keep track of selected rows.
2012-01-31 18:59:27 +01:00
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
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
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
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
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
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
3588cca654 CC-3258 : Deleting a rebroadcasting show deletes also the recorded show 2012-01-17 14:11:12 +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
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
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
James
c82394b7a0 CC-3246: Hardware audio output cannot be switched off
- fixed
2012-01-13 16:57:02 -05:00