Commit Graph

1734 Commits

Author SHA1 Message Date
vanhofen
2ec2af7c3f cables.xml: add "antennengemeinschaft penig"
thx Zeng!


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b8d0e156e
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-01-31 (Thu, 31 Jan 2013)

Origin message was:
------------------
- cables.xml: add "antennengemeinschaft penig"

thx Zeng!


------------------
This commit was generated by Migit
2013-01-31 17:28:18 +01:00
[CST] Focus
c641e5c0f8 Merge branch 'dvbsi++' into next
Origin commit data
------------------
Branch: ni/coolstream
Commit: bcd02435dd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-31 17:40:19 +04:00
Jacek Jendrzej
07ff520ab7 add locale minitv
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5803ddf873
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)

Origin message was:
------------------
-add locale minitv

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

------------------
This commit was generated by Migit
2013-01-30 23:41:40 +01:00
[CST] Focus
8beeef6f16 data/locale/english.locale: change bouquets mode 'erase all' to 'erase old'
Origin commit data
------------------
Branch: ni/coolstream
Commit: c7ef67ac84
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-28 11:50:41 +04:00
[CST] Focus
6b9f21b106 locals: add locale for diseqc order and missed hints
Origin commit data
------------------
Branch: ni/coolstream
Commit: 740efbba6b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-24 (Thu, 24 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-24 13:41:58 +04:00
[CST] Bas
5b9a1b8f52 merge neutrino-apollo
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1adc51c0b8
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-01-16 (Wed, 16 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-16 16:27:28 +04:00
[CST] Focus
0afd2ce386 merge public git changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6e41c65fad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-09 (Wed, 09 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-09 19:30:07 +04:00
[CST] Focus
9a813175ad data/locale/english.locale: new locals for tuner setup
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b74fb88cf
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-09 (Wed, 09 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-09 15:40:58 +04:00
Jacek Jendrzej
a2a72a538c neutrino: -add unicabel menu option
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d550ed88e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-08 (Tue, 08 Jan 2013)


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

------------------
This commit was generated by Migit
2013-01-08 20:35:53 +01:00
Stefan Seyfried
e4acb04e3b Merge branch 'uncool/dvbsi++' commit 9ec9ae527b
Conflicts:
	src/driver/framebuffer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d69036be5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-03 (Thu, 03 Jan 2013)



------------------
This commit was generated by Migit
2013-01-03 09:46:11 +01:00
Stefan Seyfried
013b9ea4e7 neutrino: update unicable code
* add an own diseqc type for unicable
* do not configure scr / freq per satellite but only per frontend
* use the diseqc setting of the satellite for determining input 0/1


Origin commit data
------------------
Branch: ni/coolstream
Commit: e1c7f95d63
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-31 (Mon, 31 Dec 2012)



------------------
This commit was generated by Migit
2013-01-01 22:26:07 +01:00
Michael Liebmann
2ec21fc90f Software Update with apply the settings (Part14)
- Add warning/error if not enough space
- THX Striper for translation into English of the locale


Origin commit data
------------------
Branch: ni/coolstream
Commit: 099d0181b6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-01-01 (Tue, 01 Jan 2013)

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

- Add warning/error if not enough space
- THX Striper for translation into English of the locale


------------------
This commit was generated by Migit
2013-01-01 15:05:26 +01:00
Michael Liebmann
0b61b5310b Software Update with apply the settings (Part13)
- Delete files from image, before apply settings


Origin commit data
------------------
Branch: ni/coolstream
Commit: 158a8ba4ce
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-12-19 (Wed, 19 Dec 2012)

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

- Delete files from image, before apply settings


------------------
This commit was generated by Migit
2013-01-01 15:05:21 +01:00
Stefan Seyfried
451901ebaa locale: adapt helper scripts to current compilers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b03fa98ba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-31 (Mon, 31 Dec 2012)


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

------------------
This commit was generated by Migit
2012-12-31 22:16:46 +01:00
Stefan Seyfried
a356ac9148 locale: fix ordercheck target
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59e8be0b58
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-31 (Mon, 31 Dec 2012)


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

------------------
This commit was generated by Migit
2012-12-31 22:16:46 +01:00
Stefan Seyfried
735deec79b create zapit config dir on install
Origin commit data
------------------
Branch: ni/coolstream
Commit: f6e3dcd385
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-31 (Mon, 31 Dec 2012)


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

------------------
This commit was generated by Migit
2012-12-31 22:16:46 +01:00
Stefan Seyfried
a07b5d6289 Merge branch 'uncool/dvbsi++' commit c6136d612f
Conflicts:
	src/gui/widget/hintboxext.cpp
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)



------------------
This commit was generated by Migit
2012-12-30 21:35:20 +01:00
swing99
6e8725fd3e cables.xml: update Kabel Deutschland - Offensive 2012
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0ec6859ea9
Author: swing99 <swing0815@googlemail.com>
Date: 2012-12-10 (Mon, 10 Dec 2012)


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

------------------
This commit was generated by Migit
2012-12-10 16:17:56 +01:00
[CST] Bas
fe727eb954 Merge branch 'dvbsi++' of coolstreamtech.de:cst-private-neutrino into neutrino-apollo
Conflicts:
	src/nhttpd/yhttpd.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9448cd8d2a
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-12-07 (Fri, 07 Dec 2012)



------------------
This commit was generated by Migit
2012-12-07 14:39:05 +08:00
Michael Liebmann
953b5391ff Update locale for menu hints (THX Tomworld)
Origin commit data
------------------
Branch: ni/coolstream
Commit: b5e877639e
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-12-04 (Tue, 04 Dec 2012)

Origin message was:
------------------
* Update locale for menu hints (THX Tomworld)

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

------------------
This commit was generated by Migit
2012-12-04 22:14:57 +01:00
Michael Liebmann
fe8b21074b Pictureviewer: Remove duplicate locale from help text
Origin commit data
------------------
Branch: ni/coolstream
Commit: c691c242ff
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-12-04 (Tue, 04 Dec 2012)

Origin message was:
------------------
* Pictureviewer: Remove duplicate locale from help text

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

------------------
This commit was generated by Migit
2012-12-04 22:14:57 +01:00
Jacek Jendrzej
2aa39cb937 update astra
Origin commit data
------------------
Branch: ni/coolstream
Commit: fbf2c05825
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-12-04 (Tue, 04 Dec 2012)


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

------------------
This commit was generated by Migit
2012-12-04 19:57:30 +01:00
[CST] Bas
8bf199565c neutrino: add TANK video modes (we only support RGB / YPBPR on both cinch and scart at the same time).
Origin commit data
------------------
Branch: ni/coolstream
Commit: b018c08cce
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-12-03 (Mon, 03 Dec 2012)


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

------------------
This commit was generated by Migit
2012-12-04 00:28:34 +08:00
defans
837d16f7f9 add keys to control the audioplayer from pictureviewer
decode and view pictures in a seperate thread.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 031db7bae1
Author: defans <defans@bluepeercrew.us>
Date: 2012-11-30 (Fri, 30 Nov 2012)

Origin message was:
------------------
- add keys to control the audioplayer from pictureviewer

decode and view pictures in a seperate thread.


------------------
This commit was generated by Migit
2012-11-30 22:06:27 +01:00
vanhofen
6c0d69a805 icons: introduce new icons
backward, forward, pause and play


Origin commit data
------------------
Branch: ni/coolstream
Commit: 91abca7d30
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-30 (Fri, 30 Nov 2012)

Origin message was:
------------------
- icons: introduce new icons

backward, forward, pause and play


------------------
This commit was generated by Migit
2012-11-30 13:55:34 +01:00
Michael Liebmann
b7482b6bb6 Moviebrowser: Show message when deleting files
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3cad732b06
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-11-27 (Tue, 27 Nov 2012)

Origin message was:
------------------
* Moviebrowser: Show message when deleting files

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

------------------
This commit was generated by Migit
2012-11-27 13:01:19 +01:00
Michael Liebmann
de3fc8ed1c Moviebrowser: Ask if the file of a running recording to be deleted.
Origin commit data
------------------
Branch: ni/coolstream
Commit: fefa483469
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-11-26 (Mon, 26 Nov 2012)

Origin message was:
------------------
* Moviebrowser: Ask if the file of a running recording to be deleted.

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

------------------
This commit was generated by Migit
2012-11-26 15:03:58 +01:00
Stefan Seyfried
4edeb50241 Merge branch 'uncool/dvbsi++'
Conflicts:
	data/icons/border_lr.png
	data/icons/border_ul.png
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e5e7d52fa1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-23 (Fri, 23 Nov 2012)



------------------
This commit was generated by Migit
2012-11-23 18:45:22 +01:00
vanhofen
5899f2dde0 locales: rework menu.hint_softupdate_settings
Origin commit data
------------------
Branch: ni/coolstream
Commit: e454218d91
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-20 (Tue, 20 Nov 2012)

Origin message was:
------------------
- locales: rework menu.hint_softupdate_settings

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

------------------
This commit was generated by Migit
2012-11-20 21:18:36 +01:00
vanhofen
d09bc1bff2 icons: rework btn_*.png
Origin commit data
------------------
Branch: ni/coolstream
Commit: d63800351e
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-20 (Tue, 20 Nov 2012)

Origin message was:
------------------
- icons: rework btn_*.png

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

------------------
This commit was generated by Migit
2012-11-20 21:09:46 +01:00
Michael Liebmann
41108bafca Software Update: /var/etc/update.urls is excluded from saving
- Message 'Setting takeover successfully...' removed


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


------------------
This commit was generated by Migit
2012-11-19 12:47:31 +01:00
vanhofen
c6fffb4c81 icons: install hint_mb.png
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8183e41d33
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-17 (Sat, 17 Nov 2012)

Origin message was:
------------------
- icons: install hint_mb.png

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

------------------
This commit was generated by Migit
2012-11-17 11:33:46 +01:00
OneOfNine
420644bd43 icons: improve numericpad.png
Origin commit data
------------------
Branch: ni/coolstream
Commit: 51b6928d03
Author: OneOfNine <oneofnine@web.de>
Date: 2012-11-17 (Sat, 17 Nov 2012)

Origin message was:
------------------
- icons: improve numericpad.png

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

------------------
This commit was generated by Migit
2012-11-17 10:42:01 +01:00
OneOfNine
8cbf315be0 icons: improve border_lr.png, border_ul.png
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2012-11-17 10:35:06 +01:00
vanhofen
3a5af9670e icons: add hint_mb.png
Origin commit data
------------------
Branch: ni/coolstream
Commit: 58a50668d4
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-17 (Sat, 17 Nov 2012)

Origin message was:
------------------
- icons: add hint_mb.png

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

------------------
This commit was generated by Migit
2012-11-17 10:29:40 +01:00
vanhofen
23a1ea4e7d icons: new mounted.png, not_mounted.png
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2012-11-17 09:09:35 +01:00
Michael Liebmann
2d33b7b2a0 Software Update: Added more files for network settings in settingsupdate.conf
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2012-11-16 21:51:04 +01:00
vanhofen
164cc7c7a8 deutsch.locale: update
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4af0eed1c5
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-16 (Fri, 16 Nov 2012)

Origin message was:
------------------
- deutsch.locale: update

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

------------------
This commit was generated by Migit
2012-11-16 18:37:48 +01:00
[CST] Focus
9398e22537 locals: add extra hint for local sw update menu point
Origin commit data
------------------
Branch: ni/coolstream
Commit: b2e3f2a19b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-16 19:46:37 +04:00
Michael Liebmann
48abdf965e 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
------------------
Branch: ni/coolstream
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()


------------------
This commit was generated by Migit
2012-11-16 07:14:01 +01:00
gixxpunk
92dadbc680 cables.xml: update um and kms
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2012-11-13 20:00:10 +01:00
Michael Liebmann
8ef2d45fc1 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2012-11-11 08:11:49 +01:00
Stefan Seyfried
fbee2df820 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
------------------
Branch: ni/coolstream
Commit: c480e36746
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-11 (Sun, 11 Nov 2012)



------------------
This commit was generated by Migit
2012-11-11 01:45:22 +01:00
vanhofen
accfa43693 english.locale: fix german word
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9a3d2c4cba
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-09 (Fri, 09 Nov 2012)

Origin message was:
------------------
- english.locale: fix german word

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

------------------
This commit was generated by Migit
2012-11-09 18:00:01 +01:00
Jacek Jendrzej
0af735aa17 src/gui/channellist.cpp:-add sort by channel number
Origin commit data
------------------
Branch: ni/coolstream
Commit: c47aebdb64
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-09 (Fri, 09 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-09 17:32:15 +01:00
Jacek Jendrzej
07ac341c28 neutrino: -add save epg on stadbyOn/Off option
Origin commit data
------------------
Branch: ni/coolstream
Commit: a47c6593dc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-08 (Thu, 08 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-08 13:35:00 +01:00
vanhofen
fac11fd1ee Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
Origin commit data
------------------
Branch: ni/coolstream
Commit: d9625254e0
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-07 (Wed, 07 Nov 2012)


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

------------------
This commit was generated by Migit
2012-11-07 13:04:52 +01:00
vanhofen
f66b48b795 network_setup.cpp: add more suitable hints to hostname-setup
Origin commit data
------------------
Branch: ni/coolstream
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

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

------------------
This commit was generated by Migit
2012-11-07 13:02:40 +01:00
Michael Liebmann
54eb637abe Software Update with apply the settings (Part9)
- Functions now available for internet & local update.
- Rename writemtdExt() to applySettings()


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


------------------
This commit was generated by Migit
2012-11-07 04:06:48 +01:00
vanhofen
8b32bf95dc satellites.xml: update astra 19.2
Origin commit data
------------------
Branch: ni/coolstream
Commit: b6535a4823
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-11-05 (Mon, 05 Nov 2012)

Origin message was:
------------------
- satellites.xml: update astra 19.2

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

------------------
This commit was generated by Migit
2012-11-05 14:06:24 +01:00