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 |
|
Cliff
|
a1768aaac5
|
force install of unsigned package
|
2012-08-03 15:20:05 -04:00 |
|
Cliff
|
edd4cbba13
|
Merge branch '2.1.x' into devel
|
2012-08-03 14:25:54 -04:00 |
|
Cliff
|
17e2417f18
|
put apt-get args in correct location
|
2012-08-03 14:24:39 -04:00 |
|
Martin Konecny
|
c3783a15b2
|
Merge branch '2.1.x' into devel
|
2012-08-03 12:53:32 -04:00 |
|
Martin Konecny
|
8d2348606c
|
CC-4147: Make Airtime work nicer with Debian package generation scripts.
-make sure we modify sources.list before doing apt-get update
|
2012-08-03 12:53:11 -04:00 |
|
Martin Konecny
|
42738c98a3
|
Merge branch '2.1.x' into devel
|
2012-08-03 11:14:05 -04:00 |
|
Martin Konecny
|
f98bd5b8f2
|
CC-4147: Make Airtime work nicer with Debian package generation scripts.
-add "--disable-deb-check" option
|
2012-08-03 11:13:17 -04:00 |
|
Martin Konecny
|
992dbfdbc2
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-03 09:46:08 -04:00 |
|
Martin Konecny
|
eb4b3cfcfa
|
Merge branch '2.1.x' into devel
Conflicts:
install_full/ubuntu/airtime-full-install
|
2012-08-03 09:45:55 -04:00 |
|
Martin Konecny
|
df2025d7bc
|
CC-4147: Make Airtime work nicer with Debian package generation scripts.
-remove integrated liquidsoap binaries
|
2012-08-03 09:44:41 -04:00 |
|
Martin Konecny
|
3f10f94d8f
|
CC-4147: Make Airtime work nicer with Debian package generation scripts.
-liquidsoap is installed from sofab repo
-make sure new deb-multimedia name takes effect
|
2012-08-03 09:42:41 -04:00 |
|
Martin Konecny
|
194b4ec36e
|
Merge branch '2.1.x' into devel
|
2012-08-02 18:10:12 -04:00 |
|
Martin Konecny
|
4f1300f58a
|
CC-3412: Icecast stream name not defined
|
2012-08-02 18:08:17 -04:00 |
|
denise
|
d18acfdc75
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-02 17:17:52 -04:00 |
|
denise
|
2a7c5eef64
|
CC-84: Smart Playlists
- added no-wrap class to qtip
|
2012-08-02 17:17:44 -04:00 |
|
denise
|
8e67ecff0a
|
CC-84: Smart Playlists
- added a no-wrap class to qtip
|
2012-08-02 17:17:13 -04:00 |
|
James
|
82970c6e73
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-02 17:04:49 -04:00 |
|
James
|
af939469d3
|
CC-84: Smart Playlists
- fixed bug on expanding block
- fixed text bug
|
2012-08-02 17:03:54 -04:00 |
|
denise
|
361e681a59
|
CC-84: Smart Playlists
- remove 'add to playlist' option on showbuilder screen
|
2012-08-02 16:50:35 -04:00 |
|
denise
|
ef994aa449
|
CC-84: Smart Playlists
- block options scroll for small screens
|
2012-08-02 16:40:32 -04:00 |
|
James
|
028e089c82
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
airtime_mvc/application/models/Block.php
|
2012-08-02 16:37:12 -04:00 |
|
James
|
0d2d8218bf
|
CC-84: Smart Playlists
- audio preview on playlist
- cleaning up some code
|
2012-08-02 16:36:12 -04:00 |
|
Martin Konecny
|
a146fdcd37
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
|
2012-08-02 16:27:00 -04:00 |
|
Martin Konecny
|
fcce4bf64c
|
CC-1665: Scheduled stream rebroadcasting and recording
-cancelling a webstream works
|
2012-08-02 16:26:41 -04:00 |
|
Martin Konecny
|
9cc152c0ae
|
CC-1665: Scheduled stream rebroadcasting and recording
-validate form fields of new webstream
|
2012-08-02 15:45:15 -04:00 |
|
denise
|
4fca33c5fc
|
CC-84: Smart Playlists
- removed block from right side if it gets deleted from context menu
|
2012-08-02 12:59:00 -04:00 |
|