mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
15,038 Commits 2 Branches 9 Tags
da27b51fdd7d1036c40232fdd55a052b7bb1e813
Commit Graph

1956 Commits

Author SHA1 Message Date
vanhofen
812108bf2e locales: rework menu.hint_softupdate_settings 
Origin commit data
------------------
Commit: e454218d91
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-20 (Tue, 20 Nov 2012)

Origin message was:
------------------
- locales: rework menu.hint_softupdate_settings
 2012-11-20 21:18:36 +01:00
vanhofen
be4886921d icons: rework btn_*.png 
Origin commit data
------------------
Commit: d63800351e
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-20 (Tue, 20 Nov 2012)

Origin message was:
------------------
- icons: rework btn_*.png
 2012-11-20 21:09:46 +01:00
Michael Liebmann
e8e55cfdfe Software Update: /var/etc/update.urls is excluded from saving 
- Message 'Setting takeover successfully...' removed


Origin commit data
------------------
Commit: 04e71239f2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)

Origin message was:
------------------
* Software Update: /var/etc/update.urls is excluded from saving

- Message 'Setting takeover successfully...' removed
 2012-11-19 12:47:31 +01:00
vanhofen
dfda1b223a icons: install hint_mb.png 
Origin commit data
------------------
Commit: 8183e41d33
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-17 (Sat, 17 Nov 2012)

Origin message was:
------------------
- icons: install hint_mb.png
 2012-11-17 11:33:46 +01:00
OneOfNine
d9705f2583 icons: improve numericpad.png 
Origin commit data
------------------
Commit: 51b6928d03
Author: OneOfNine <oneofnine@web.de>
Date: 2012-11-17 (Sat, 17 Nov 2012)

Origin message was:
------------------
- icons: improve numericpad.png
 2012-11-17 10:42:01 +01:00
OneOfNine
1a5ab1726c icons: improve border_lr.png, border_ul.png 
Origin commit data
------------------
Commit: 6a1aac4c2d
Author: OneOfNine <oneofnine@web.de>
Date: 2012-11-17 (Sat, 17 Nov 2012)

Origin message was:
------------------
- icons: improve border_lr.png, border_ul.png
 2012-11-17 10:35:06 +01:00
vanhofen
fa9dc82e13 icons: add hint_mb.png 
Origin commit data
------------------
Commit: 58a50668d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-17 (Sat, 17 Nov 2012)

Origin message was:
------------------
- icons: add hint_mb.png
 2012-11-17 10:29:40 +01:00
vanhofen
1b5e7021c2 icons: new mounted.png, not_mounted.png 
Origin commit data
------------------
Commit: a4e480a124
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-17 (Sat, 17 Nov 2012)

Origin message was:
------------------
- icons: new mounted.png, not_mounted.png
 2012-11-17 09:09:35 +01:00
Michael Liebmann
e8934313bc Software Update: Added more files for network settings in settingsupdate.conf 
Origin commit data
------------------
Commit: 07639c8488
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)

Origin message was:
------------------
* Software Update: Added more files for network settings in settingsupdate.conf
 2012-11-16 21:51:04 +01:00
vanhofen
4a6e0994a2 deutsch.locale: update 
Origin commit data
------------------
Commit: 4af0eed1c5
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-16 (Fri, 16 Nov 2012)

Origin message was:
------------------
- deutsch.locale: update
 2012-11-16 18:37:48 +01:00
[CST] Focus
a78c1dc278 locals: add extra hint for local sw update menu point 
Origin commit data
------------------
Commit: b2e3f2a19b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)
 2012-11-16 19:46:37 +04:00
Michael Liebmann
bfc243c525 Software Update with apply the settings (Part11) 
- Deletelist added to delete files or directories from image
- Files/Directories are marked by a prefixed '~' in the settingsupdate.conf
- Rework readBackupList()


Origin commit data
------------------
Commit: 1ca7ced674
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-11-12 (Mon, 12 Nov 2012)

Origin message was:
------------------
* Software Update with apply the settings (Part11)

- Deletelist added to delete files or directories from image
- Files/Directories are marked by a prefixed '~' in the settingsupdate.conf
- Rework readBackupList()
 2012-11-16 07:14:01 +01:00
gixxpunk
8276f4b5d7 cables.xml: update um and kms 
Origin commit data
------------------
Commit: c37a25172e
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)

Origin message was:
------------------
- cables.xml: update um and kms
 2012-11-13 20:00:10 +01:00
Michael Liebmann
25278d8398 Software Update with apply the settings (Part10) 
- Blacklist added to exclude files
- Files are marked by a prefixed '-' in the settingsupdate.conf


Origin commit data
------------------
Commit: cddf86725d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-11-11 (Sun, 11 Nov 2012)

Origin message was:
------------------
* Software Update with apply the settings (Part10)

- Blacklist added to exclude files
- Files are marked by a prefixed '-' in the settingsupdate.conf
 2012-11-11 08:11:49 +01:00
Stefan Seyfried
857402e3d4 Merge branch 'uncool/dvbsi++' 
Conflicts:
	src/driver/Makefile.am
	src/driver/streamts.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/widget/textbox.h


Origin commit data
------------------
Commit: c480e36746
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-11 (Sun, 11 Nov 2012)
 2012-11-11 01:45:22 +01:00
vanhofen
a38ab6c971 english.locale: fix german word 
Origin commit data
------------------
Commit: 9a3d2c4cba
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-09 (Fri, 09 Nov 2012)

Origin message was:
------------------
- english.locale: fix german word
 2012-11-09 18:00:01 +01:00
Jacek Jendrzej
0d98f2806b src/gui/channellist.cpp:-add sort by channel number 
Origin commit data
------------------
Commit: c47aebdb64
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-09 (Fri, 09 Nov 2012)
 2012-11-09 17:32:15 +01:00
Jacek Jendrzej
4c735e8e66 neutrino: -add save epg on stadbyOn/Off option 
Origin commit data
------------------
Commit: a47c6593dc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-08 (Thu, 08 Nov 2012)
 2012-11-08 13:35:00 +01:00
vanhofen
1db8274bde Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++ 
Origin commit data
------------------
Commit: d9625254e0
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-07 (Wed, 07 Nov 2012)
 2012-11-07 13:04:52 +01:00
vanhofen
522875ba8e network_setup.cpp: add more suitable hints to hostname-setup 
Origin commit data
------------------
Commit: 6472840127
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-07 (Wed, 07 Nov 2012)

Origin message was:
------------------
- network_setup.cpp: add more suitable hints to hostname-setup
 2012-11-07 13:02:40 +01:00
Michael Liebmann
e61906948d Software Update with apply the settings (Part9) 
- Functions now available for internet & local update.
- Rename writemtdExt() to applySettings()


Origin commit data
------------------
Commit: 0c84840e10
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-11-05 (Mon, 05 Nov 2012)

Origin message was:
------------------
* Software Update with apply the settings (Part9)

- Functions now available for internet & local update.
- Rename writemtdExt() to applySettings()
 2012-11-07 04:06:48 +01:00
vanhofen
84d583ec6e satellites.xml: update astra 19.2 
Origin commit data
------------------
Commit: b6535a4823
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-05 (Mon, 05 Nov 2012)

Origin message was:
------------------
- satellites.xml: update astra 19.2
 2012-11-05 14:06:24 +01:00
Michael Liebmann
492b40d127 Software Update with apply the settings (Part6) 
- Use identifier '#:' for config vars in settingsupdate.conf


Origin commit data
------------------
Commit: f4f954415b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-11-03 (Sat, 03 Nov 2012)

Origin message was:
------------------
* Software Update with apply the settings (Part6)

- Use identifier '#:' for config vars in settingsupdate.conf
 2012-11-03 16:19:29 +01:00
Stefan Seyfried
f5121dcb41 locale: fix(?) circular dep, don't install unmaintained locales 
Origin commit data
------------------
Commit: a41951961a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
 2012-11-03 14:15:43 +01:00
Stefan Seyfried
4ea8f88ad8 Merge branch 'uncool/dvbsi++' commit '626f1aabc0a' 
...needs buildfixing...

Conflicts:
	data/Makefile.am
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 7e23ac7223
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
 2012-11-03 10:45:33 +01:00
Stefan Seyfried
943de38f9e change data/Makefile.am to ease merging 
Origin commit data
------------------
Commit: 259533f809
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-02 (Fri, 02 Nov 2012)
 2012-11-02 20:11:00 +01:00
vanhofen
94dbbfb177 deutsch.locale: fix menu.hint_inact_timer 
Origin commit data
------------------
Commit: 8336d4797d
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-01 (Thu, 01 Nov 2012)

Origin message was:
------------------
- deutsch.locale: fix menu.hint_inact_timer
 2012-11-01 20:32:10 +01:00
vanhofen
0b41889b66 locale: improve maintainer-targets 
Origin commit data
------------------
Commit: 22bafbcfc7
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-10-25 (Thu, 25 Oct 2012)

Origin message was:
------------------
- locale: improve maintainer-targets
 2012-10-25 10:43:56 +02:00
Michael Liebmann
de191bde55 Software Update with apply the settings (Part4) 
- Use locale for message boxes


Origin commit data
------------------
Commit: dc8ddc5325
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-10-24 (Wed, 24 Oct 2012)

Origin message was:
------------------
* Software Update with apply the settings (Part4)

- Use locale for message boxes
 2012-10-25 01:10:36 +01:00
Michael Liebmann
3a61143bcb Software Update with apply the settings (Part1) 
- Settings are applied to the image before flashing
- Use the function on the menu "Software Update => Expert functions
 => Write one partition => systemFS with settings"
- Log output to /tmp/update.log for testing
- Use settingsupdate.conf as config file


Origin commit data
------------------
Commit: b001b36f4a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-04-13 (Fri, 13 Apr 2012)

Origin message was:
------------------
* Software Update with apply the settings (Part1)

- Settings are applied to the image before flashing
- Use the function on the menu "Software Update => Expert functions
 => Write one partition => systemFS with settings"
- Log output to /tmp/update.log for testing
- Use settingsupdate.conf as config file
 2012-10-25 01:10:35 +01:00
vanhofen
e3eb62e96e icons: move orphaned icons to a subdir 'orphaned/' 
Origin commit data
------------------
Commit: f581006d0f
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-10-24 (Wed, 24 Oct 2012)

Origin message was:
------------------
- icons: move orphaned icons to a subdir 'orphaned/'
 2012-10-24 17:25:16 +02:00
vanhofen
8a8ae97e03 icons: supplement to previous commit 
Origin commit data
------------------
Commit: 5cee221e46
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-10-24 (Wed, 24 Oct 2012)

Origin message was:
------------------
- icons: supplement to previous commit
 2012-10-24 16:56:28 +02:00
vanhofen
f62e10fe15 icons: supplement to previous commit 
Origin commit data
------------------
Commit: 90e3ad99d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-10-24 (Wed, 24 Oct 2012)

Origin message was:
------------------
- icons: supplement to previous commit
 2012-10-24 16:51:25 +02:00
vanhofen
258eeed950 icons: move locale icons to a subdir 'locale/' 
Origin commit data
------------------
Commit: f92eb8e843
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-10-24 (Wed, 24 Oct 2012)

Origin message was:
------------------
- icons: move locale icons to a subdir 'locale/'
 2012-10-24 16:39:51 +02:00
vanhofen
d2899f2ade locale: rework helperscripts 
Origin commit data
------------------
Commit: ca88052c14
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-10-24 (Wed, 24 Oct 2012)

Origin message was:
------------------
- locale: rework helperscripts
 2012-10-24 16:08:52 +02:00
vanhofen
81e2751a4f locale: fix logic in Makefile 
Origin commit data
------------------
Commit: 725b8be0d6
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-10-24 (Wed, 24 Oct 2012)

Origin message was:
------------------
- locale: fix logic in Makefile
 2012-10-24 16:00:27 +02:00
vanhofen
9ef7db36f6 locale: move scripts to subdir 'helpers/' 
Origin commit data
------------------
Commit: f0bfe2167c
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-10-24 (Wed, 24 Oct 2012)

Origin message was:
------------------
- locale: move scripts to subdir 'helpers/'
 2012-10-24 15:45:57 +02:00
vanhofen
7349f7d73c locale: since focus deutsch.locale isn't longer the masterfile 
Origin commit data
------------------
Commit: ddef0da724
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-10-24 (Wed, 24 Oct 2012)

Origin message was:
------------------
- locale: since focus deutsch.locale isn't longer the masterfile
 2012-10-24 15:14:39 +02:00
vanhofen
be11105470 locale: move unmaintained locale to subdir 'unmaintained/' 
Origin commit data
------------------
Commit: 2e250fcb24
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-10-24 (Wed, 24 Oct 2012)

Origin message was:
------------------
- locale: move unmaintained locale to subdir 'unmaintained/'
 2012-10-24 13:12:05 +02:00
vanhofen
a6369f3432 locals: some very tiny corrections 
Origin commit data
------------------
Commit: dfbff310cc
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-10-24 (Wed, 24 Oct 2012)

Origin message was:
------------------
- locals: some very tiny corrections
 2012-10-24 10:16:56 +02:00
vanhofen
06999b0278 locales: supplement to c73e715 
Origin commit data
------------------
Commit: ac752b70fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-10-24 (Wed, 24 Oct 2012)

Origin message was:
------------------
- locales: supplement to c73e715
 2012-10-24 09:21:56 +02:00
[CST] Focus
c73e715ba7 english.locale: fix some theme menu locals 
Origin commit data
------------------
Commit: 7657effd8e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-10-23 (Tue, 23 Oct 2012)
 2012-10-23 15:24:34 +04:00
Jacek Jendrzej
9831706a54 satellites.xml: update hotbird13 
Origin commit data
------------------
Commit: d21f7ca946
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-19 (Fri, 19 Oct 2012)
 2012-10-19 12:21:47 +02:00
Jacek Jendrzej
871e853518 update locale for commit e36a4b1a74 
Origin commit data
------------------
Commit: c50487fc8b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-19 (Fri, 19 Oct 2012)
 2012-10-19 10:53:43 +02:00
vanhofen
08a5c010ca deutsch.locale: add locals for slow_record stuff 
Origin commit data
------------------
Commit: 58f8e4e452
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-10-17 (Wed, 17 Oct 2012)

Origin message was:
------------------
- deutsch.locale: add locals for slow_record stuff
 2012-10-17 13:53:12 +02:00
[CST] Focus
f8d855d172 locals: add locale for slow record warning option 
Origin commit data
------------------
Commit: 5179aedb32
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-10-16 (Tue, 16 Oct 2012)
 2012-10-16 19:53:15 +04:00
Stefan Seyfried
345a8a274d Merge branch 'uncool/dvbsi++' commit '890b4f2c0a3' 
...needs buildfixing...

Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	lib/libtuxtxt/tuxtxt.h
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/record.cpp
	src/driver/volume.cpp
	src/gui/audio_setup.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/infoviewer.cpp
	src/gui/keybind_setup.cpp
	src/gui/miscsettings_menu.cpp
	src/gui/movieplayer.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/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/Makefile.am
	src/system/configure_network.cpp
	src/system/httptool.cpp
	src/system/setting_helpers.cpp
	src/timerd/timermanager.cpp
	src/zapit/include/zapit/frontend_c.h
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: adb23b23ee
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-14 (Sun, 14 Oct 2012)
 2012-10-14 12:51:07 +02:00
Michael Liebmann
8acb2cd590 Fix english.locale 
Origin commit data
------------------
Commit: 76efa8b033
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)

Origin message was:
------------------
* Fix english.locale
 2012-10-14 11:15:57 +01:00
Michael Liebmann
f609fc53c9 Timerlist: Ask if the timer of a running recording to be deleted. 
Origin commit data
------------------
Commit: 295efb1e07
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)

Origin message was:
------------------
* Timerlist: Ask if the timer of a running recording to be deleted.
 2012-10-14 10:07:22 +01:00
gixxpunk
ae00d07352 locales 
* add german translation
* remove blank


Origin commit data
------------------
Commit: 006ca9e85a
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)

Origin message was:
------------------
- locales

* add german translation
* remove blank
 2012-10-11 19:42:11 +02:00