mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,678 Commits 2 Branches 9 Tags
cb7b9726ef1b20eb8b04c5bd46b214b4e4d2eee8
Commit Graph

1680 Commits

Author SHA1 Message Date
vanhofen
ce5eb71ba1 locale: clearify hints for bisection jumps 
Origin commit data
------------------
Commit: 22d36d3e83
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- locale: clearify hints for bisection jumps
 2017-05-16 15:59:04 +02:00
vanhofen
497db594c1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	configure.ac


Origin commit data
------------------
Commit: ff2ee78317
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)
 2017-05-16 15:28:08 +02:00
vanhofen
4d2bab5fa0 deutsch.locale: minor change 
Origin commit data
------------------
Commit: e99b0188ab
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-16 (Tue, 16 May 2017)

Origin message was:
------------------
- deutsch.locale: minor change
 2017-05-16 15:26:20 +02:00
vanhofen
77ac470486 movieplayer: allow bisectional jumps with RC_page_up/down 
based upon code by TangoCash


Origin commit data
------------------
Commit: ca218e5390
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-13 (Sat, 13 May 2017)

Origin message was:
------------------
- movieplayer: allow bisectional jumps with RC_page_up/down

based upon code by TangoCash
 2017-05-13 17:45:59 +02:00
Jacek Jendrzej
e6f3ee9c94 Merge branch 'master' into pu/mp 
except 3e0a8d3ff0 2d4130dab8


Origin commit data
------------------
Commit: fb23ac0126
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-10 (Wed, 10 May 2017)
 2017-05-10 15:37:31 +02:00
Thilo Graf
ccdf4ef3da Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 60fed9cc02
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-10 (Wed, 10 May 2017)
 2017-05-10 10:45:28 +02:00
vanhofen
a7ec15ee9c locale: small changes in EPG Plus titles 
Origin commit data
------------------
Commit: 3b53914eba
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-09 (Tue, 09 May 2017)

Origin message was:
------------------
- locale: small changes in EPG Plus titles
 2017-05-09 14:05:32 +02:00
vanhofen
b394608761 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	data/locale/deutsch.locale


Origin commit data
------------------
Commit: 66e3c79ee1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-09 (Tue, 09 May 2017)
 2017-05-09 13:19:56 +02:00
vanhofen
7db4f0e954 locale: minor changes in EPG-Plus locales 
Origin commit data
------------------
Commit: 468fbcd79c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-09 (Tue, 09 May 2017)

Origin message was:
------------------
- locale: minor changes in EPG-Plus locales
 2017-05-09 11:40:32 +02:00
vanhofen
6c8e98d454 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 4b76adcc02
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)
 2017-05-08 23:50:19 +02:00
vanhofen
4120703710 icons: add new icons for epg-button 
Origin commit data
------------------
Commit: b44a047e7e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-08 (Mon, 08 May 2017)

Origin message was:
------------------
- icons: add new icons for epg-button
 2017-05-08 17:39:34 +02:00
vanhofen
692b8dd7f5 Merge branch 'master' into pu/mp 
Conflicts:
	src/gui/epgplus.cpp


Origin commit data
------------------
Commit: 064f693bf7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)
 2017-04-08 14:36:12 +02:00
vanhofen
d2bd535b8b Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 30d4d6e7f0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)
 2017-04-08 14:33:53 +02:00
vanhofen
367caafa0b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a0624cf4a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)
 2017-04-08 14:32:18 +02:00
Michael Liebmann
4421bc1b5e Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: f0ae55707a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-04-08 (Sat, 08 Apr 2017)
 2017-04-08 14:17:34 +02:00
vanhofen
1da8713577 osd_setup: add new epgplus font 
Origin commit data
------------------
Commit: 7b7430969a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- osd_setup: add new epgplus font
 2017-04-08 14:11:28 +02:00
vanhofen
bb03a67aa7 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 053d97363c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)
 2017-03-29 21:02:27 +02:00
vanhofen
8256e43edf Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: fdd22d414d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)
 2017-03-29 21:01:22 +02:00
vanhofen
67a53b9d53 locale: minor changes 
Origin commit data
------------------
Commit: 923daa87da
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)

Origin message was:
------------------
- locale: minor changes
 2017-03-29 08:11:36 +02:00
vanhofen
dd6d985e19 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale


Origin commit data
------------------
Commit: 1107088c0b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-29 (Wed, 29 Mar 2017)
 2017-03-29 08:05:10 +02:00
Michael Liebmann
7d49a497b5 CStreamInfo2: Add new info items 
- Videosystem
 - OSD Resolution


Origin commit data
------------------
Commit: f7cea75f37
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)
 2017-03-28 23:56:57 +02:00
vanhofen
34db9183e5 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 7dfd4184ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-27 (Mon, 27 Mar 2017)
 2017-03-27 18:15:27 +02:00
vanhofen
c271e77e9d Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	acinclude.m4


Origin commit data
------------------
Commit: a9842aa1d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)
 2017-03-26 23:25:43 +02:00
Michael Liebmann
dee1c05e9c Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: d9ce33a69a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-23 (Thu, 23 Mar 2017)
 2017-03-23 18:58:48 +01:00
vanhofen
8eaed748dd Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: f47b58c9db
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-23 (Thu, 23 Mar 2017)
 2017-03-23 15:17:28 +01:00
vanhofen
e7eb5ee437 cables.xml: update WTC SN; thanks to Gorcon 
Origin commit data
------------------
Commit: 608c092685
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-23 (Thu, 23 Mar 2017)

Origin message was:
------------------
- cables.xml: update WTC SN; thanks to Gorcon
 2017-03-23 12:23:56 +01:00
vanhofen
6be96387f6 deutsch.locale: remove obsolete rclock.menueadd entry 
Origin commit data
------------------
Commit: 3137e15457
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-21 (Tue, 21 Mar 2017)

Origin message was:
------------------
- deutsch.locale: remove obsolete rclock.menueadd entry
 2017-03-21 14:49:12 +01:00
vanhofen
85fab3c019 Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	data/locale/english.locale
	data/pictures/backgrounds/1280x720/shutdown.jpg
	src/Makefile.am
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Commit: 40e46a0df3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 23:45:02 +01:00
vanhofen
aa7d4ff017 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Commit: 55743aff0c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 23:39:43 +01:00
TangoCash
317bac3394 Merge branch 'pu/mp' of github.com:tuxbox-neutrino/gui-neutrino into pu/mp 
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Commit: 81fb3b42fa
Author: TangoCash <eric@loxat.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 22:47:42 +01:00
vanhofen
6c57da28be Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 4cab22024f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 22:47:35 +01:00
Michael Liebmann
b02e3e871e Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: b190e0c4ff
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 21:19:08 +01:00
TangoCash
c1bb877834 add unicable2/jess (thx DboxOldie) 
Origin commit data
------------------
Commit: f974b56343
Author: TangoCash <eric@loxat.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 19:51:20 +01:00
vanhofen
e7b2595929 locale: re-add some minor elipses fixes 
Origin commit data
------------------
Commit: 530601cd5f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)

Origin message was:
------------------
- locale: re-add some minor elipses fixes
 2017-03-15 11:33:54 +01:00
vanhofen
94ec16fa5e pictures: re-add familiar shutdown picture 
Origin commit data
------------------
Commit: 4a30321468
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)

Origin message was:
------------------
- pictures: re-add familiar shutdown picture
 2017-03-15 09:47:07 +01:00
vanhofen
38b3d6c33f icons: re-add some familiar icons 
Origin commit data
------------------
Commit: 696f5ae5f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)

Origin message was:
------------------
- icons: re-add some familiar icons
 2017-03-15 09:47:07 +01:00
max_10
4de1d7dfd6 unicable jess added (thx DboxOldie) 
Origin commit data
------------------
Commit: dc9232b7e9
Author: max_10 <max_10@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 09:47:07 +01:00
Andrej Tobola
1bce68ca08 Update slovak.locale 
Origin commit data
------------------
Commit: 9cefe16d4b
Author: Andrej Tobola <andrej.tobola+gifthub@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 09:32:43 +01:00
vanhofen
7dd5854d20 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: e7ff6d5493
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)
 2017-03-12 21:59:40 +01:00
Michael Liebmann
f9abc1c985 Revert "- allow to force given osd resolution in "videosystem = auto" mode" 
This reverts commit b9472250c3.


Origin commit data
------------------
Commit: 5ce34d5cf9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-12 (Sun, 12 Mar 2017)
 2017-03-12 06:32:52 +01:00
vanhofen
f718dab341 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: 66cbc06b01
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)
 2017-03-06 23:54:02 +01:00
vanhofen
b9472250c3 allow to force given osd resolution in "videosystem = auto" mode 
Origin commit data
------------------
Commit: 6fc24e990b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- allow to force given osd resolution in "videosystem = auto" mode
 2017-03-06 23:50:15 +01:00
Stefan Seyfried
b93f4e419a Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: abec1c311b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)
 2017-03-04 19:32:30 +01:00
vanhofen
9f3dad285f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 6673ffd4ea
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-03 (Fri, 03 Mar 2017)
 2017-03-03 10:38:14 +01:00
Michael Liebmann
3a8adb94f0 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 6c3b5dcd93
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-02 (Thu, 02 Mar 2017)
 2017-03-02 23:38:19 +01:00
vanhofen
e714a2ae52 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/update.cpp


Origin commit data
------------------
Commit: cd96638c45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
 2017-03-01 18:18:07 +01:00
vanhofen
66b44f2a0f flashtool: localize getType() function 
Origin commit data
------------------
Commit: 950f74dd41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- flashtool: localize getType() function
 2017-03-01 18:16:09 +01:00
vanhofen
a360c99a70 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: c3ed2ed700
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
 2017-03-01 13:10:36 +01:00
vanhofen
260127f781 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/movieplayer.cpp
	src/nhttpd/tuxboxapi/controlapi.cpp


Origin commit data
------------------
Commit: f30f4da574
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
 2017-03-01 13:09:50 +01:00
vanhofen
8e36032281 yWeb: unify rec/zap timer handling; avoid german umlaut in js-popup 
Origin commit data
------------------
Commit: 5edc857122
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- yWeb: unify rec/zap timer handling; avoid german umlaut in js-popup
 2017-03-01 11:51:25 +01:00