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

632 Commits

Author SHA1 Message Date
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
vanhofen
49b5d06a97 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++ 
Origin commit data
------------------
Commit: ce3f8eddf1
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-10-11 (Thu, 11 Oct 2012)
 2012-10-11 17:03:45 +02:00
vanhofen
f1fe58f374 network_setup.cpp: add ntp-server to network-test 
Origin commit data
------------------
Commit: 7a7aec266a
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-10-11 (Thu, 11 Oct 2012)

Origin message was:
------------------
- network_setup.cpp: add ntp-server to network-test
 2012-10-11 17:02:37 +02:00
[CST] Focus
555168852a Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++ 
Origin commit data
------------------
Commit: 11c5567cbc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)
 2012-10-11 18:03:04 +04:00
Jacek Jendrzej
d230fe8df0 satellites.xml: update astra19 hotbird13 
Origin commit data
------------------
Commit: 849b306985
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
 2012-10-10 13:07:10 +02:00
[CST] Focus
dac4a67678 Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++ 
Origin commit data
------------------
Commit: 1c113127ce
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-10-08 (Mon, 08 Oct 2012)
 2012-10-08 11:06:47 +04:00
Stefan Seyfried
10912985a5 use classic neutrino startup and shutdown logo for neutrino-mp 
Origin commit data
------------------
Commit: 652f0e596f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-07 (Sun, 07 Oct 2012)
 2012-10-07 17:34:56 +02:00
Stefan Seyfried
158255d40d osd setup: fix OSD area setup 
The PNGs used to mark the upper left and bottom right corners
were both two pixels off, which resulted in the OSD area being
slightly bigger than indicated.


Origin commit data
------------------
Commit: 91b2998d68
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-07 (Sun, 07 Oct 2012)
 2012-10-07 17:30:44 +02:00
Stefan Seyfried
34823f1c8d add basic support for DVB-T 
This needs more fine tuning wrt scan setup etc, but should work for now.


Origin commit data
------------------
Commit: b02886aa92
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-07 (Sun, 07 Oct 2012)
 2012-10-07 17:09:17 +02:00
gixxpunk
ffbce71446 deutsch.locale: add some missing entries 
Origin commit data
------------------
Commit: 27124f0328
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2012-10-06 (Sat, 06 Oct 2012)

Origin message was:
------------------
- deutsch.locale: add some missing entries
 2012-10-06 18:40:45 +02:00
gixxpunk
7a59a05c9e cables.xml: add new transponders for Unitymedia 
Origin commit data
------------------
Commit: 4a819b80eb
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2012-10-06 (Sat, 06 Oct 2012)

Origin message was:
------------------
- cables.xml: add new transponders for Unitymedia
 2012-10-06 18:40:30 +02:00
[CST] Focus
e5fc214a64 locals: add locales for start wizard initial settings 
Origin commit data
------------------
Commit: 410b19aaf3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-09-29 (Sat, 29 Sep 2012)
 2012-09-29 14:45:57 +04:00
[CST] Focus
00ce5f0271 locals: add locales for record status 
Origin commit data
------------------
Commit: 59ea9c05f3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-09-25 (Tue, 25 Sep 2012)
 2012-09-25 17:13:25 +04:00
Stefan Seyfried
0acbc5ed51 use 'Neutrino' instead of 'Neutrino-HD' in locales 
Origin commit data
------------------
Commit: 1a62480581
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-09-23 (Sun, 23 Sep 2012)
 2012-09-23 21:10:54 +02:00
vanhofen
f36d3bd2c0 neutrino.cpp: localize "Saving EPG" 
Origin commit data
------------------
Commit: 708b6a3ad0
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-09-19 (Wed, 19 Sep 2012)

Origin message was:
------------------
- neutrino.cpp: localize "Saving EPG"
 2012-09-19 21:58:21 +02:00
Michael Liebmann
8eda617a50 Update deutsch.locale 
Origin commit data
------------------
Commit: 1b1213c7bb
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-09-18 (Tue, 18 Sep 2012)

Origin message was:
------------------
* Update deutsch.locale
 2012-09-18 03:42:41 +01:00
[CST] Focus
13a635cde3 locals: add hint for rotor move voltage 
Origin commit data
------------------
Commit: e1b5dde7d9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-09-10 (Mon, 10 Sep 2012)
 2012-09-10 19:18:32 +04:00
[CST] Focus
1144260111 locals: add new locale for playback bookmark menu head 
Origin commit data
------------------
Commit: 29ecf0d742
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-31 (Fri, 31 Aug 2012)
 2012-08-31 12:00:52 +04:00
swing99
391362267e cables.xml: update Kabel Deutschland - Offensive 2012 
Origin commit data
------------------
Commit: fe0f7ad28e
Author: swing99 <swing0815@googlemail.com>
Date: 2012-08-28 (Tue, 28 Aug 2012)

Origin message was:
------------------
- cables.xml: update Kabel Deutschland - Offensive 2012
 2012-08-28 17:54:01 +02:00
vanhofen
d4aecefda7 locales: very tiny typo 
Origin commit data
------------------
Commit: d284f5fce5
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-08-25 (Sat, 25 Aug 2012)

Origin message was:
------------------
- locales: very tiny typo
 2012-08-25 15:00:32 +02:00
Michael Liebmann
6515b77ed6 Update deutsch.locale 
Origin commit data
------------------
Commit: c8c932bdc9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-08-17 (Fri, 17 Aug 2012)

Origin message was:
------------------
* Update deutsch.locale
 2012-08-17 00:20:50 +01:00
[CST] Focus
9e645955c7 locals: add locale for volume percent adjustment 
Origin commit data
------------------
Commit: a00a4ba99b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-16 (Thu, 16 Aug 2012)
 2012-08-16 15:52:38 +04:00
Michael Liebmann
2bfa5767af gui/update_menue.cpp: add menu hints 
Origin commit data
------------------
Commit: 569725ff44
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-08-11 (Sat, 11 Aug 2012)

Origin message was:
------------------
* gui/update_menue.cpp: add menu hints
 2012-08-11 00:40:10 +01:00
Michael Liebmann
395daafe35 Use dynamic text for software update online/local 
Origin commit data
------------------
Commit: bb4682125f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-08-10 (Fri, 10 Aug 2012)

Origin message was:
------------------
* Use dynamic text for software update online/local
 2012-08-11 00:40:10 +01:00
Michael Liebmann
2530da102d 'locale' targets: Fix 'sort-locals' 
Origin commit data
------------------
Commit: 77bccfce64
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-08-11 (Sat, 11 Aug 2012)

Origin message was:
------------------
* 'locale' targets: Fix 'sort-locals'
 2012-08-11 00:40:09 +01:00