mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 02:11:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
8,978 Commits 2 Branches 9 Tags
e5df342b4f63a02537619a11f86320ddd1d2458c
Commit Graph

8978 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacek Jendrzej
bf0624760c src/gui/osd_setup.cpp supplement to 7bafa13c , fix segfault if clock is NULL# 
Origin commit data
------------------
Commit: ddd9bd3ca9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 22:54:53 +01:00
vanhofen
2a769e02ce Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 8d598b3d28
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 22:21:35 +01:00
vanhofen
130ba10bd4 moviebrowser: use small offset in header to display channellogo 
Origin commit data
------------------
Commit: 9b79662575
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- moviebrowser: use small offset in header to display channellogo
 2016-11-07 21:11:13 +01:00
vanhofen
5f1e7af7a9 listbox/moviebrowser: replace internal offsets with global defines 
Origin commit data
------------------
Commit: b24ec63577
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- listbox/moviebrowser: replace internal offsets with global defines
 2016-11-07 21:10:21 +01:00
vanhofen
b7a21ec8ae settings.h: add OFFSET_INNER_MIN define 
Origin commit data
------------------
Commit: 11383271ad
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- settings.h: add OFFSET_INNER_MIN define
 2016-11-07 21:09:45 +01:00
vanhofen
3449a434d4 cc_frm_header: use OFFSET define 
Origin commit data
------------------
Commit: 15e24a3e66
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- cc_frm_header: use OFFSET define
 2016-11-07 21:08:51 +01:00
vanhofen
87d5f81006 Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 0159ed78a0
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 20:42:11 +01:00
vanhofen
3502ffd80d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: de468d8016
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 20:40:57 +01:00
TangoCash
d1e313b4f3 fix epgtitle 
Origin commit data
------------------
Commit: 32c6eaf031
Author: TangoCash <eric@loxat.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 20:36:34 +01:00
FlatTV
3a31450471 Merge branch 'ni/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/tuxbox 
Origin commit data
------------------
Commit: 1915f59d91
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 17:35:54 +01:00
vanhofen
4de89cd1f6 moviebrowser: increase default browserFrameHeight 
Origin commit data
------------------
Commit: 16dfc2d5e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- moviebrowser: increase default browserFrameHeight
 2016-11-07 14:50:50 +01:00
vanhofen
7c249335f1 Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/widget/listframe.cpp


Origin commit data
------------------
Commit: aa2517293f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 13:48:21 +01:00
vanhofen
9e86fba5d9 Merge branch 'master' into pu/moviebrowser 
Origin commit data
------------------
Commit: c65dac6283
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 13:46:01 +01:00
vanhofen
eedddf19ce moviebrowser: allow round borders in filter selection 
Origin commit data
------------------
Commit: 5ca710ed4b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- moviebrowser: allow round borders in filter selection
 2016-11-07 13:45:55 +01:00
vanhofen
738182d80f listframe: allow round borders 
Origin commit data
------------------
Commit: c7942adb8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- listframe: allow round borders
 2016-11-07 13:45:55 +01:00
vanhofen
114a75f363 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 0f03766246
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)
 2016-11-07 10:14:17 +01:00
vanhofen
7886ea960e timerlist: just small code cosmetics 
Origin commit data
------------------
Commit: 8ac3b64e75
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- timerlist: just small code cosmetics
 2016-11-07 10:13:04 +01:00
Thilo Graf
e4bc926b72 Merge branch 'master' into pu/msgbox 
Origin commit data
------------------
Commit: 3e7a1943c3
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)
 2016-11-06 23:16:36 +01:00
vanhofen
704b2845ce Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: a5632fdd76
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)
 2016-11-06 21:08:43 +01:00
vanhofen
d9c9f402e9 epgview: use movie-info's channelname in movieplayer mode to get channellogo 
Origin commit data
------------------
Commit: 3b25694983
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)

Origin message was:
------------------
- epgview: use movie-info's channelname in movieplayer mode to get channellogo
 2016-11-06 20:54:26 +01:00
vanhofen
e95b9083a0 acinclude.m4: fix WEBTVDIR 
Origin commit data
------------------
Commit: 3a0c196513
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)

Origin message was:
------------------
- acinclude.m4: fix WEBTVDIR
 2016-11-06 20:52:14 +01:00
FlatTV
e195f3c315 timerlist: try to fix segfault in askUserOnTimerConflict() 
Origin commit data
------------------
Commit: b70160a992
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)

Origin message was:
------------------
- timerlist: try to fix segfault in askUserOnTimerConflict()
 2016-11-06 20:51:09 +01:00
vanhofen
3187257edc Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 7b469ff17d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)
 2016-11-06 20:30:18 +01:00
Jacek Jendrzej
699d6a311b src/gui/scan_setup.cpp use CHintBox for reloadchannels 
Origin commit data
------------------
Commit: c0ce2a0d3b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-06 (Sun, 06 Nov 2016)
 2016-11-06 18:45:01 +01:00
FlatTV
2172180021 capmt: set rmode only if recording channel use CI 
Origin commit data
------------------
Commit: 07c090b9cc
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)
 2016-11-06 10:46:50 +01:00
FlatTV
72d1110d5e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 53016b4818
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-11-06 (Sun, 06 Nov 2016)
 2016-11-06 08:15:03 +01:00
vanhofen
5e38b543fc locale: update slovak; thx to Pr0metheus 
Origin commit data
------------------
Commit: 7cbe38e249
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)

Origin message was:
------------------
- locale: update slovak; thx to Pr0metheus
 2016-11-05 22:15:49 +01:00
vanhofen
ffefe5c75e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 3eca5d6bab
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)
 2016-11-05 21:22:15 +01:00
Thilo Graf
30243eb2b5 CComponentsInfoBox: ensure matching object height after assigned image 
Images are not defined with constructor, so it is possible we must
consider the image height after called setPicture() methode.
This is important if an infobox sould be
added into a cc form object. This avoids overlapping of dynamic added items.


Origin commit data
------------------
Commit: 18695fb0c9
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)
 2016-11-05 21:17:31 +01:00
vanhofen
03f02ab6da Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 84d2cfab81
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)
 2016-11-05 21:11:46 +01:00
vanhofen
78d9f348bf Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: e893472e77
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)
 2016-11-05 21:11:37 +01:00
vanhofen
0b4bd34965 Merge branch 'master' into pu/moviebrowser 
Origin commit data
------------------
Commit: 664bd8dcf9
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)
 2016-11-05 21:09:27 +01:00
vanhofen
225ef6a169 timermanager: try to fix successive timers 
Origin commit data
------------------
Commit: 7c74d0bc3b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)

Origin message was:
------------------
- timermanager: try to fix successive timers
 2016-11-05 21:07:12 +01:00
Thilo Graf
eb0224cfc9 Merge branch 'master' into pu/msgbox 
Origin commit data
------------------
Commit: 28a146e0ba
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-05 (Sat, 05 Nov 2016)
 2016-11-05 00:08:05 +01:00
Thilo Graf
5877fb6a49 CComponentsInfoBox: fix missing calculation of image position with parent 
Origin commit data
------------------
Commit: 90a693a1ec
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-04 (Fri, 04 Nov 2016)
 2016-11-04 23:56:29 +01:00
vanhofen
b00f976d54 deutsch.locale: minor changes in menu.hint_record_tevents 
Origin commit data
------------------
Commit: 7276489faf
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-04 (Fri, 04 Nov 2016)

Origin message was:
------------------
- deutsch.locale: minor changes in menu.hint_record_tevents
 2016-11-04 22:30:21 +01:00
vanhofen
877b26d1c9 cablex.xml: update Unitymedia; thx to klauser 
Origin commit data
------------------
Commit: bf987b7478
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-04 (Fri, 04 Nov 2016)

Origin message was:
------------------
- cablex.xml: update Unitymedia; thx to klauser
 2016-11-04 16:49:01 +01:00
vanhofen
9c7ace48cf cablex.xml: update Unitymedia; thx to klauser 
Origin commit data
------------------
Commit: b94f35421a
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-04 (Fri, 04 Nov 2016)

Origin message was:
------------------
- cablex.xml: update Unitymedia; thx to klauser
 2016-11-04 16:46:47 +01:00
vanhofen
6802b41bd4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 7b92927555
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-04 (Fri, 04 Nov 2016)
 2016-11-04 09:07:22 +01:00
Thilo Graf
092e5a8eed Merge branch 'master' into pu/msgbox 
Origin commit data
------------------
Commit: b6a06af7ca
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-03 (Thu, 03 Nov 2016)
 2016-11-03 19:13:34 +01:00
Jacek Jendrzej
7aa824a28c Revert "src/gui/widget/textbox.cpp try to fix text lines per page" 
This reverts commit 7e50bb3910.


Origin commit data
------------------
Commit: 2907aa5a37
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-03 (Thu, 03 Nov 2016)
 2016-11-03 18:38:41 +01:00
Jacek Jendrzej
e22523b66e Revert "src/gui/widget/textbox.cpp supplement to try to fix text lines per page" 
This reverts commit 82330c5883.


Origin commit data
------------------
Commit: 3815694e39
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-03 (Thu, 03 Nov 2016)
 2016-11-03 18:38:14 +01:00
Jacek Jendrzej
82330c5883 src/gui/widget/textbox.cpp supplement to try to fix text lines per page 
Origin commit data
------------------
Commit: e26ad6e9f1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-03 (Thu, 03 Nov 2016)
 2016-11-03 12:51:31 +01:00
Jacek Jendrzej
7e50bb3910 src/gui/widget/textbox.cpp try to fix text lines per page 
Origin commit data
------------------
Commit: d6c4324f6c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-03 (Thu, 03 Nov 2016)
 2016-11-03 12:17:11 +01:00
Thilo Graf
57786208c5 Merge branch 'master' into pu/msgbox 
Origin commit data
------------------
Commit: ab9bf2ffa6
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)
 2016-11-02 21:05:36 +01:00
vanhofen
e1eb4809c5 Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: b843ee8291
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)
 2016-11-02 16:06:31 +01:00
vanhofen
fd751e6441 textbox: fix compilation for generic hardware 
error: declaration of ‘clear’ shadows a member of 'this'


Origin commit data
------------------
Commit: 0f5aa73033
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)

Origin message was:
------------------
- textbox: fix compilation for generic hardware

error: declaration of ‘clear’ shadows a member of 'this'
 2016-11-02 09:55:45 +01:00
vanhofen
e2c1dbc75b Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 6a196e6645
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)
 2016-11-02 08:49:37 +01:00
vanhofen
1bfaf6b895 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: b631bd57ba
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)
 2016-11-02 08:49:24 +01:00
vanhofen
329b279cad moviebrowser: smaller locales for footer; clearify "filter off" mode 
Origin commit data
------------------
Commit: 9d2661a1d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)

Origin message was:
------------------
- moviebrowser: smaller locales for footer; clearify "filter off" mode
 2016-11-02 08:27:21 +01:00