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

191 Commits

Author SHA1 Message Date
Michael Liebmann
1d5f135331 Apollo/Kronos: Use backup with readmtdJFFS2() also for var partition 
Origin commit data
------------------
Commit: 6121e57fbc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-09-22 (Tue, 22 Sep 2015)
 2015-09-22 13:41:13 +02:00
Thilo Graf
61656865d0 Merge branch 'cst-next.pre' into cst-next 
Origin commit data
------------------
Commit: a58f1621b4
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-30 (Thu, 30 Apr 2015)
 2015-04-30 09:20:43 +02:00
vanhofen
92960161a9 remove w_max()-calls to define menu-width, because ... 
w-max() returns a pixel-value, but menus need a percentage-value.


Origin commit data
------------------
Commit: 9041bff59c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-24 (Fri, 24 Apr 2015)

Origin message was:
------------------
- remove w_max()-calls to define menu-width, because ...

 w-max() returns a pixel-value, but menus need a percentage-value.
 2015-04-24 09:11:04 +02:00
Thilo Graf
e1fb2a3185 CFlashUpdate: change name for CFile object for better differ 
Origin commit data
------------------
Commit: e58b86f38f
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-12-20 (Sat, 20 Dec 2014)
 2015-03-29 22:40:03 +02:00
Stefan Seyfried
a968a12b8d Merge remote-tracking branch 'check/cst-next' 
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)
 2015-01-26 17:26:26 +01:00
[CST] Focus
50c59a5ad0 gui/update.cpp: fix image update check, 
enable save u-boot menu switch


Origin commit data
------------------
Commit: f04e22befe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-09 (Fri, 09 Jan 2015)
 2015-01-09 12:42:01 +03:00
Stefan Seyfried
ec1a9fce17 Merge remote-tracking branch 'check/cst-next' 
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
 2014-12-25 18:03:08 +01:00
[CST] Focus
51fcca6264 gui/update.cpp: add function to check first url for image update; 
check update version and timestamp to notify user about updates


Origin commit data
------------------
Commit: a755074c0e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-20 (Mon, 20 Oct 2014)
 2014-10-20 14:19:37 +04:00
Michael Liebmann
f0f680971d SoftUpdate: Hide "Create image for Tank/Trinity STB" at the Kronos platform 
Origin commit data
------------------
Commit: 2e6ad3caa1
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-09-01 (Mon, 01 Sep 2014)
 2014-09-01 21:14:09 +02:00
Stefan Seyfried
d06c1d8ad6 Merge remote-tracking branch 'check/next-cc' 
...only build-tested, needs fixes


Origin commit data
------------------
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-15 (Sat, 15 Feb 2014)
 2014-02-15 20:22:07 +01:00
Michael Liebmann
28799374ed CFlashExpert::checkSize: Fix display backupMaxSize & backupRequiredSize 
Origin commit data
------------------
Commit: 583931e446
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-29 (Wed, 29 Jan 2014)
 2014-01-29 21:20:43 +01:00
Stefan Seyfried
a112e8fb49 Merge remote-tracking branch 'check/next-cc' 
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp


Origin commit data
------------------
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)
 2014-01-23 14:08:37 +01:00
vanhofen
8d5aa84e20 adapt ShowMsg handling from martii's neutrino-mp 
Origin commit data
------------------
Commit: 53f5801d6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)

Origin message was:
------------------
- adapt ShowMsg handling from martii's neutrino-mp
 2014-01-22 12:37:21 +01:00
vanhofen
8a02f4f089 adapt ShowHint handling from martii's neutrino-mp 
Origin commit data
------------------
Commit: 6995e1a765
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)

Origin message was:
------------------
- adapt ShowHint handling from martii's neutrino-mp
 2014-01-22 12:11:52 +01:00
Michael Liebmann
3e96126769 SNeutrinoSettings: convert more char[...] configuration values to std::string 
Origin commit data
------------------
Commit: 004aa84e32
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)
 2014-01-19 20:57:37 +01:00
Michael Liebmann
1918153c0a Preparing the menu classes for Lua Part #2 
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


Origin commit data
------------------
Commit: b41819190d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-16 (Thu, 16 Jan 2014)

Origin message was:
------------------
Preparing the menu classes for Lua Part #2

- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii
 2014-01-19 20:57:37 +01:00
Michael Liebmann
37e4b0bda8 Preparing the menu classes for Lua Part #1 
- Remove CNonLocalizedMenuSeparator
- Add overloaded function CMenuSeparator for non local
 THX Martii


Origin commit data
------------------
Commit: 2c9c9debcc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-16 (Thu, 16 Jan 2014)

Origin message was:
------------------
Preparing the menu classes for Lua Part #1

- Remove CNonLocalizedMenuSeparator
- Add overloaded function CMenuSeparator for non local
 THX Martii
 2014-01-19 20:57:37 +01:00
Stefan Seyfried
ccc691278c Merge remote-tracking branch 'check/next-cc' 
Lightly tested only...


Origin commit data
------------------
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-25 (Wed, 25 Dec 2013)
 2013-12-25 22:51:23 +01:00
martii
ce44d1641a convert most char[...] configuration values to std::string 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: cbc9299df8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-11 (Tue, 11 Jun 2013)
 2013-12-25 12:08:14 +01:00
Stefan Seyfried
4c7a2f38df Merge branch 'check/next-cc' 
Only compile-tested.


Origin commit data
------------------
Commit: b5e736e81b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)
 2013-11-30 20:17:31 +01:00
[CST] Focus
529f87c7d1 gui/update.cpp: fix memleak 
Origin commit data
------------------
Commit: a438c0548b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-29 (Fri, 29 Nov 2013)
 2013-11-29 17:27:10 +04:00
Stefan Seyfried
68e18e35d3 fix format string warnings 
Origin commit data
------------------
Commit: 630c66330d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
 2013-11-13 10:38:27 +01:00
Stefan Seyfried
639a9b353d fix format string warnings 
Origin commit data
------------------
Commit: c82bfbaec2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
 2013-11-10 19:48:58 +01:00
Stefan Seyfried
80b809a370 Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.


Origin commit data
------------------
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
 2013-11-10 16:55:53 +01:00
vanhofen
788daa5ad3 locale: remove confusing string 'squashFS' 
Origin commit data
------------------
Commit: c239f7af95
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-10-23 (Wed, 23 Oct 2013)

Origin message was:
------------------
- locale: remove confusing string 'squashFS'
 2013-10-23 10:41:47 +02:00
Stefan Seyfried
e6cbfe61bc Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
 2013-10-21 22:58:55 +02: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
04451904b4 neutrino: Fit various functions to the changed at get_fs_usage() 
Origin commit data
------------------
Commit: 4ee8fded80
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
c24b0bb9ad CFlashExpert::showMTDSelector(): Fixed typo at 'disable write uboot' 
Origin commit data
------------------
Commit: 00a194990e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)
 2013-10-01 20:42:01 +02:00
Michael Liebmann
8e76619dbf CFlashExpertSetup: Disable backup u-boot 
Origin commit data
------------------
Commit: 96fd0ef59d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-29 (Sun, 29 Sep 2013)
 2013-09-29 11:44:07 +02:00
Michael Liebmann
354a7b479e CFlashExpert: Exclude 'env' from write flash 
Origin commit data
------------------
Commit: 4cb2465665
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-29 (Sun, 29 Sep 2013)
 2013-09-29 11:42:53 +02:00
Michael Liebmann
212d44e02c CFlashExpert: Use findMTDNumberFromName() to find mtdnumber 
Origin commit data
------------------
Commit: b25b1c4fb5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-28 (Sat, 28 Sep 2013)
 2013-09-28 07:29:57 +02:00
Michael Liebmann
3e016e5e81 Image backup apollo Part #6 
- Menu option for including kernel/uldr/u-boot in the image backup
- Menu option for creating an image with a different erasesize
 Tank <=> Trinity


Origin commit data
------------------
Commit: d00cb6f8ec
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-24 (Tue, 24 Sep 2013)

Origin message was:
------------------
Image backup apollo Part #6

- Menu option for including kernel/uldr/u-boot in the image backup
- Menu option for creating an image with a different erasesize
 Tank <=> Trinity
 2013-09-27 06:44:43 +02:00
Michael Liebmann
4bffdaa95b Image backup apollo Part #5 
- Rework handling devtable
- Use file for devtable '/var/tuxbox/config/devtable.txt'
- If file is empty or does not exist, will default entries
 '/dev/console' and '/dev/null' creates


Origin commit data
------------------
Commit: 9188c78751
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-24 (Tue, 24 Sep 2013)

Origin message was:
------------------
Image backup apollo Part #5

- Rework handling devtable
- Use file for devtable '/var/tuxbox/config/devtable.txt'
- If file is empty or does not exist, will default entries
 '/dev/console' and '/dev/null' creates
 2013-09-27 06:44:43 +02:00
Michael Liebmann
5fb5b497ae Image backup apollo Part #4 
- Check of available disk space before image creation


Origin commit data
------------------
Commit: 23163e7897
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-22 (Sun, 22 Sep 2013)
 2013-09-27 06:44:41 +02:00
Michael Liebmann
1b32725b15 src/system/mtdutils: Creation devtable moved to update.cpp 
Origin commit data
------------------
Commit: 66b078cb92
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-22 (Sun, 22 Sep 2013)
 2013-09-27 06:44:41 +02:00
Michael Liebmann
03371d7c80 Image backup apollo Part #3 
- Add ".256k" string to imagename for tank boxes


Origin commit data
------------------
Commit: acea9818b8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-21 (Sat, 21 Sep 2013)
 2013-09-27 06:44:39 +02:00
Michael Liebmann
786fd14316 Image backup apollo Part #1 
- Use src/system/mtdutils for image creation


Origin commit data
------------------
Commit: d4ca6a552e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-21 (Sat, 21 Sep 2013)
 2013-09-27 06:44:36 +02:00
Michael Liebmann
1a4b568ceb CFlashExpert: Add return value to showMTDSelector() & showFileSelector() 
Origin commit data
------------------
Commit: 720f52c0a0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-26 (Thu, 26 Sep 2013)
 2013-09-27 06:44:33 +02:00
Stefan Seyfried
a07ee2b304 neutrino: fix up non-extupdate build 
this complements commit 1684f2481d after recent changes


Origin commit data
------------------
Commit: 58f6480a34
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)
 2013-09-01 20:11:30 +02:00
Stefan Seyfried
2c76238007 Merge remote-tracking branch 'check/next-cc' 
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)
 2013-09-01 19:46:10 +02:00
Michael Liebmann
72207b6d56 gui/update.cpp: disable apply settings on apollo, as non-working at the moment 
Origin commit data
------------------
Commit: df2fab4ceb
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-21 (Wed, 21 Aug 2013)
 2013-08-21 06:32:18 +02:00
Michael Liebmann
26ecade694 Softupdate: Skip checkSize() when update_dir=/tmp on non apollo platform 
- supplement to 87fef9c895


Origin commit data
------------------
Commit: 8eacdd6e09
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-20 (Tue, 20 Aug 2013)
 2013-08-21 06:32:10 +02:00
Michael Liebmann
b77b1a38bd Softupdate: Fix filename for local update 
Origin commit data
------------------
Commit: 9b12442b5d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-20 (Tue, 20 Aug 2013)
 2013-08-21 06:32:10 +02:00
Michael Liebmann
87fef9c895 Softupdate: Check the available disk space when reading the flash 
Origin commit data
------------------
Commit: a3762416af
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-20 (Tue, 20 Aug 2013)
 2013-08-20 02:55:56 +02:00
Michael Liebmann
36b3fd0a99 Softupdate: Use user-defined file names 
for apply settings and saving partitions from the flash.


Origin commit data
------------------
Commit: bc069b0a84
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-08 (Thu, 08 Aug 2013)
 2013-08-20 02:55:54 +02:00
Michael Liebmann
3b56d80cce gui/update.cpp: disable "systemFS with settings" menu item on apollo, 
as non-working at the moment


Origin commit data
------------------
Commit: 0cc83a6a9f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-17 (Sat, 17 Aug 2013)
 2013-08-17 20:56:26 +02:00
[CST] Focus
aa3fa4f480 gui/update.cpp: download different image for different system fs erase size 
Origin commit data
------------------
Commit: 8ade9f656b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-08-05 (Mon, 05 Aug 2013)
 2013-08-06 15:16:54 +04:00
Stefan Seyfried
6830b68cac Merge branch 'check/next-cc' 
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)
 2013-07-06 19:01:15 +02:00
[CST] Focus
1f79fbdde3 gui/update.cpp: hide progress window, if applySettings() failed 
Origin commit data
------------------
Commit: d7bdd4ee6e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-18 (Tue, 18 Jun 2013)
 2013-06-18 16:22:34 +04:00