Commit Graph

41 Commits

Author SHA1 Message Date
vanhofen
4abadfc539 flashtool: add some maybe usefull console output to reboot call
Origin commit data
------------------
Branch: ni/coolstream
Commit: 68ce922da8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-19 (Fri, 19 May 2017)

Origin message was:
------------------
- flashtool: add some maybe usefull console output to reboot call

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-05-19 10:14:51 +02:00
vanhofen
6fb38c77a5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/update.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: cd96638c45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)



------------------
This commit was generated by Migit
2017-03-01 18:18:07 +01:00
vanhofen
780fa8a74d flashtool: localize getType() function
Origin commit data
------------------
Branch: ni/coolstream
Commit: 950f74dd41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- flashtool: localize getType() function

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-03-01 18:16:09 +01:00
vanhofen
4ac4e963ad 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
------------------
Branch: ni/coolstream
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
2017-02-12 21:54:48 +01:00
Michael Liebmann
9b465b3b50 Merge branch 'master' into pu/fb-modules
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0cb26e6e98
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-12 09:24:08 +01:00
Michael Liebmann
3664527019 neutrino: Rename hardware defined macros for coolstream stb
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


Origin commit data
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2017-02-12 09:21:04 +01:00
vanhofen
54d7d92401 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgview.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: e61a23cb74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)



------------------
This commit was generated by Migit
2017-02-08 08:02:39 +01:00
Stefan Seyfried
5e76b3eef8 flashtool: make CFlashVersionInfo robust against invalid input
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4134af3d1d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-04 (Sat, 04 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-07 18:38:45 +01:00
vanhofen
93e45767af Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: f3e6dd7e1d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-06 21:57:54 +01:00
vanhofen
81014a595e flashtool: allow type U (update-package)
Origin commit data
------------------
Branch: ni/coolstream
Commit: d925655c3b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-06 (Mon, 06 Feb 2017)

Origin message was:
------------------
- flashtool: allow type U (update-package)

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2017-02-06 21:53:51 +01:00
vanhofen
a86bc779b4 NI \o/
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-05-19 22:59:54 +02:00
Stefan Seyfried
189e55ec30 global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ab6b53054
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-04-16 13:39:35 +02:00
[CST] Focus
10632f81e2 system/flashtool.cpp: call saveEpg in shutdown mode, to prevent any events
Origin commit data
------------------
Branch: ni/coolstream
Commit: 16ccbafe69
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-02-22 (Sun, 22 Feb 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-02-22 19:01:42 +03:00
vanhofen
11563d741e flashtool: localize "Copy Image" string
Origin commit data
------------------
Branch: ni/coolstream
Commit: f2d08d72ac
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-13 (Thu, 13 Nov 2014)

Origin message was:
------------------
- flashtool: localize "Copy Image" string

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-11-13 16:17:39 +01:00
[CST] Focus
518bcbc179 system/flashtool.cpp: add timestamp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0420e95b11
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-20 (Mon, 20 Oct 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-10-20 14:14:39 +04:00
Thilo Graf
e990abf516 CProgressWindow: implement CComponent classes
This implement window functionality from CComponentsWindow,
progress items from CProgressBar() and status text
items from CComponentsLabel()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2f0e4e1687
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-06-09 (Mon, 09 Jun 2014)



------------------
This commit was generated by Migit
2014-06-23 18:43:47 +02:00
vanhofen
3498b687da Revert "- add missing include of vfd header"
This reverts commit 3006c5ff4b.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 014dd3ac7b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)



------------------
This commit was generated by Migit
2013-11-13 23:39:55 +01:00
vanhofen
3006c5ff4b add missing include of vfd header
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3845feb0e4
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)

Origin message was:
------------------
- add missing include of vfd header

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-13 10:40:18 +01:00
Michael Liebmann
9221700b3d Fix compiler warnings (-Wconversion)
Origin commit data
------------------
Branch: ni/coolstream
Commit: b645b644b0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-08 (Tue, 08 Oct 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-10-10 01:58:37 +02:00
Michael Liebmann
2c435dba7a CMTDInfo: Add function findMTDNumberFromName()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 859ef920cc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-28 (Sat, 28 Sep 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-09-28 07:29:57 +02:00
Jacek Jendrzej
a33145db74 CFlashTool::program: saveEpg only if on
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d1cb075e9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-09-05 (Thu, 05 Sep 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-09-05 20:59:21 +02:00
Michael Liebmann
e2437dd21c Softupdate: Check the available space before copy image to /tmp on apollo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8a5c32d0f6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-21 (Wed, 21 Aug 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-08-21 06:32:17 +02:00
[CST] Focus
4a9aeb8f0f 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
------------------
Branch: ni/coolstream
Commit: be05be5069
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-18 (Tue, 18 Jun 2013)



------------------
This commit was generated by Migit
2013-06-18 16:23:51 +04:00
Michael Liebmann
07268967ab 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
------------------
Branch: ni/coolstream
Commit: c780676ce5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-12 (Wed, 12 Jun 2013)



------------------
This commit was generated by Migit
2013-06-13 01:36:03 +02:00
Michael Liebmann
281a5d8f81 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2013-06-08 16:20:32 +02:00
[CST] Focus
93eb0c1679 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
------------------
Branch: ni/coolstream
Commit: 6f8ef9ec46
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-02 (Sun, 02 Jun 2013)



------------------
This commit was generated by Migit
2013-06-02 10:46:42 +04:00
Jacek Jendrzej
6ba9297c4b CFlashTool::erase - shutdown sectionsd before erase flash
Origin commit data
------------------
Branch: ni/coolstream
Commit: 412d430ed0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-06-01 (Sat, 01 Jun 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-06-01 15:04:46 +02:00
[CST] Focus
ec3750cd4d system/flashtool.cpp: use buffer on stack
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3959771c18
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-05-21 (Tue, 21 May 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-05-21 16:54:17 +04:00
[CST] Focus
4d50af1aaa system/flashtool.cpp: fix buffer size for nor
Origin commit data
------------------
Branch: ni/coolstream
Commit: d1cbff900f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-29 17:38:39 +04:00
[CST] Focus
a916394176 system/flashtool.cpp: add bad block skip for read/write/erase in case of NAND
Origin commit data
------------------
Branch: ni/coolstream
Commit: e739868e7c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 Jan 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-01-29 14:23:50 +04:00
Jacek Jendrzej
8dc4ef8796 comment out never used
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9124c20f31
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-08-04 (Sat, 04 Aug 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-08-04 10:03:19 +02:00
[CST] Focus
67f51ad268 remove obsolete and unused includes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 35ee04049a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-06-14 (Thu, 14 Jun 2012)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2012-06-14 11:01:37 +04:00
Jacek Jendrzej
3bb8f448be 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2010-09-14 17:13:29 +00:00
[CST] Focus
d317be113f 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
------------------
Branch: ni/coolstream
Commit: c3897d3231
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-06-19 (Sat, 19 Jun 2010)



------------------
This commit was generated by Migit
2010-06-19 09:55:21 +00:00
[CST] Focus
3956bc3806 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
------------------
Branch: ni/coolstream
Commit: d133701c83
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2010-05-12 (Wed, 12 May 2010)



------------------
This commit was generated by Migit
2010-05-12 12:10:12 +00:00
Jacek Jendrzej
54aee132af 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
------------------
Branch: ni/coolstream
Commit: f06a3982ef
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2010-02-01 (Mon, 01 Feb 2010)



------------------
This commit was generated by Migit
2010-02-01 22:21:32 +00:00
mws
fbbe627dde 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
------------------
Branch: ni/coolstream
Commit: 474790557f
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-29 (Tue, 29 Dec 2009)



------------------
This commit was generated by Migit
2009-12-29 13:56:52 +00:00
Stefan Seyfried
7921fdbb48 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
------------------
Branch: ni/coolstream
Commit: 732ffb18be
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2009-12-21 (Mon, 21 Dec 2009)



------------------
This commit was generated by Migit
2009-12-21 17:26:15 +00:00
mws
5febb97a76 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
------------------
Branch: ni/coolstream
Commit: 1b13da2617
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-21 (Mon, 21 Dec 2009)



------------------
This commit was generated by Migit
2009-12-21 16:23:09 +00:00
mws
5bafebcb92 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
------------------
Branch: ni/coolstream
Commit: 9bcbe03475
Author: mws <mws@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-16 (Wed, 16 Dec 2009)



------------------
This commit was generated by Migit
2009-12-16 15:34:26 +00:00
mrcolor
bcecfb6585 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
------------------
Branch: ni/coolstream
Commit: bc5bd4154e
Author: mrcolor <mrcolor@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: 2009-12-08 (Tue, 08 Dec 2009)



------------------
This commit was generated by Migit
2009-12-08 11:05:11 +00:00