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
5df8b0409e
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
configure.ac
data/fonts/Makefile.am
src/gui/cam_menu.cpp
src/gui/update.cpp
src/zapit/src/capmt.cpp
Origin commit data
------------------
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 21:54:48 +01:00
Michael Liebmann
3b018febe6
Merge branch 'master' into pu/fb-modules
...
Origin commit data
------------------
Commit: 0cb26e6e98
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-02-12 (Sun, 12 Feb 2017)
2017-02-12 09:24:08 +01:00
Michael Liebmann
7e9107c8a8
neutrino: Rename hardware defined macros for coolstream stb
...
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
BOXMODEL_APOLLO => BOXMODEL_CS_HD2
Origin commit data
------------------
Commit: 0d66899cbd
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-02-12 (Sun, 12 Feb 2017)
Origin message was:
------------------
neutrino: Rename hardware defined macros for coolstream stb
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
BOXMODEL_APOLLO => BOXMODEL_CS_HD2
2017-02-12 09:21:04 +01:00
vanhofen
0707fef642
Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
src/gui/epgview.h
Origin commit data
------------------
Commit: e61a23cb74
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-08 08:02:39 +01:00
Stefan Seyfried
076e49e1a1
flashtool: make CFlashVersionInfo robust against invalid input
...
Origin commit data
------------------
Commit: 4134af3d1d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2017-02-04 (Sat, 04 Feb 2017)
2017-02-07 18:38:45 +01:00
vanhofen
80b4c25fbe
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: f3e6dd7e1d
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-06 (Mon, 06 Feb 2017)
2017-02-06 21:57:54 +01:00
vanhofen
fab12afe12
flashtool: allow type U (update-package)
...
Origin commit data
------------------
Commit: d925655c3b
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-06 (Mon, 06 Feb 2017)
Origin message was:
------------------
- flashtool: allow type U (update-package)
2017-02-06 21:53:51 +01:00
vanhofen
4cf2b60722
NI \o/
...
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-05-19 (Thu, 19 May 2016)
2016-05-19 22:59:54 +02:00
Stefan Seyfried
d9354e847f
global.h: Use forward-declarations to reduce number of dependencies
...
Origin commit data
------------------
Commit: 5ab6b53054
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2015-04-16 (Thu, 16 Apr 2015)
2015-04-16 13:39:35 +02:00
[CST] Focus
8ec249f8cf
system/flashtool.cpp: call saveEpg in shutdown mode, to prevent any events
...
Origin commit data
------------------
Commit: 16ccbafe69
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2015-02-22 (Sun, 22 Feb 2015)
2015-02-22 19:01:42 +03:00
vanhofen
bb138b7787
flashtool: localize "Copy Image" string
...
Origin commit data
------------------
Commit: f2d08d72ac
Author: vanhofen <vanhofen@gmx.de >
Date: 2014-11-13 (Thu, 13 Nov 2014)
Origin message was:
------------------
- flashtool: localize "Copy Image" string
2014-11-13 16:17:39 +01:00
[CST] Focus
f71b3f68e0
system/flashtool.cpp: add timestamp
...
Origin commit data
------------------
Commit: 0420e95b11
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2014-10-20 (Mon, 20 Oct 2014)
2014-10-20 14:14:39 +04:00
Thilo Graf
7d1020cdf5
CProgressWindow: implement CComponent classes
...
This implement window functionality from CComponentsWindow,
progress items from CProgressBar() and status text
items from CComponentsLabel()
Origin commit data
------------------
Commit: 2f0e4e1687
Author: Thilo Graf <dbt@novatux.de >
Date: 2014-06-09 (Mon, 09 Jun 2014)
2014-06-23 18:43:47 +02:00
vanhofen
82168342a2
Revert "- add missing include of vfd header"
...
This reverts commit 81d56f75fc
.
Origin commit data
------------------
Commit: 014dd3ac7b
Author: vanhofen <vanhofen@gmx.de >
Date: 2013-11-13 (Wed, 13 Nov 2013)
2013-11-13 23:39:55 +01:00
vanhofen
81d56f75fc
add missing include of vfd header
...
Origin commit data
------------------
Commit: 3845feb0e4
Author: vanhofen <vanhofen@gmx.de >
Date: 2013-11-13 (Wed, 13 Nov 2013)
Origin message was:
------------------
- add missing include of vfd header
2013-11-13 10:40:18 +01:00
Michael Liebmann
cb7221a3d5
Fix compiler warnings (-Wconversion)
...
Origin commit data
------------------
Commit: b645b644b0
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2013-10-08 (Tue, 08 Oct 2013)
2013-10-10 01:58:37 +02:00
Michael Liebmann
1a5f43683d
CMTDInfo: Add function findMTDNumberFromName()
...
Origin commit data
------------------
Commit: 859ef920cc
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2013-09-28 (Sat, 28 Sep 2013)
2013-09-28 07:29:57 +02:00
Jacek Jendrzej
3c692ffe24
CFlashTool::program: saveEpg only if on
...
Origin commit data
------------------
Commit: 7d1cb075e9
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2013-09-05 (Thu, 05 Sep 2013)
2013-09-05 20:59:21 +02:00
Michael Liebmann
f6eb351b6c
Softupdate: Check the available space before copy image to /tmp on apollo
...
Origin commit data
------------------
Commit: 8a5c32d0f6
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2013-08-21 (Wed, 21 Aug 2013)
2013-08-21 06:32:17 +02:00
[CST] Focus
a2db4efdfd
system/flashtool.cpp: prevent crash on invalid mtdData access,
...
ie pos = -1 if system-fs not found;
change sysfs name on apollo
Origin commit data
------------------
Commit: be05be5069
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-06-18 (Tue, 18 Jun 2013)
2013-06-18 16:23:51 +04:00
Michael Liebmann
67903dfd93
Software update: Copy flashimage to /tmp if it is not present in this directory
...
- unmount mounted network folders before flashing
- kill timerd before flashing
Origin commit data
------------------
Commit: c780676ce5
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2013-06-12 (Wed, 12 Jun 2013)
2013-06-13 01:36:03 +02:00
Michael Liebmann
4987f7ef5b
Software update: Rework preparing the flash process
...
- Finish all unnecessary threads and processes before the flash process
- Use flash.start to stop other (user-defined) processes
Origin commit data
------------------
Commit: c26fd64759
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2013-06-08 (Sat, 08 Jun 2013)
Origin message was:
------------------
* Software update: Rework preparing the flash process
- Finish all unnecessary threads and processes before the flash process
- Use flash.start to stop other (user-defined) processes
2013-06-08 16:20:32 +02:00
[CST] Focus
499d23e6a6
Merge branch 'next' into next-cc
...
Conflicts:
data/locale/english.locale
src/driver/framebuffer.cpp
src/gui/channellist.cpp
src/gui/eventlist.cpp
src/gui/moviebrowser.cpp
Origin commit data
------------------
Commit: 6f8ef9ec46
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-06-02 (Sun, 02 Jun 2013)
2013-06-02 10:46:42 +04:00
Jacek Jendrzej
3df0492743
CFlashTool::erase - shutdown sectionsd before erase flash
...
Origin commit data
------------------
Commit: 412d430ed0
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2013-06-01 (Sat, 01 Jun 2013)
2013-06-01 15:04:46 +02:00
[CST] Focus
35cea9b651
system/flashtool.cpp: use buffer on stack
...
Origin commit data
------------------
Commit: 3959771c18
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-05-21 (Tue, 21 May 2013)
2013-05-21 16:54:17 +04:00
[CST] Focus
ba3ac836bc
system/flashtool.cpp: fix buffer size for nor
...
Origin commit data
------------------
Commit: d1cbff900f
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 17:38:39 +04:00
[CST] Focus
beef75007f
system/flashtool.cpp: add bad block skip for read/write/erase in case of NAND
...
Origin commit data
------------------
Commit: e739868e7c
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2013-01-29 (Tue, 29 Jan 2013)
2013-01-29 14:23:50 +04:00
Jacek Jendrzej
41e57ce7bc
comment out never used
...
Origin commit data
------------------
Commit: 9124c20f31
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2012-08-04 (Sat, 04 Aug 2012)
2012-08-04 10:03:19 +02:00
[CST] Focus
88a92f9948
remove obsolete and unused includes
...
Origin commit data
------------------
Commit: 35ee04049a
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2012-06-14 (Thu, 14 Jun 2012)
2012-06-14 11:01:37 +04:00
Jacek Jendrzej
d9a2730470
fix Wextra compil
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@770 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 15c474a6d8
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2010-09-14 (Tue, 14 Sep 2010)
Origin message was:
------------------
fix Wextra compil
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@770 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-09-14 17:13:29 +00:00
[CST] Focus
22ccd26a23
Update menu changes; setup wizard banner
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@634 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: c3897d3231
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2010-06-19 (Sat, 19 Jun 2010)
2010-06-19 09:55:21 +00:00
[CST] Focus
32df7aa21e
Search mtd device to update by name
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@581 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: d133701c83
Author: [CST] Focus <focus.cst@gmail.com >
Date: 2010-05-12 (Wed, 12 May 2010)
2010-05-12 12:10:12 +00:00
Jacek Jendrzej
548f91e373
fix possible Resource leak
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@249 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: f06a3982ef
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2010-02-01 (Mon, 01 Feb 2010)
2010-02-01 22:21:32 +00:00
mws
0ed8ac5577
fix initializers and shadows
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@124 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 474790557f
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-29 (Tue, 29 Dec 2009)
2009-12-29 13:56:52 +00:00
Stefan Seyfried
38644a8f3f
fix more "type qualifiers ignored on function return type" warnings
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@105 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 732ffb18be
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2009-12-21 (Mon, 21 Dec 2009)
2009-12-21 17:26:15 +00:00
mws
c62aa94983
Mark unused vars as comment
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@104 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 1b13da2617
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-21 (Mon, 21 Dec 2009)
2009-12-21 16:23:09 +00:00
mws
086fa4a601
comment in unused variables,
...
replace #warning statements
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@60 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: 9bcbe03475
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-16 (Wed, 16 Dec 2009)
2009-12-16 15:34:26 +00:00
mrcolor
cb8dd3394d
our current experimental Neutrino branch
...
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)
2009-12-08 11:05:11 +00:00