Naomi Aro
41a46b3144
CC-3174 : showbuilder
2012-03-12 15:02:34 +01:00
Naomi Aro
f28f6659dc
CC-3403 : Replace Now Playing with the new Timeline screen
2012-03-12 14:23:03 +01:00
Naomi Aro
3b32a16813
CC-3174 : showbuilder
...
setting a timeout to refresh when the first item on the timeline starts incse there is no "current" item.
2012-03-12 13:25:03 +01:00
Naomi Aro
20db8d6fdf
CC-733 : broadcast logs
...
adding time range selection for the log history.
2012-03-12 11:47:25 +01:00
Daniel
470cf0dbf8
CC-3395: Play preview for playlists and timelines for shows should show a list under the pop-up player which will play the entire playlist.
...
- Updated jplayer so it now shows a list view under the player which shows details of the track being played, and for playlists the entire playlist list.
- Also enabled playing playlists from the library.
2012-03-09 18:47:08 -05:00
Naomi Aro
7c63387dd5
CC-733 : broadcast logs
...
adding the export table tools.
2012-03-09 13:39:12 +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
53b8eb2724
CC-733 : export broadcast logs
...
exporting stats based on czech law
2012-03-08 18:30:56 +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
e9627bca07
CC-3174 : showbuilder
...
only updating the timeline view if it is needed.
2012-03-07 12:20:30 +01:00
Naomi Aro
a4d07b3060
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
...
Conflicts:
airtime_mvc/public/js/airtime/library/library.js
2012-03-07 10:33:00 +01:00
Daniel
709e117f41
CC-3391: Audio Preview cannot play tracks with commas in their filename
...
- The content distribution header filename attribute, wasn't properly quoted for inline content. This causes a bug for files with comma names.
- changed the play button in library back to the speaker icon
- removed some dead code preview_player.js
- removed the file name attribute, will need better approch to presenting the user with audio information.
2012-03-06 13:50:07 -05:00
Martin Konecny
5f4738dc7a
CC-3389: Login page says copyright is 2010-2011 rather than 2010-2012
...
-fixed
2012-03-06 11:46:42 -05: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
Martin Konecny
c0f83a0e02
CC-3387: Error with accessing database on Now Playing view
...
-fixed
2012-03-06 00:05:06 -05:00
Martin Konecny
0dfcb77f1a
CC-3386: array access for "media_played" flag is hardcoded to 0
...
-fixed
2012-03-05 23:53:25 -05:00
Martin Konecny
348011dbc3
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-05 19:03:23 -05:00
Martin Konecny
9715de11f5
CC-3372: Improved pypo cache delete
...
-Done
2012-03-05 19:02:46 -05: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
Daniel
a246f85a5b
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- Merged with devel, removed js from StoredFile.php
2012-03-05 19:00:14 -05:00
Daniel
51f004933b
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- updated icon in library
2012-03-05 19:00:14 -05:00
Daniel
2de81c6027
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- updated logic removed when doing a rebase with devel
2012-03-05 19:00:14 -05:00
Daniel
aacbac4757
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- Updated functionality so user can play a track and in jplayer and jump around it.
2012-03-05 19:00:14 -05:00
Daniel
7d95e4ffa7
CC-2430 : Preview tracks in the library + better preview (ability to jump around in clip)
...
- added accept ranges header to the response to enable seek ahead in the music file.
2012-03-05 19:00:14 -05:00
Daniel
b8452928da
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- updated player ui so it matches demo code
- can play any song from the library or playlist builder, but not very usable
2012-03-05 19:00:14 -05:00
Daniel
1aab682104
CC-2430: Preview tracks in the library + better preview (ability to jump around in clip)
...
- updates to audio preview on library and playlist
2012-03-05 19:00:14 -05:00
Daniel
0b9ed43e50
Updated library functionality and started with playlist work.
2012-03-05 19:00:14 -05:00
Daniel
dd3b7afff2
Updated library so I can play a song.
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
Daniel
228a9787a8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-05 10:59:43 -05:00
Paul Baranowski
d250e2a297
CC-3380 Better names for items in the System menu
2012-03-02 17:50:52 -05:00
Martin Konecny
df22ab21a6
CC-3359: Now Playing -> Day view has a bug with supporting UTC time
...
-fixed
2012-03-02 16:32:16 -05:00
Naomi Aro
29b03c1181
CC-3174 : showbuilder
...
creating smart refresh timeout for now playing.
2012-03-02 16:27:14 +01:00
Naomi Aro
3ab375a23c
CC-3174 : showbuilder
...
chaning text on edit button.
2012-03-02 15:29:19 +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
f61afb0216
CC-3373 : Timeline: only lock the currently playing track and the one after
2012-03-02 14:01:02 +01:00
Naomi Aro
6c749075ac
CC-3369 : Ability to identify tracks that are actually inside a show in the schedule table
...
chaning column name to playout_status
2012-03-02 12:22:08 +01:00
Martin Konecny
d03d01bce9
CC-3366: Pypo: Use local files instead of downloading them
...
-done
2012-03-01 18:00:46 -05:00
Martin Konecny
508c623850
-remove comments that should not have been committed
2012-03-01 18:00:46 -05:00
Daniel
f8e7d6eae3
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-01 15:35:21 -05:00
Martin Konecny
323aec218f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-03-01 12:16:04 -05:00
Martin Konecny
d9967b9a77
-function incorrectly capitalized
2012-03-01 12:15:58 -05:00
Naomi Aro
b68204751e
CC-3174 : showbuilder
...
making sure recorded shows aren't editable.
2012-03-01 17:49:11 +01:00
Naomi Aro
b813ba1035
CC-3174 : showbuilder
...
making a time filled formatter to take the code out of show builder.
2012-03-01 17:25:37 +01:00
Naomi Aro
1c43edb40b
CC-3174 : showbuilder
2012-03-01 17:05:50 +01:00
Naomi Aro
3bfbe036c7
CC-3174 : showbuilder
...
using the new status column in cc_schedule to colour boundary/overbooked tracks.
2012-03-01 15:09:13 +01:00
Naomi Aro
0f9800a6bd
CC-3369 : Ability to identify tracks that are actually inside a show in the schedule table
2012-03-01 14:59:06 +01:00
Naomi Aro
f8608f3511
CC-3174 : showbuilder
...
percent calculation for shows was off.
2012-03-01 12:13:21 +01:00
Naomi Aro
b7e5bfe4aa
CC-3174 : showbuilder
...
changing cues/cliplengths to be interval column type.
2012-03-01 11:48:57 +01:00
Martin Konecny
92f19139b9
CC-3336: Refactor schedule API used by pypo
...
-done
2012-02-29 21:27:42 -05:00
Naomi Aro
99b490129c
CC-3174 : showbuilder
...
making a dialog on the calendar page.
2012-03-01 00:19:59 +01:00
Daniel
8b540017a5
Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x
2012-02-29 14:55:30 -05:00
Daniel
1deee3cb65
CC-3365: Airtime API returns a non-null value for next item when there is no next item.
...
- Improved check for determining if there is another element in the result set which is used to compute the next value.
2012-02-29 14:54:54 -05:00
Naomi Aro
872bd27847
CC-3174 : showbuilder
...
getting rid of useless views.
2012-02-29 18:06:53 +01:00
Naomi Aro
a9e7a70dfb
CC-3174 : showbuilder
...
fix audio preview.
2012-02-29 16:23:41 +01:00
Naomi Aro
0f91f91c41
CC-3174 : showbuilder
...
adding checks to enable/disable buttons for playlist & timeline.
2012-02-29 15:47:11 +01:00
Martin Konecny
a6413f2d1a
CC-3336: Refactor schedule API used by pypo
2012-02-28 22:33:19 -05:00
Martin Konecny
057e377c5f
Merge branch 'cc-3336-refactor-pypo' into devel
2012-02-28 19:49:48 -05:00
Martin Konecny
497715df44
Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo
...
Conflicts:
airtime_mvc/application/models/Schedule.php
python_apps/pypo/pypofetch.py
python_apps/pypo/pypopush.py
2012-02-28 19:22:13 -05:00
Naomi Aro
5257711866
CC-3174 : showbuilder
...
fixing order of scheduled/playlist data when added via group dragging.
2012-02-28 23:52:20 +01:00
Martin Konecny
b572b26b68
CC-3336: Refactor schedule API used by pypo
...
-make sure that empty arrays are objects and not arrays
-clean up some comments
2012-02-28 15:32:18 -05:00
Martin Konecny
11f31effca
CC-3336: Refactor schedule API used by pypo
2012-02-28 15:04:24 -05:00
Naomi Aro
4386690b54
CC-3174 : showbuilder
...
prevents scheduling outside a show.
2012-02-28 20:58:06 +01:00
Martin Konecny
a53d856e8d
CC-3336: Refactor schedule API used by pypo
...
-add comment
2012-02-28 14:56:21 -05:00
Martin Konecny
99c24ed038
CC-3336: Refactor schedule API used by pypo
...
-removed export_source
-rewrote GetScheduledPlaylists()
2012-02-28 14:52:44 -05:00
Martin Konecny
322d1bfa99
CC-3336: Refactor schedule API used by pypo
...
-initial commit
2012-02-28 14:43:39 -05:00
Martin Konecny
413d669bbf
Merge branch 'cc-3336-refactor-pypo' of dev.sourcefabric.org:airtime into cc-3336-refactor-pypo
...
Conflicts:
airtime_mvc/application/models/Schedule.php
python_apps/pypo/pypofetch.py
python_apps/pypo/pypopush.py
-weird conflict. I must have committed while I had my changes git-stash'ed
2012-02-28 13:58:10 -05:00
Daniel
15552319aa
CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI
...
- updated formating of file, removed tabs in favour of four spaces for some lines.
2012-02-28 13:47:57 -05:00
Naomi Aro
31abc21aaa
CC-3174 : showbuilder
...
make sure the scheduled item still exists, if not throw an error.
2012-02-28 17:16:43 +01:00
Naomi Aro
b5f510de85
CC-3174 : showbuilder
...
making sure an item is not added outside of a show.
2012-02-28 16:57:53 +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
Martin Konecny
4514967ccd
CC-3359: Now Playing -> Day view has a bug with supporting UTC time
...
-fixed
2012-02-27 21:37:23 -05:00
Daniel
fc2b18923e
CC-3337: Optimize Schedule/get-current-playlist/format/json
...
- I've updated the time interval used to search for the next, current and previously secheduled shows to 24 hours before and after from 1 hour.
2012-02-27 18:09:30 -05:00
Daniel
9736fd7deb
CC-3334: Upgrade notification reports there is an upgrade when user has a later version than the official released version
...
- I've updated the comment to read the difference between 1.9.5 and version 3.0.0 is calculated as 105
- I've also updated the checking logic to make the first outdated anything below 20 and the second outdated between 20 and 29.
2012-02-27 17:28:06 -05:00
Naomi Aro
20a82abb23
CC-3174 : showbuilder
...
forgot to return value, was getting NOW as the returned time instead.
2012-02-27 22:26:17 +01:00
Naomi Aro
99d3699e71
CC-3174 : showbuilder
...
fades displayed in seconds.
2012-02-27 21:40:04 +01:00
Naomi Aro
43d67c921d
CC-3174 : showbuilder
...
adding cue/fade columns to table
fixing schedule fade out
putting default fade between files not in a playlist.
2012-02-27 21:29:02 +01:00
Naomi Aro
6ecf2f94b0
CC-3356 : Library & Timeline : remove zero prefixes from numbers
2012-02-27 20:26:47 +01:00
Naomi Aro
564575d657
CC-3174 : showbuilder
...
fixing timezone calculations if browser/server is different.
2012-02-27 20:14:12 +01:00
Martin Konecny
e8f329aef1
CC-3336: Refactor schedule API used by pypo
2012-02-27 13:52:35 -05:00
Naomi Aro
f01a872bea
CC-3174 : showbuilder
...
remove extra ;
2012-02-27 14:59:48 +01:00
Naomi Aro
318a0345bb
CC-3174 : showbuilder
...
make sure recorded files only display year in the table.
2012-02-27 14:59:16 +01:00
Naomi Aro
9c248bb34d
CC-3174 : showbuilder
...
fixing scheduling rebroadcasts, show content.
2012-02-27 14:33:56 +01:00
Naomi Aro
4a02d12600
CC-3174 : showbuilder
...
fixing now playing to remove the playlist part.
2012-02-27 12:53:21 +01:00
Naomi Aro
8ae303de83
CC-3174 : showbuilder
...
need up to date version of datatables.
2012-02-27 12:42:04 +01:00
Naomi Aro
3cc1506086
CC-3358 : Metadata Qtip
2012-02-27 12:23:22 +01:00
Naomi Aro
36cf8ded18
CC-3174 : showbuilder
...
change columns sample rate and bitrate to be integers so they sort properly in the library.
2012-02-27 12:07:46 +01:00
James
446233fbd4
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-02-24 14:15:06 -05:00
James
2f689ed583
CC-3346: Recorder: Merge recorder with pypo
...
- Pypo fech works as msg listner for recroder now.
- recorder is part of pypo and all it does is waiting for msg from pypo
fetch and spwan a show recorder thread.
- added new parameter logger to api client. This way apiclient will log
into specific log file instead of grabbing current log file.
- show recoder is removed from all check system/status page
2012-02-24 14:11:35 -05:00
James
695535ae64
CC-3346: Recorder: Merge recorder with pypo
...
- Pypo fech works as msg listner for recroder now.
- recorder is part of pypo and all it does is waiting for msg from pypo
fetch and spwan a show recorder thread.
- added new parameter logger to api client. This way apiclient will log
into specific log file instead of grabbing current log file.
- show recoder is removed from all check system/status page
2012-02-24 13:12:50 -05:00
Naomi Aro
194de3c2bf
Merge branch 'CC-3174' into devel
2012-02-24 18:22:59 +01:00
Naomi Aro
4286de7b42
CC-3174 : showbuilder
...
bit rate & sample rate formatters
2012-02-24 18:22:07 +01:00
Naomi Aro
09ce2bc8c5
Merge branch 'CC-3174' into devel
2012-02-24 16:18:39 +01:00
Naomi Aro
3ff7d1ac18
CC-3174 : showbuilder
...
forgot to set cueout when scheduling just files.
2012-02-24 16:18:15 +01:00
Naomi Aro
b9e99afc5d
Merge branch 'CC-3174' into devel
2012-02-24 16:07:12 +01:00
Naomi Aro
c6edfc3208
CC-3174 : showbuilder
...
removing columns that no longer should be in cc_schedule.
changing cc_files length column to be of type interval.
adding length formatter to showbuilder.
2012-02-24 16:05:01 +01:00
Naomi Aro
0446fcfb25
Merge branch 'CC-3174' into devel
2012-02-24 15:07:38 +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
bc8106c5fa
Merge branch 'CC-3174' into devel
2012-02-24 00:56:46 +01:00