Commit graph

4273 commits

Author SHA1 Message Date
Jaroslav Kysela
5b75ff7e55 Try to autodetect the libiconv 2014-05-27 15:36:44 +02:00
Adam Sutton
2b54989e6f api: fix crash on passing on no subsystem 2014-05-27 10:06:39 +01:00
perexg
c8a392e1fa Merge pull request #402 from dmarion/upstream
intlconv: osx requires -liconv
2014-05-27 08:15:18 +02:00
perexg
dc666d9486 Merge pull request #404 from ProfYaffle/master
dvr.js: Adjust option spacing as per comment in PR 396
2014-05-27 08:14:44 +02:00
Ian
c95e6618d7 dvr.js: Adjust spacing to prevent word wrap on some browsers 2014-05-26 23:19:38 +01:00
Ian
5fd473dbad Merge remote-tracking branch 'upstream/master' 2014-05-26 23:13:28 +01:00
Ian
09e35b5b4c dvr.js: Adjust spacing to prevent word wrap on some browsers 2014-05-26 23:13:15 +01:00
Damjan Marion
e6bf5bbe8e intlconv: osx requires -liconv 2014-05-26 22:25:51 +02:00
Jaroslav Kysela
1c5de3a6f7 Merge branch 'osx' of git://github.com/dmarion/tvheadend into master 2014-05-26 21:58:23 +02:00
Christian Karrié
52b1099f70 Add channel UUID to JSON response 2014-05-26 21:54:39 +02:00
Jaroslav Kysela
04d684687c dvr: remove duplicate clean title code, use '_' for the unknown chars 2014-05-26 21:50:04 +02:00
Jaroslav Kysela
eddc6ea844 dvr: add the filename charset conversion from UTF-8 2014-05-26 21:36:04 +02:00
Jaroslav Kysela
d07071bf90 intlconv: use iconv for utf8 conversions 2014-05-26 21:30:10 +02:00
perexg
02f2140708 Merge pull request #399 from ProfYaffle/master
WebUI: Option grouping and help text in 'Debugging' tab; sort option in recording lists (upcoming/finished/failed)
2014-05-26 18:49:08 +02:00
perexg
b13b0ddb9b Merge pull request #400 from ckarrie/patch-1
Better usage infos for sat_xml_scan.py
2014-05-26 18:48:38 +02:00
Damjan Marion
5a8b5e7fe2 osx: initial support for OS X 2014-05-26 17:59:33 +02:00
Damjan Marion
93a49b8253 rename uuid_t to tvh_uuid_t 2014-05-26 17:57:34 +02:00
Christian Karrié
8a12c39d68 Better usage infos for sat_xml_scan.py 2014-05-26 16:53:26 +02:00
Ian
87a5b310c2 dvr.js: Add local sort capability to recording lists 2014-05-26 15:36:16 +01:00
Ian
f77cd7c4e5 tvhlog.js: Option grouping for consistency with rest of interface; correction of option label capitalisation 2014-05-26 15:35:35 +01:00
Ian
e3d333a493 WebUI: Added placeholder help text and image for Debugging tab 2014-05-26 15:33:25 +01:00
Jaroslav Kysela
d46c06d770 scanfile: omit zero prefixes in the satellite position 2014-05-26 15:34:06 +02:00
Jaroslav Kysela
65a3c45ad4 httpc/satip: Use common error codes instead linux specific ones 2014-05-26 15:27:32 +02:00
Jaroslav Kysela
1418b64112 scanfile: Add satellite.xml database support (enigma2, satellites-xml.eu)
- also improve the linuxdvb scanfile database fetching
2014-05-26 15:11:27 +02:00
perexg
7e8b36ba1e Merge pull request #396 from ProfYaffle/master
WebUI tidy-up: Option groupings, updated help text, and user option to determine page size for upcoming/completed/failed recordings.
2014-05-26 11:25:11 +02:00
Jaroslav Kysela
7168f41a12 scanfile: Sort the dvb-s networks by orbital position 2014-05-26 10:42:41 +02:00
Jaroslav Kysela
681899c9fb udp: Fix compilation on Linux 2014-05-26 08:48:21 +02:00
perexg
d177c5d885 Merge pull request #394 from dmarion/upstream
Remove dependency on linux dvb headers, compilation fixes
2014-05-26 08:29:10 +02:00
Damjan Marion
09f716e1ad satip: missing comparison 2014-05-26 02:41:22 +02:00
Damjan Marion
63b3b13a72 udp: some compilers doesn't like return = syntax 2014-05-25 23:13:37 +02:00
Damjan Marion
17f2d7c222 udp: use if_nametoindex instead of SIOCGIFINDEX ioctl
if_nametoindex is more portable and shorter
2014-05-25 23:13:36 +02:00
Damjan Marion
6f03dd8aa3 webui: load mpegts.js even if linuxdvb is disabled
DVB input tabs are also needed for IPTV service.
Also this fixes webui which doesn't load properly
when --disable-linuxdvb is used.
2014-05-25 23:13:36 +02:00
Jaroslav Kysela
ecdda481f5 udp: fix error messages for IPv6 multicast not supported 2014-05-25 22:11:15 +02:00
Ian
cd969aad82 timeshift.js: Code cosmetics 2014-05-25 20:41:36 +01:00
Jaroslav Kysela
fbe885b79d rtsp: Use session header also for the options cmd 2014-05-25 21:02:13 +02:00
Jaroslav Kysela
67d1f18164 udp: fix ifname handling in udp_connect 2014-05-25 21:01:59 +02:00
Ian
2e902b19ca Webui: Add scroll bars to general config and recording lists (fixes #2113) 2014-05-25 14:59:40 +01:00
Ian
350cbd8d3e config.js: Code formatting 2014-05-25 11:06:07 +01:00
Ian
b23472ce51 Rebase after PR #381
Conflicts:
	src/webui/static/app/config.js
	src/webui/static/app/dvr.js
	src/webui/static/app/timeshift.js
2014-05-24 23:28:07 +01:00
Jaroslav Kysela
9ec9423292 udp: a little ifname optimization 2014-05-24 22:25:56 +02:00
Jaroslav Kysela
44d17ae601 Merge commit 'c3772ce7a2c43097dc16dac3b41ccd726e150d56' 2014-05-24 22:21:32 +02:00
perexg
2a802aca86 Merge pull request #381 from clandmeter/cosmetics
webui: cosmetics cleanup
2014-05-24 22:17:25 +02:00
Ian
01f2cce203 config_misc.html: Cosmetics, spelling/grammar, embedded image. 2014-05-24 16:40:26 +01:00
Ian
b5d2236280 config_misc.html: Cosmetics, spelling/grammar, embedded image. 2014-05-24 16:37:53 +01:00
Ian
30ff96a024 timeshift.js: Cosmetics - option layout, groupings plus updates to help text and image.. 2014-05-24 16:17:34 +01:00
Ian
12f26763ef config_dvr.html: Updated description of caching scheme and attached more up-to-date screenshot for help page. 2014-05-24 15:59:13 +01:00
Ian
92bda9c357 config.js: Cosmetics - Arrange options into like groupings. 2014-05-24 15:32:37 +01:00
Ian
6b5cb087bc dvr.js: Cosmetics - Arrange dvr options into like groupings. 2014-05-24 14:11:22 +01:00
Ian
9e775e2b70 dvr.js: Changed layout to group like options 2014-05-24 14:07:20 +01:00
Ian
52c6ff57dc dvr.js: Add user-selectable page size for upcoming/completed/failed recordings. 2014-05-24 13:42:15 +01:00