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
8b93b98e24
CC-3174 : show builder
...
removing widths where unneeded.
2012-02-02 01:33:53 +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
James
d0de29c10a
CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
...
- missing a line from cfg in upgrade folder
2012-02-01 14:52:54 -05:00
James
3b9bc723ab
CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
...
- missing a line from cfg in upgrade folder
2012-02-01 14:52:17 -05: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
81d24b7825
SAAS-174: Ability to add Google Analytics to the demo instance
...
- adding google-analytics.js
2012-02-01 11:49:53 -05:00
James
80d99f013a
SAAS-174: Ability to add Google Analytics to the demo instance
...
- adding google-analytics.js
2012-02-01 11:48:29 -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
6812f69962
CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
...
- fixed a bug.
- extra fix: handle cancel recording event gracefully
- better log
2012-02-01 10:59:03 -05:00
James
1df1388602
CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
...
- bug fix
2012-02-01 10:59:03 -05:00
James
25ab4d39b2
CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
...
- The issue was that the recorder wasn't pulling any schedule from
Airtime. It should pull it when real timeout(every 1 hr) happens
2012-02-01 10:59:03 -05:00
James
8e40c95e9a
SAAS-174: Ability to add Google Analytics to the demo instance
...
- done
2012-02-01 10:57:38 -05:00
James
47eacd1165
CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
...
- fixed a bug.
- extra fix: handle cancel recording event gracefully
- better log
2012-02-01 10:33:03 -05:00
James
da89b9fa74
CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
...
- bug fix
2012-02-01 10:33:03 -05:00
James
47acb16e20
CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
...
- The issue was that the recorder wasn't pulling any schedule from
Airtime. It should pull it when real timeout(every 1 hr) happens
2012-02-01 10:33:03 -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
James
3b64da7f4e
CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
...
- fixed a bug.
- extra fix: handle cancel recording event gracefully
- better log
2012-01-31 15:28:57 -05: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
4874eb4f34
CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
...
- bug fix
2012-01-31 11:37:12 -05:00
James
733b23e7fc
CC-3286: Shows not recorded after upgrade to 2.0.0 from 1.8.2
...
- The issue was that the recorder wasn't pulling any schedule from
Airtime. It should pull it when real timeout(every 1 hr) happens
2012-01-31 11:22:30 -05: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
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