Commit Graph

127 Commits

Author SHA1 Message Date
Naomi Aro d12ef1c7a2 CC-3536 : Work out ACL with library on NowPlaying when it's a guest User 2012-03-28 18:43:44 +02:00
Naomi Aro 1e9348f27f CC-3509: "Add Files" button (make it look better) 2012-03-28 17:50:14 +02:00
Naomi Aro 451b573c52 Merge branch 'CC-3174' into devel 2012-03-27 14:14:58 +02:00
James 7e92b96a67 CC-3507: Live Stream status: naming
- fixed css width
2012-03-26 18:39:10 -04:00
Naomi Aro 275faa1881 CC-3504 : Adding a clip when nothing is playing should schedule the clip at the current time 2012-03-26 19:08:52 +02:00
Naomi Aro 91d44847cb CC-3506 : Timeline: smaller columns for time values 2012-03-26 12:24:16 +02:00
Naomi Aro 711d1f202a CC-3463 : Usability of timeline
changing buttons to be jquery ui icons.

adding button to trim overbooked
adding button toscroll current item to top.
2012-03-23 16:42:08 +01:00
Naomi Aro 8af4f052e0 CC-3360 : timeline css 2012-03-23 01:46:45 +01:00
Naomi Aro f1d76443ab CC-3360 : timeline css 2012-03-23 00:11:49 +01:00
Naomi Aro da02bb7076 CC-3360 : Timeline Css 2012-03-22 19:15:39 +01:00
Naomi Aro 1fdb3cf163 CC-3360 : Timeline Css
adding Css to timeline.
2012-03-22 18:04:22 +01:00
James b7634098d3 CC-3471: Stream setting page looks much worse in Chrome than in Firefox
- fixed
2012-03-19 15:02:29 -04:00
Naomi Aro fa1f03ed58 CC-3174 : showbuilder
improving look of playlist when files are not on disk.
2012-03-15 12:08:29 +01:00
Naomi Aro 3019cb9c42 CC-3434 : playlist
changing image to be smaller.
2012-03-15 11:37:20 +01:00
Naomi Aro ae646545c4 CC-3201 : file import more visible 2012-03-15 11:36:32 +01:00
James 16c0756d76 CC-3224: "On-the-fly" stream rebroadcasting
- css fix
2012-03-14 15:26:07 -04:00
James c5c9fd7ba8 CC-3430: Live Stream: Admin should be able to kick out the source connection
- Clicking a button on UI triggers sending msg to pypo, which will lead running
'kick' command in liquidsoap.
2012-03-14 14:43:11 -04:00
James 4eefc05366 CC-3427: Live Stream: Ability to switch off Scheduled Play
- done
2012-03-14 14:43:10 -04:00
James e31ac81e74 CC-3418: Live Stream: Merge current "On-Air" indicator and "Listen"
button with new stream source indicator

- Initial commit
2012-03-14 14:43:10 -04:00
James f193047a1c CC-3367: Display in Now Playing whether Live DJ stream and Live Master stream
are connected and give user the ability to block those streams

- added stream source switch interface
- backend code
2012-03-14 14:43:10 -04:00
James 30901aa0d6 CC-3224: "On-the-fly" stream rebroadcasting
- A section where user can setup port and mount point for harbor input in
stream setting page(front-end and back-end)
- updated the part where it rewrites the liquidsoap.cfg file
2012-03-14 14:41:00 -04:00
James 48bb19d758 CC-3224: "On-the-fly" stream rebroadcasting
- web interface
- auth script for liquidsoap
- DB changes
2012-03-14 14:41:00 -04:00
Naomi Aro 309c6da83d CC-3440 : Calendar time picker is hidden for day and week views 2012-03-14 18:05:50 +01:00
Naomi Aro eb389d99d2 CC-3434 : Playlist Builder fast deleting 2012-03-14 17:50:48 +01:00
Naomi Aro c66b55ec17 CC-733 : playout history
translating mDataProp values to be able to search table on backend
2012-03-09 11:13:32 +01:00
Naomi Aro fe3c340a90 CC-3174 : showbuilder
making library table only scroll on the table part.
2012-03-07 18:27:32 +01:00
Naomi Aro 157078b963 Merge branch 'CC-3174' into devel
Conflicts:
	airtime_mvc/public/js/airtime/library/library.js
2012-03-06 13:51:37 +01:00
Naomi Aro 6c5f710329 CC-3174 : showbuilder
making each separate widget scrollable (playlist, library, timeline)
2012-03-06 13:19:20 +01:00
Daniel a09b63b8d0 CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
- removed javascript from php files
- removed preview.js
- fixed small problems with editor
2012-03-05 19:00:14 -05:00
Naomi Aro a832a40c75 CC-3174 : showbuilder
making the library a separate scrollable from playlist
2012-03-05 18:14:10 +01:00
Naomi Aro b8ca0ef740 CC-3174 : showbuidler
fixing width of search input so it will work on smaller screens.
2012-03-05 15:39:18 +01:00
Naomi Aro 62c07107c1 CC-3174 : showbuilder
dialog improvements, can scroll library, builder independently.
2012-03-05 14:43:34 +01:00
Naomi Aro 98d50ae4a7 CC-3174 : showbuilder
different width added for dialog builder.
2012-03-02 15:47:50 +01:00
Naomi Aro b358c90cfb CC-3174 : showbuilder
making the library toggle in when pressing the edit button
2012-03-02 15:28:04 +01:00
Naomi Aro 1c43edb40b CC-3174 : showbuilder 2012-03-01 17:05:50 +01:00
Naomi Aro 99b490129c CC-3174 : showbuilder
making a dialog on the calendar page.
2012-03-01 00:19:59 +01:00
Naomi Aro a8f53d169b CC-3174 : showbuilder
sizing bit rate/sample rate in library, text right aligned.
2012-02-29 17:47:26 +01:00
Naomi Aro 7c74023ef0 CC-3174 : showbuilder
removing ugly dsahed border, keeping height for the library dragging helper.
2012-02-29 16:09:39 +01:00
Naomi Aro 997782c73c CC-3354 : playlist drag and drop
improving apperance of playlist drag and drop.
2012-02-28 13:13:40 +01:00
Naomi Aro 3cc1506086 CC-3358 : Metadata Qtip 2012-02-27 12:23:22 +01:00
Naomi Aro 19d13889af CC-3351 : Track length should only show to tenths of a second in the library
created a length formatter to use in multiple places.
2012-02-24 15:07:04 +01:00
Naomi Aro 28bb97acfa CC-3174 : showbuilder
allow user to filter library by

files/playlists or all.
2012-02-24 00:55:20 +01:00
Naomi Aro e0134ed6d1 CC-3174 : showbuilder
made width not inline.
2012-02-23 22:54:13 +01:00
Naomi Aro c665a3fa03 CC-3333 : showbuilder track colouring
tracks coloured if boundry/over.

needs better colour selection.
2012-02-23 22:23:21 +01:00
Naomi Aro 753c05ce5b CC-3335 : Timeline: Drag and drop usability improvements
cursor must be used to add tracks to timeline, not check boxes.
2012-02-23 17:46:07 +01:00
Naomi Aro b357b80054 CC-3174 : showbuilder
created controller Usersettings, noticed hosts couldn't
save datatables setting through pref controller.

starting to use new cursor arrows.
2012-02-23 12:13:00 +01:00
Naomi Aro 9b5a0fc565 CC-3174 : showbuilder
working on trying to save/load state serialized into the db for datatables.
2012-02-21 17:31:54 +01:00
Naomi Aro b1fbeeb448 CC-3174 : showbuilder
adding a showbuilder form, can filter by show,
or if you're a host user by all shows you can schedule in a range.
2012-02-15 00:39:27 +01:00
Naomi Aro 3728ffaddc CC-3174 : showbuilder
upgraded full calendar to 1.5.3 so that it works with jquery 1.7.1

need to replace context menu on the page, old one doesn't work anymore anyways.
2012-02-07 23:58:36 +01:00
Naomi Aro 42452b8ea9 Merge branch 'CC-3174' into devel
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/LibraryController.php
	airtime_mvc/application/controllers/PlaylistController.php
	airtime_mvc/application/controllers/ScheduleController.php
	airtime_mvc/application/models/Playlist.php
	airtime_mvc/application/models/StoredFile.php
	airtime_mvc/public/js/airtime/library/spl.js
2012-02-06 11:07:10 +01:00