Martin Konecny
29e24d1847
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-17 12:24:05 -04:00
Martin Konecny
cdf92b016f
CC-3655: Context menu for current show missing add/remove content and remove all content options.
...
-undone
2012-04-17 12:23:56 -04:00
Naomi Aro
6828c0b07c
Merge branch 'CC-3174' into devel
2012-04-17 18:17:05 +02:00
Naomi Aro
102bcb1d46
CC-3416 : Create password reset form
2012-04-17 18:16:10 +02:00
Martin Konecny
9c9838b35c
CC-3664: setting of pypo.cfg -> cache_for does not take effect
...
-these options are deprecated. Have been removed.
2012-04-17 10:23:15 -04:00
Martin Konecny
2c4df4853a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 18:38:55 -04:00
Martin Konecny
79b9de203d
-Better attempt at getting at least 3 items
2012-04-16 18:38:48 -04:00
James
4527da6cdf
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 18:22:03 -04:00
James
1d91d1b11b
CC-3659: Override on Master/Show Source connection needs to have
...
better description about what the override field actually does.
- fixed description
- extra fix:
- using variable instead of hard coded text
- removed unnecessary code
2012-04-16 18:21:28 -04:00
denise
27e5a6db5e
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 17:36:19 -04:00
denise
e786514f27
CC-3655: Context menu for current show missing add/remove content and remove all content options.
...
-fixed
2012-04-16 17:31:16 -04:00
James
da691dcfb7
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 17:29:18 -04:00
James
c08800468f
CC-3658: DJ assigned to the Show can't switch/kick streams
...
- fixed
2012-04-16 17:29:02 -04:00
denise
2fc591db2b
CC-3498: Calendar -> Show Content better representation of duration needed
...
-fixed
2012-04-16 17:09:54 -04:00
James
2f4861db26
CC-3444: Ability to edit currently playing show (end time and permissions)
...
- added comment
2012-04-16 17:06:06 -04:00
James
d11fca8ac8
CC-3444: Ability to edit currently playing show (end time and permissions
...
- fixed
2012-04-16 16:48:04 -04:00
James
d219c78744
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 15:25:54 -04:00
James
2e811dfef8
CC-3642: System->Streams->DJ URL changes are not reflected in Calendar
...
->LiveStream
- fixed
2012-04-16 15:23:37 -04:00
Martin Konecny
4a206b19e6
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 15:11:47 -04:00
Martin Konecny
5bc720fd4c
CC-3657: Watch Folders -> mp3 files could not be loaded
...
-fixed
2012-04-16 15:11:05 -04:00
James
90edd9d1b0
CC-3643: System->Streams - Master URL GUI is broken after overriding URL
...
setting
- fixed
2012-04-16 15:10:01 -04:00
James
9aa814212a
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 14:58:03 -04:00
James
df3acb5590
CC-3654: Cannot resize current (non-repeating) show on the calendar
...
- fixed
2012-04-16 14:57:53 -04:00
Naomi Aro
7e3112e3d7
CC-3610 : Now Playing ->songs in the Now Playing do not reflect the changes affected changed END_OF_SHOW
2012-04-16 18:31:15 +02:00
Naomi Aro
b5f48c7732
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 18:16:33 +02:00
Naomi Aro
b9d82a579f
CC-3407 : Timeline: Display if tracks are missing on disk
2012-04-16 18:16:24 +02:00
Martin Konecny
a6c0a1d2d9
-removed erroneous import
2012-04-16 12:04:35 -04:00
Martin Konecny
0bb8e7d211
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 11:46:21 -04:00
Martin Konecny
31303d26e4
CC-3651: tmp file does not copy to Pypo cache
...
-fixed
2012-04-16 11:45:48 -04:00
Naomi Aro
a0fb607d30
Merge branch 'CC-3174' into devel
2012-04-16 16:40:02 +02:00
Naomi Aro
c96c60dc5a
CC-3620 : Calendar -> Unresponsive script warning when trying to add 300 ogg files
...
improving speed of js rendering,
datatables config is loaded from localstorage,
removed aggregate propel behaviour on cc_show_instances time_filled.
2012-04-16 16:33:32 +02:00
James
63df3d5295
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-16 10:19:54 -04:00
James
0ad9177dac
CC-3648: Airtime Station time is broken
...
- fixed
2012-04-16 10:19:34 -04:00
denise
c61f74b06f
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-13 18:06:16 -04:00
denise
82130560f5
CC-3640: Refresh Datatable after "Importing in Progress" label disappears on the Playlist Builder screen.
...
-fixed
2012-04-13 18:05:31 -04:00
James
ffc17ba705
CC-3636: Media Folder: dir path in cc_music_dir should be in consistent format
...
- DateHelper.php is moved from model to common folder
- created OsPath.php file which contains normpath()
- normpath() is used instead of realpath()
2012-04-13 17:45:28 -04:00
James
a6f44226b9
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-13 17:18:52 -04:00
James
9cafc91785
CC-3456: PlaylistBuilder -> does not identify NetworkDrive outage. Attempt to
...
play unavailable track leads to platform hanging
- in cast of mount/unmoun drive has some nested folder that were already in the
cc_music_dirs table, airtime was only setting true/false flag on only one of
the entry.
2012-04-13 17:18:31 -04:00
Martin Konecny
8442932b7d
CC-3520: Change default password of monit
...
-fix names
2012-04-13 17:07:59 -04:00
Martin Konecny
6a72d6a8e8
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-13 16:58:18 -04:00
Martin Konecny
5a2d55ef84
CC-3520: Change default password of monit
...
-currently I allow it to be fixed, but I don't actually change it
from default of airtime:guest
2012-04-13 16:58:12 -04:00
denise
eff9ca85be
CC-3640: Refresh Datatable after "Importing in Progress" label disappears on the Playlist Builder screen.
...
-fixed
2012-04-13 16:52:22 -04:00
Martin Konecny
2e4cab45b3
-Logging::log works with arrays
2012-04-13 16:50:54 -04:00
Martin Konecny
377fb509a1
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-04-13 15:23:12 -04:00
Martin Konecny
26be52c459
CC-3462: If destination file already exists in pypo cache, double check if it's the correct file size
...
-had two copy functions :S
2012-04-13 15:23:01 -04:00
James
3ae8eb9105
CC-3622: When changing location of the stor directory, the "organize"
...
subfolder is not being created
- fixed
2012-04-13 15:09:59 -04:00
James
36ca2c29fc
CC-3634: Media Folder: if file was deleted from file system, and the file was
...
scheduled in the future, it wasn't marking the file as deleted
- using propel instead of PEAR DB
2012-04-13 15:03:27 -04:00
James
7a983b52ed
CC-3641: Stream Transition: When a song is added to the for the first time
...
, the transition fade effects fade in
- fixed
2012-04-13 13:25:40 -04:00
James
1bb04296a9
CC-3639: Preferences-> Fade In is interpreted improperly (it is insanely high)
...
- the regular exp check in model class was wrong
2012-04-13 12:05:59 -04:00
Naomi Aro
ef908ee894
CC-3626 : Playlist Builder -> you can not add files from Library by using "+" button (if default Fades were changed in Preferences)
2012-04-13 11:09:52 +02:00