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

10915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vanhofen
d9fc0a4a98 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Commit: ed38125791
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)
 2017-03-19 01:07:17 +01:00
vanhofen
20722a62cb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 8a75efa81a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)
 2017-03-19 01:05:31 +01:00
vanhofen
65a6270f5b remove unused g_info.delivery_system 
Origin commit data
------------------
Commit: 720269c99a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- remove unused g_info.delivery_system
 2017-03-19 01:04:48 +01:00
vanhofen
b2d81c8272 remove unused g_info.box_Type 
Origin commit data
------------------
Commit: 233886df8d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- remove unused g_info.box_Type
 2017-03-19 01:04:48 +01:00
vanhofen
61dc45da00 use g_info.hw_caps->has_fan; remove old g_info.has_fan 
Origin commit data
------------------
Commit: 4f202b19d6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- use g_info.hw_caps->has_fan; remove old g_info.has_fan
 2017-03-19 01:04:48 +01:00
vanhofen
3b3a096715 neutrinoyparser: remove workaround for Neo Twin 
Origin commit data
------------------
Commit: 59adc88491
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- neutrinoyparser: remove workaround for Neo Twin
 2017-03-19 01:04:48 +01:00
vanhofen
11240de06d controlapi: use "CST" instead of "Coolstream" ... 
because I don't know the current legal situation.


Origin commit data
------------------
Commit: 9e5c30f754
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- controlapi: use "CST" instead of "Coolstream" ...

because I don't know the current legal situation.
 2017-03-19 01:04:48 +01:00
vanhofen
ee911957d4 hardware_caps: fix has_fan and add detection of Neo Twin 
Origin commit data
------------------
Commit: c225c2d4b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-19 (Sun, 19 Mar 2017)

Origin message was:
------------------
- hardware_caps: fix has_fan and add detection of Neo Twin
 2017-03-19 01:04:48 +01:00
vanhofen
304d45fdd5 Merge branch 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	src/driver/screenshot.cpp


Origin commit data
------------------
Commit: 2fb35a8c66
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-17 (Fri, 17 Mar 2017)
 2017-03-17 13:16:26 +01:00
vanhofen
92c2a4f81a Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 301d4defa3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-17 (Fri, 17 Mar 2017)
 2017-03-17 13:14:50 +01:00
vanhofen
f85c7f92ef Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	acinclude.m4


Origin commit data
------------------
Commit: b018f610c4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-17 (Fri, 17 Mar 2017)
 2017-03-17 13:14:15 +01:00
Michael Liebmann
4f9c02f7f6 Merge branch 'master' into pu/fb-setmode 
Conflicts:
 src/driver/screenshot.h
 src/driver/screenshot.cpp
 acinclude.m4


Origin commit data
------------------
Commit: e83a255e95
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)

Origin message was:
------------------
Merge branch 'master' into pu/fb-setmode

Conflicts:
   src/driver/screenshot.h
   src/driver/screenshot.cpp
   acinclude.m4
 2017-03-17 12:43:25 +01:00
Michael Liebmann
ae84cd9cca Merge branch 'master' into pu/mp 
Conflicts:
 src/driver/screenshot.cpp
 src/Makefile.am


Origin commit data
------------------
Commit: 7e4678c6d4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)

Origin message was:
------------------
Merge branch 'master' into pu/mp

Conflicts:
   src/driver/screenshot.cpp
   src/Makefile.am
 2017-03-17 12:34:28 +01:00
Michael Liebmann
c828c5fe12 CScreenShot: Remove OpenThreads and use pthread functions 
Origin commit data
------------------
Commit: ad47a5d5e9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-17 (Fri, 17 Mar 2017)
 2017-03-17 12:19:51 +01:00
vanhofen
ea38ceb799 configure.ac: align to tuxbox code 
Origin commit data
------------------
Commit: 2d56f091b1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-17 (Fri, 17 Mar 2017)

Origin message was:
------------------
- configure.ac: align to tuxbox code
 2017-03-17 12:15:20 +01:00
vanhofen
fe4c1bcdb6 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/Makefile.am


Origin commit data
------------------
Commit: 1337e53425
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-17 (Fri, 17 Mar 2017)
 2017-03-17 09:20:14 +01:00
vanhofen
3ab316026b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	acinclude.m4
	src/Makefile.am


Origin commit data
------------------
Commit: 195c22fffa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-16 (Thu, 16 Mar 2017)
 2017-03-16 22:29:22 +01:00
vanhofen
1f913b6ec7 acinclude.m4: remove unused --enable-tmsdk switch; ... 
There's so much more unused and outdated stuff :/


Origin commit data
------------------
Commit: 93e22163e9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-16 (Thu, 16 Mar 2017)

Origin message was:
------------------
- acinclude.m4: remove unused --enable-tmsdk switch; ...

There's so much more unused and outdated stuff :/
 2017-03-16 21:12:01 +01:00
vanhofen
b61b89c606 src/Makefile.am: align to tuxbox; remove old stuff 
Origin commit data
------------------
Commit: 798d6d7909
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-16 (Thu, 16 Mar 2017)

Origin message was:
------------------
- src/Makefile.am: align to tuxbox; remove old stuff
 2017-03-16 20:03:28 +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
vanhofen
3daf7a9792 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/components/cc_detailsline.cpp


Origin commit data
------------------
Commit: 653e6d3dd3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 23:37:37 +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
Jacek Jendrzej
d5872aa9e0 enable SCREENSHOT for generic 
Origin commit data
------------------
Commit: cf126eb761
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 19:10:35 +01:00
Jacek Jendrzej
41b7873147 screenshot.cpp fix memcpy param overlap 
Origin commit data
------------------
Commit: 142ac1392f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 19:02:44 +01:00
Jacek Jendrzej
7764d7d1c3 src/neutrino.cpp fix possible memleak 
Origin commit data
------------------
Commit: f18ec050c7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 15:56:23 +01:00
Jacek Jendrzej
a31e3cfdc1 dont cal permanently settimeofday if operation not permitted 
Origin commit data
------------------
Commit: 861017a95d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 14:54:32 +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
60790d0603 Merge pull request #8 from Pr0metheus2/patch-1 
Update slovak.locale

Origin commit data
------------------
Commit: 09606c5ded
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 11:21:49 +01:00
Thilo Graf
409d5dc575 CComponentsExtTextForm: use scaled default dimension values 
Origin commit data
------------------
Commit: e498cc6b09
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 09:58:28 +01:00
Thilo Graf
de5a01942e CImageInfo: optimize label arrangement 
Distance between label and text was too large with full hd resolution.


Origin commit data
------------------
Commit: 17227504c2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 09:58:23 +01:00
Thilo Graf
451f560459 CComponentsExtTextForm: fix label width calculation 
Origin commit data
------------------
Commit: 81cde4836f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 09:58:10 +01:00
Thilo Graf
88b972aed4 CImageInfo: use global offset for item offset 
Origin commit data
------------------
Commit: 1db1182b87
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 09:57:43 +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
Jacek Jendrzej
36ea8d10e2 src/gui/streaminfo2.cpp add MP3 info 
Origin commit data
------------------
Commit: 90c68453a5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-03-14 (Tue, 14 Mar 2017)
 2017-03-14 21:34:08 +01:00
Michael Liebmann
4193a88be1 Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 49737c5ee2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-14 (Tue, 14 Mar 2017)
 2017-03-14 17:33:57 +01:00
Thilo Graf
730835160d CColorChooser: fix compile conversion warnings 
Origin commit data
------------------
Commit: 3b5cd00bf4
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-14 (Tue, 14 Mar 2017)

Origin message was:
------------------
CColorChooser: fix compile conversion warnings
 2017-03-14 09:42:30 +01:00
Thilo Graf
c591f1091c CComponentsDetailsLine: add scale to details line width 
Also added correction for odd line width values and added
method to change details line width.


Origin commit data
------------------
Commit: f5f2bf92ba
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-14 (Tue, 14 Mar 2017)
 2017-03-14 09:41:19 +01:00
Thilo Graf
d913d04880 cc_types.h: add scale to CC_WIDTH_MIN/CC_HEIGHT_MIN 
Origin commit data
------------------
Commit: df48434092
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-14 (Tue, 14 Mar 2017)
 2017-03-14 09:41:10 +01:00
Thilo Graf
830b0e43d7 settings.h: enable scale for DETAILSLINE_WIDTH 
Origin commit data
------------------
Commit: afe98d3952
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-03-14 (Tue, 14 Mar 2017)
 2017-03-14 09:41:01 +01:00
vanhofen
a61d47369c Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: f498775647
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-14 (Tue, 14 Mar 2017)
 2017-03-14 08:06:05 +01:00
vanhofen
9ec64726af .gitignore: add compile 
- .svnignore: remove


Origin commit data
------------------
Commit: 4bf9c74f59
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-14 (Tue, 14 Mar 2017)

Origin message was:
------------------
- .gitignore: add compile

- .svnignore: remove
 2017-03-14 08:04:26 +01:00
Michael Liebmann
b709d2e04c Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 12eef31a08
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-14 (Tue, 14 Mar 2017)
 2017-03-14 00:14:23 +01:00
Michael Liebmann
eef24c1982 src/uncooloff.c: Fix compile error 
Origin commit data
------------------
Commit: a3bd6bb4de
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-14 (Tue, 14 Mar 2017)
 2017-03-14 00:13:35 +01:00