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

12197 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacek Jendrzej
f598fd51d3 try to fix tm thread 
Origin commit data
------------------
Commit: 513850f915
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)
 2017-09-14 12:09:40 +02:00
Jacek Jendrzej
0f9284bf91 src/driver/screenshot.cpp avoid memory ranges overlap 
Origin commit data
------------------
Commit: d30bd0ea26
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-14 (Thu, 14 Sep 2017)
 2017-09-14 11:17:36 +02:00
vanhofen
ae184591fb parentallock_setup: fix compiler warning; remove easymenu leftover 
Origin commit data
------------------
Commit: 26e8712f90
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- parentallock_setup: fix compiler warning; remove easymenu leftover
 2017-09-13 18:44:29 +02:00
vanhofen
8d21a64f35 parentallock_setup: fix compiler warning; remove easymenu leftover 
Origin commit data
------------------
Commit: 4c5645fbab
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- parentallock_setup: fix compiler warning; remove easymenu leftover
 2017-09-13 16:35:52 +02:00
vanhofen
7e7da2d53b Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 7d6c4df048
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 16:32:10 +02:00
vanhofen
0bc0da5d40 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/mediaplayer.cpp


Origin commit data
------------------
Commit: 626537a35b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 16:31:47 +02:00
Jacek Jendrzej
ecf78ec322 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 98a31ea821
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 15:53:42 +02:00
vanhofen
ea1be5ae2a rework multimedia-menu code; cleanup from many unused code 
Origin commit data
------------------
Commit: d23323758c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- rework multimedia-menu code; cleanup from many unused code
 2017-09-13 15:52:19 +02:00
vanhofen
af919290b2 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: a0f93d9281
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 15:07:03 +02:00
vanhofen
1d02f3d908 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/cam_menu.cpp
	src/gui/info_menue.cpp
	src/gui/mediaplayer.cpp
	src/gui/network_setup.cpp
	src/gui/record_setup.cpp
	src/gui/settings_manager.cpp
	src/gui/update_menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/settings.h


Origin commit data
------------------
Commit: 8d5f5578ef
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 15:05:33 +02:00
vanhofen
e7f85aba40 rework multimedia-menu code; cleanup from many unused code 
Origin commit data
------------------
Commit: 56cdb2dd6c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- rework multimedia-menu code; cleanup from many unused code
 2017-09-13 14:46:38 +02:00
Jacek Jendrzej
b9a280c14a Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: a5bc9f1050
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 14:09:21 +02:00
Jacek Jendrzej
db4c1d616f fix pick diff error 
Origin commit data
------------------
Commit: a7813a885d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 14:08:29 +02:00
Jacek Jendrzej
1e3e303592 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 4e232439c3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 13:52:49 +02:00
vanhofen
cca884105b remove unused nkplay stuff 
Origin commit data
------------------
Commit: 1fae4130b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff
 2017-09-13 13:48:16 +02:00
Jacek Jendrzej
c44f82f12a Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 2c5bf73006
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 13:40:40 +02:00
vanhofen
6310efb007 remove unused nkplay stuff 
Origin commit data
------------------
Commit: 932a535b6a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff
 2017-09-13 13:35:23 +02:00
vanhofen
9db42a7d2b drop easymenu 
Origin commit data
------------------
Commit: 816de89898
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu
 2017-09-13 13:35:23 +02:00
vanhofen
99455725dc remove unused nkplay stuff 
Origin commit data
------------------
Commit: 93c8768fbf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove unused nkplay stuff
 2017-09-13 13:09:34 +02:00
vanhofen
f71684c751 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: bf366676b8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 12:52:23 +02:00
vanhofen
d71095f33b neutrino_menu: re-add accidently removed plugin-items 
Origin commit data
------------------
Commit: 1c3f1ed7ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- neutrino_menu: re-add accidently removed plugin-items
 2017-09-13 12:50:11 +02:00
vanhofen
2d6e2ab9c1 remove easymenu from config-file 
Origin commit data
------------------
Commit: f42b74a317
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- remove easymenu from config-file
 2017-09-13 10:45:23 +02:00
vanhofen
0975ae37ef locale: minor changes; fix typo 
Origin commit data
------------------
Commit: 3742ca7dfd
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- locale: minor changes; fix typo
 2017-09-13 10:45:23 +02:00
vanhofen
487fa232a3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: 163a6004fa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)
 2017-09-13 08:36:25 +02:00
vanhofen
bf468df6be unify headers in miscsetting's submenus; part 2 
Origin commit data
------------------
Commit: 711be60520
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)

Origin message was:
------------------
- unify headers in miscsetting's submenus; part 2
 2017-09-13 00:01:04 +02:00
vanhofen
ff21981795 drop easymenu 
Origin commit data
------------------
Commit: b502ed31b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu
 2017-09-12 23:46:22 +02:00
vanhofen
c6c61f6b22 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: 9e6dc9fbce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)
 2017-09-12 22:32:07 +02:00
vanhofen
367977ada4 network-setup: small changes in locales; move npt-at-boot item up 
Origin commit data
------------------
Commit: 92a8ee74f9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- network-setup: small changes in locales; move npt-at-boot item up
 2017-09-12 22:30:35 +02:00
vanhofen
8ba3308c23 drop ni-menu 
Origin commit data
------------------
Commit: 7379101512
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop ni-menu
 2017-09-12 22:30:35 +02:00
vanhofen
2de02e1b3f move netfs-mounts from ni-menu to network-setup 
Origin commit data
------------------
Commit: 6c20bc42f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move netfs-mounts from ni-menu to network-setup
 2017-09-12 22:30:35 +02:00
vanhofen
939f2c559c netfs_setup: fix menu-hint for write-items 
Origin commit data
------------------
Commit: 9922ed10e7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- netfs_setup: fix menu-hint for write-items
 2017-09-12 22:30:35 +02:00
vanhofen
5d79361a42 netfs_setup: drop unused LUFS support 
Origin commit data
------------------
Commit: c653b264b3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- netfs_setup: drop unused LUFS support
 2017-09-12 22:30:35 +02:00
vanhofen
ad03e7a834 move some more stuff from ni-menu to service-menu 
Origin commit data
------------------
Commit: b600bcefa7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move some more stuff from ni-menu to service-menu
 2017-09-12 22:30:35 +02:00
vanhofen
50c8b5cdba menu: fix right offset for very long right texts 
Origin commit data
------------------
Commit: c11ac03b4f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- menu: fix right offset for very long right texts
 2017-09-12 22:30:35 +02:00
vanhofen
7f86f04782 move some actionkey-stuff from ni-menu directly to neutrino.cpp 
Origin commit data
------------------
Commit: 16b57e40a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move some actionkey-stuff from ni-menu directly to neutrino.cpp
 2017-09-12 22:30:35 +02:00
vanhofen
a8f0e9c77a unify headers in miscsetting's submenus 
Origin commit data
------------------
Commit: f19d288e71
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- unify headers in miscsetting's submenus
 2017-09-12 22:30:35 +02:00
vanhofen
d4a11a3076 move plugin-hide-menu from ni-menu to miscsettings-menu 
Origin commit data
------------------
Commit: d7203f9241
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move plugin-hide-menu from ni-menu to miscsettings-menu
 2017-09-12 22:30:35 +02:00
vanhofen
8f64981ccf miscsettings_menu: add new submenu for plugins 
Origin commit data
------------------
Commit: 732172aeb7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- miscsettings_menu: add new submenu for plugins
 2017-09-12 22:30:35 +02:00
vanhofen
887d81a5a8 ni-menu: drop possibility to integrate plugins 
Origin commit data
------------------
Commit: 6614103971
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- ni-menu: drop possibility to integrate plugins
 2017-09-12 22:30:35 +02:00
vanhofen
d6a80feb1a ni-menu: drop save settings item 
Origin commit data
------------------
Commit: 3060760f68
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- ni-menu: drop save settings item
 2017-09-12 22:30:35 +02:00
vanhofen
a8aef40c5e move lcd4linux-setup from ni-menu to miscsettings-menu 
Origin commit data
------------------
Commit: c090a7d253
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move lcd4linux-setup from ni-menu to miscsettings-menu
 2017-09-12 22:30:35 +02:00
vanhofen
bb8cc1bcbd move infoicons-setup from ni-menu to miscsettings-menu 
Origin commit data
------------------
Commit: 91d2193126
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move infoicons-setup from ni-menu to miscsettings-menu
 2017-09-12 22:30:35 +02:00
vanhofen
d3c5f4f73e move daemon-control to own sources; now placed in service-menu 
Origin commit data
------------------
Commit: 0ab71dc962
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move daemon-control to own sources; now placed in service-menu
 2017-09-12 22:30:34 +02:00
vanhofen
e8e806fd8e define FLAGDIR in acinclude.m4 otherwise it won't work on PC 
Origin commit data
------------------
Commit: ee02df6549
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- define FLAGDIR in acinclude.m4 otherwise it won't work on PC
 2017-09-12 22:30:34 +02:00
vanhofen
fdfff6958f move CNITouchFileNotifier to CFlagFileNotifier 
Origin commit data
------------------
Commit: 0eadd27032
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move CNITouchFileNotifier to CFlagFileNotifier
 2017-09-12 22:30:34 +02:00
vanhofen
ebb13b6951 small adds 
Origin commit data
------------------
Commit: 547ad8a491
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)

Origin message was:
------------------
- small adds
 2017-09-09 15:33:46 +02:00
vanhofen
1544c19e27 settings_manager_teams: small reworks; unify locales 
* cleanup from unused code
* remove RC_help hotkey from menu (this hotkey breaks global hint-switch)
* fix text alignment in help-box


Origin commit data
------------------
Commit: 8eb3a61829
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)

Origin message was:
------------------
- settings_manager_teams: small reworks; unify locales

* cleanup from unused code
* remove RC_help hotkey from menu (this hotkey breaks global hint-switch)
* fix text alignment in help-box
 2017-09-09 11:03:52 +02:00
vanhofen
f37efba8f7 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 4bc4a80094
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)
 2017-09-09 08:44:18 +02:00
vanhofen
2ee7a428d9 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: eb76978295
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)
 2017-09-09 08:43:52 +02:00
Jacek Jendrzej
b03ab5cb9e remove double includes 
Origin commit data
------------------
Commit: 6576729fd1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-08 (Fri, 08 Sep 2017)
 2017-09-08 21:21:32 +02:00