Martin Konecny
|
9eebdd7d50
|
remove useless entries in .gitignore
|
2012-08-08 11:52:17 -04:00 |
Martin Konecny
|
3dc96e3422
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-08 11:48:57 -04:00 |
Martin Konecny
|
762b8e1e46
|
CC-4173: ReplayGain calculation fails on Ubuntu Lucid amd64
-added logging to see what exception could be
-incorrectly using temp_file_path instead of original file_path to find extension
|
2012-08-08 11:48:50 -04:00 |
James
|
aacf65cca6
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-08 11:47:08 -04:00 |
James
|
61e38381af
|
CC-4176: Smart Playlist: Set implicit item limit when user uses time as a limit
- done
|
2012-08-08 11:46:48 -04:00 |
Martin Konecny
|
9510c1a295
|
CC-4173: ReplayGain calculation fails on Ubuntu Lucid amd64
-fixed exception
|
2012-08-08 10:51:29 -04:00 |
Martin Konecny
|
f8d63b70d8
|
fix installer breaking liquidsoap package install
|
2012-08-08 00:21:19 -04:00 |
Martin Konecny
|
f33485f8ea
|
Merge branch '2.1.x' into devel
|
2012-08-08 00:09:13 -04:00 |
Martin Konecny
|
333c8ec211
|
slightly improved PHP logging format
|
2012-08-08 00:08:46 -04:00 |
Martin Konecny
|
18ca6b22cb
|
CC-1665: Scheduled stream rebroadcasting and recording
-add placeholder icons for smart playlists/webstreams
|
2012-08-07 23:44:21 -04:00 |
Martin Konecny
|
230c3399ef
|
CC-1665: Scheduled stream rebroadcasting and recording
-fix newlines appearing in playlist/webstream title
-disable autosave of playlist/webstream title
|
2012-08-07 20:48:58 -04:00 |
Martin Konecny
|
db36870aec
|
CC-1665: Scheduled stream rebroadcasting and recording
-fix creator id on another SQL query
|
2012-08-07 20:38:36 -04:00 |
Martin Konecny
|
8876b312fb
|
CC-4167: Create new playlist doesn't work
-fixed
|
2012-08-07 19:49:59 -04:00 |
Martin Konecny
|
1dddaa0ba2
|
CC-1665: Scheduled stream rebroadcasting and recording
-refresh library to show new stream after save
|
2012-08-07 19:49:26 -04:00 |
Martin Konecny
|
47ae223a1c
|
CC-1665: Scheduled stream rebroadcasting and recording
-fix SQL error
|
2012-08-07 19:23:42 -04:00 |
Martin Konecny
|
d9e8e7d4cb
|
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
|
2012-08-07 17:41:46 -04:00 |
Martin Konecny
|
b5e542ad36
|
make sure airtime-liquidsoap DNE before attempting to create
|
2012-08-07 17:41:24 -04:00 |
denise
|
9b805f0a01
|
CC-4159: Playlist Builder -> Smart Playlist : "+" for modifier disappears if 3 or more Criteria
-fixed
|
2012-08-07 17:40:47 -04:00 |
denise
|
4ee232944d
|
CC-4169: Playlist Builder: Smart Playlist time validates even if time isn't given
-fixed
|
2012-08-07 16:27:18 -04:00 |
denise
|
9c678c0429
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-07 16:18:00 -04:00 |
denise
|
97943a6af8
|
CC-4157: Playlist Builder -> Smart Playlist -> Wrong warning msg if trying to input 0000-00-00 into Upload criteria
-fixed
|
2012-08-07 16:17:24 -04:00 |
James
|
0fe501508e
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-07 15:54:42 -04:00 |
James
|
171825e19a
|
CC-4148: Playlist Builder: Please add a 'Processing' for generating Smart playlist
- added processing box
|
2012-08-07 15:54:16 -04:00 |
denise
|
f6dffc95c8
|
CC-4158: Playlist Builder -> Smart Playlist: Warning msg field is a little bit longer
-fixed
|
2012-08-07 15:22:32 -04:00 |
denise
|
152a97917d
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-07 15:20:32 -04:00 |
denise
|
823ab1dd41
|
CC-4162: Smart Playlist Builder: extra space in between limit and error message
-fixed
|
2012-08-07 15:20:12 -04:00 |
denise
|
550c97a2dc
|
CC-4154L: Indicate whether a show has scheduled content on the calendar page
-done
|
2012-08-07 14:57:04 -04:00 |
James
|
2f8d0b77fa
|
CC-4149: Playlist Builder: Fail to generate Smart Playlist with 5000 items
- set the items limit to 500
|
2012-08-07 14:53:07 -04:00 |
denise
|
d05661afff
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-07 11:08:34 -04:00 |
denise
|
2c0f7bf03b
|
CC-4145: Playlist Builder: Alert pops up when clicking 'Add to playlist' in context menu of Smart Playlist to add it into regular playlist
-fixed
|
2012-08-07 11:08:00 -04:00 |
Martin Konecny
|
e20289e5cf
|
Merge branch '2.1.x' into devel
|
2012-08-06 17:17:05 -04:00 |
Martin Konecny
|
975abbaf10
|
Remove unecessary information being sent from API
|
2012-08-06 17:16:43 -04:00 |
Martin Konecny
|
689de126fd
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-06 17:10:55 -04:00 |
Martin Konecny
|
48a1bf3f02
|
Merge branch '2.1.x' into devel
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/models/Show.php
|
2012-08-06 17:10:46 -04:00 |
Martin Konecny
|
d00f498fb3
|
Merge branch '2.1.x' of dev.sourcefabric.org:airtime into 2.1.x
|
2012-08-06 17:07:26 -04:00 |
Martin Konecny
|
40023d9086
|
CC-4152: Widget does not display current show in some modes
-fixed
|
2012-08-06 17:07:18 -04:00 |
Daniel James
|
135e40703d
|
Disable installation of Liquidsoap symlink
|
2012-08-06 14:39:26 +01:00 |
Daniel James
|
c4ac73a750
|
Remove trailing whitespace
|
2012-08-06 14:38:10 +01:00 |
Daniel James
|
b2ef909a9d
|
Prerm does not support purge option
|
2012-08-06 14:19:50 +01:00 |
Daniel James
|
f927b9da67
|
Remove python:Depends as it is unused
|
2012-08-06 11:35:25 +01:00 |
Daniel James
|
e68a0e463e
|
Use --disable-deb-check option of install script
|
2012-08-06 11:34:17 +01:00 |
Martin Konecny
|
688051b59e
|
CC-1665: Scheduled stream rebroadcasting and recording
-Remove sX_name from being inserted into DB
|
2012-08-03 18:45:43 -04:00 |
Martin Konecny
|
1891a11373
|
CC-1665: Scheduled stream rebroadcasting and recording
-Step 1 to make Liquidsoap send back web stream metadata to UI
|
2012-08-03 18:45:22 -04:00 |
Martin Konecny
|
f901e13a84
|
CC-1665: Scheduled stream rebroadcasting and recording
-Make playlist builder show creator name instead of creator id
|
2012-08-03 18:06:47 -04:00 |
Martin Konecny
|
b23b9a0cbd
|
CC-1665: Scheduled stream rebroadcasting and recording
-allow to filter by webstream only
|
2012-08-03 16:33:58 -04:00 |
Martin Konecny
|
3b25f676c9
|
CC-3412: Icecast stream name not defined
-fix name being assigned twice
|
2012-08-03 16:20:48 -04:00 |
Martin Konecny
|
183937b8e9
|
CC-1665: Scheduled stream rebroadcasting and recording
-when editing string should hav 00h 00m format.
|
2012-08-03 16:18:45 -04:00 |
Martin Konecny
|
56961e5f48
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-03 15:59:48 -04:00 |
Martin Konecny
|
0ea66fc33f
|
CC-1665: Scheduled stream rebroadcasting and recording
-ability to edit playlists
|
2012-08-03 15:59:34 -04:00 |
Cliff
|
31fba29cc9
|
Merge branch '2.1.x' into devel
|
2012-08-03 15:20:36 -04:00 |