denise
bc93119adc
Merge branch '2.1.x' into devel
2012-07-04 09:46:30 -04:00
denise
87afea63bf
CC-4065: Timeline -> Cursor will disappear after a track is finished sometimes
...
-fixed
2012-07-03 18:22:48 -04:00
denise
598bf8942c
Merge branch '2.1.x' into devel
2012-07-03 14:57:16 -04:00
denise
8a394f752b
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-07-03 14:52:53 -04:00
denise
f6d79b1f54
CC-4063: Timeline -> Add a track to a show will cause another show's cursor to be selected
...
-fixed
2012-07-03 14:52:27 -04:00
james
4384c978b0
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-07-03 13:33:26 -04:00
james
7342ea4d4b
CC-4053: Widget not showing correct day on Sunday
...
- fixed weekly widget
- also fixed today's show widget
2012-07-03 13:17:48 -04:00
denise
2bf6d0e54e
Merge branch '2.1.x' into devel
2012-07-03 12:57:25 -04:00
denise
e11fe8a2b8
CC-4058: Timeline -> Cannot add song twice if last cursor is selected
...
-fixed
2012-07-03 12:42:53 -04:00
denise
bc569462ee
CC-4057: Calendar -> Add/Remove contents: Lost cursor after add contents to a show
...
-fixed
2012-07-03 11:48:57 -04:00
denise
3e75b28c9d
Merge branch '2.1.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
2012-07-03 10:42:29 -04:00
denise
46604fdf59
CC-4046: Timeline -> cannot drag and drog song into the posion between song's name and "show empty"
...
-fixed
2012-06-29 16:59:03 -04:00
denise
7ea106e0d3
CC-4051: Library -> First character gets cut off of file name when downloading a track from a watched folder
...
-fixed
2012-06-29 16:02:27 -04:00
denise
68420a898f
CC-4044: Timeline -> Cursor keeps highlight even if the song is played
...
-fixed
2012-06-29 15:49:22 -04:00
James
6d823d01ab
CC-4042: Media Library -> Non-admin user cannot see "File import in progress"
...
- fixed
2012-06-29 12:49:59 -04:00
James
b425fbd894
CC-4045: Logging: add file name and line number on logging function
...
- done
2012-06-29 12:47:14 -04:00
denise
001f0790f9
Merge branch '2.1.x' into devel
2012-06-29 12:26:45 -04:00
denise
335dd1516b
Merge branch '2.1.x' into devel
...
Conflicts:
python_apps/pypo/liquidsoap_scripts/ls_script.liq
2012-06-29 10:57:14 -04:00
James
0b069c2f54
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-29 10:56:55 -04:00
James
a8792a7b97
CC-4042: Media Library -> Non-admin user cannot see "File import in progress"
...
- fixed. See the comment for more detail.
2012-06-29 10:55:19 -04:00
denise
38cb439f53
CC-4036: Timeline -> A new Cursor will be selected when there are 2 shows and we add/delete items in timeline view
...
-fixed
2012-06-28 17:55:17 -04:00
denise
79513de1ba
CC-4035: Timeline -> Filter by show: please let the setting automatically takes effect without clicking the button out of the 'box'
...
-also added this functionality for the 'All my shows' checkbox
2012-06-28 17:07:01 -04:00
denise
61fc269b13
CC-4035: Timeline -> Filter by show: please let the setting automatically takes effect without clicking the button out of the 'box'
...
-done
2012-06-28 16:55:43 -04:00
denise
a603d67397
fixed indentation on schedule.js
2012-06-28 15:44:55 -04:00
denise
69eb80c5ac
CC-4000: Calendar -> Add/remove content -> Show / hide columns: the selector window will pop up at background sometimes
...
-fixed
2012-06-28 15:43:48 -04:00
denise
5427fbc083
CC-4033: Record show icon gets covered with soundcloud icons (soundcloud, progress, and error)
...
-done
2012-06-28 15:23:21 -04:00
denise
47040a57dd
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-28 14:03:14 -04:00
denise
abc5b04045
fixed indentation
2012-06-28 14:02:57 -04:00
James
6c83633933
CC-4008: Inconsistent button labels for Play/Preview in Now Playing page
...
- changed everyting to "Preview"
2012-06-28 13:33:01 -04:00
James
d13ade977a
CC-4034: Files on Watched folder shouldn't be deleted physically.
...
- fixed
2012-06-28 13:28:45 -04:00
denise
0bc825947e
CC-3995: Media Library -> it takes too long time to switch page or select all from this page if set as displaying 100 item in Media Library.
...
-done
2012-06-28 11:44:30 -04:00
james
c4480a46b1
CC-4025: Suggest show colour in calendar automatically, based on show name
...
- done
2012-06-27 23:03:50 -04:00
james
443537b2db
CC-4020: Apache error found: Undefined variable: switch_start
...
- fixed
2012-06-27 22:50:46 -04:00
denise
9fb9fb3219
CC-4021: Media Library -> "+" button wont take effect if uncheck one and check another
...
-fixed
2012-06-27 17:19:55 -04:00
denise
12bf42d2f1
CC-4031: Timeline cursor vanishes when every once in a while
...
-fixed
2012-06-27 15:50:56 -04:00
denise
8141dec3b5
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-added comment
2012-06-27 15:13:03 -04:00
denise
d5a5bdd310
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-added comment
2012-06-27 14:57:47 -04:00
denise
1c345f2d36
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-27 13:13:33 -04:00
denise
bdaa64d4d1
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-fixed (originally scheduled for 2.2 - adding for 2.1.3)
2012-06-27 13:13:07 -04:00
denise
1300593e8b
CC-3975: Media Library: Try to download files from watched folder, the filename will be "true"
...
-fixed
2012-06-27 13:03:22 -04:00
Martin Konecny
0a0e873ef9
CC-4019: Library: When "Add content" is clicked, "Proccessing" image …
...
-fix small comment typo
2012-06-27 11:50:31 -04:00
denise
4015949d2a
CC-3933: Replace Airtime version number in source code with a hash of the version + uniqueId.
...
-done
2012-06-27 10:27:53 -04:00
James
31d643cee1
CC-3997: Now Playing -> Time Line: different behaviour between 'delete'
...
button and 'delete' menu items
- added confirm box on clicking delete button on now playing table
- also added confirm box on library delete button as well
2012-06-26 17:43:15 -04:00
James
576c13963d
CC-3998: Now Playing -> Time Line: confirm message for user 'delete'
...
track by context menu is misleading
- fixed
2012-06-26 17:35:07 -04:00
James
c2cc4253b3
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-26 16:56:01 -04:00
James
9a14051f0b
CC-4019: Library: When "Add content" is clicked, "Proccessing" image is keep
...
flickering
- fixed
2012-06-26 16:55:43 -04:00
denise
d892a4b5ae
CC-4009: Calendar icon cannot be clicked twice without clicking another icon first
...
-fixed
2012-06-26 16:43:36 -04:00
denise
ca3d554c07
CC-3983: Timeline cursor in Now Playing vanishes after adding a file to a show
...
-empty cursorId array after every callback
2012-06-26 15:49:17 -04:00
denise
4cb872f615
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
2012-06-26 15:37:04 -04:00
denise
05fa673e42
CC-3983: Timeline cursor in Now Playing vanishes after adding a file to a show
...
-done
2012-06-26 15:36:45 -04:00