gixxpunk
32e3e87e2f
fix typo
...
Origin commit data
------------------
Commit: 8f1ed9e031
Author: gixxpunk <thomas.harfmann@gmail.com >
Date: 2017-10-21 (Sat, 21 Oct 2017)
Origin message was:
------------------
- fix typo
2017-10-21 14:47:23 +02:00
vanhofen
a76763262e
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: 1ec298224c
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-19 (Thu, 19 Oct 2017)
2017-10-19 16:08:21 +02:00
vanhofen
c442d261af
yWeb: fix 13d189d622
...
Origin commit data
------------------
Commit: 849cb7dc0f
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-19 (Thu, 19 Oct 2017)
Origin message was:
------------------
- yWeb: fix 13d189d622
2017-10-19 16:06:42 +02:00
vanhofen
700e670b32
yWeb: fix 4eff70753a
...
Origin commit data
------------------
Commit: a19a08636f
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-19 (Thu, 19 Oct 2017)
Origin message was:
------------------
- yWeb: fix 4eff70753a
2017-10-19 16:06:42 +02:00
vanhofen
42b43c524c
add bootlogo.m2v for armbox
...
Origin commit data
------------------
Commit: 641d53101d
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-19 (Thu, 19 Oct 2017)
Origin message was:
------------------
- add bootlogo.m2v for armbox
2017-10-19 13:13:25 +02:00
vanhofen
08b87137cc
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: ef0f0116ae
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-19 (Thu, 19 Oct 2017)
2017-10-19 10:24:47 +02:00
vanhofen
7be8e25298
backup.sh: add some files; sort entrys alphabetically
...
Origin commit data
------------------
Commit: 5ac127c9aa
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-19 (Thu, 19 Oct 2017)
Origin message was:
------------------
- backup.sh: add some files; sort entrys alphabetically
2017-10-19 10:24:04 +02:00
vanhofen
904003dede
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
configure.ac
data/icons/buttons/0.png
data/icons/buttons/1.png
data/icons/buttons/2.png
data/icons/buttons/3.png
data/icons/buttons/4.png
data/icons/buttons/5.png
data/icons/buttons/6.png
data/icons/buttons/7.png
data/icons/buttons/8.png
data/icons/buttons/9.png
data/icons/buttons/blau.png
data/icons/buttons/btn_backward.png
data/icons/buttons/btn_forward.png
data/icons/buttons/btn_pause.png
data/icons/buttons/btn_play.png
data/icons/buttons/btn_record_active.png
data/icons/buttons/btn_record_inactive.png
data/icons/buttons/btn_stop.png
data/icons/buttons/down.png
data/icons/buttons/gelb.png
data/icons/buttons/gruen.png
data/icons/buttons/help.png
data/icons/buttons/help_small.png
data/icons/buttons/home.png
data/icons/buttons/info.png
data/icons/buttons/info_small.png
data/icons/buttons/left.png
data/icons/buttons/menu.png
data/icons/buttons/menu_small.png
data/icons/buttons/mute_small.png
data/icons/buttons/mute_zap_gray.png
data/icons/buttons/mute_zap_green.png
data/icons/buttons/ok.png
data/icons/buttons/power.png
data/icons/buttons/right.png
data/icons/buttons/rot.png
data/icons/buttons/up.png
data/icons/filetypes/movie.png
data/icons/filetypes/mp3.png
data/icons/headers/audio.png
data/icons/headers/bookmarkmanager.png
data/icons/headers/colors.png
data/icons/headers/error.png
data/icons/headers/features.png
data/icons/headers/games.png
data/icons/headers/icon_blue.png
data/icons/headers/icon_green.png
data/icons/headers/icon_red.png
data/icons/headers/icon_yellow.png
data/icons/headers/information.png
data/icons/headers/keybinding.png
data/icons/headers/language.png
data/icons/headers/lcd.png
data/icons/headers/mainmenue.png
data/icons/headers/multimedia.png
data/icons/headers/network.png
data/icons/headers/personalize.png
data/icons/headers/shell.png
data/icons/headers/softupdate.png
data/icons/headers/streaming.png
data/icons/headers/timer.png
data/icons/headers/upnp.png
data/icons/headers/video.png
data/icons/movieplayer/mp_b-skip.png
data/icons/movieplayer/mp_f-skip.png
data/icons/movieplayer/mp_pause.png
data/icons/movieplayer/mp_play.png
data/icons/movieplayer/mp_play_repeat_all.png
data/icons/movieplayer/mp_play_repeat_track.png
data/icons/status/ca/biss_green.png
data/icons/status/ca/biss_white.png
data/icons/status/ca/biss_yellow.png
data/icons/status/ca/conax_green.png
data/icons/status/ca/conax_white.png
data/icons/status/ca/conax_yellow.png
data/icons/status/ca/cw_green.png
data/icons/status/ca/cw_white.png
data/icons/status/ca/cw_yellow.png
data/icons/status/ca/d_green.png
data/icons/status/ca/d_white.png
data/icons/status/ca/d_yellow.png
data/icons/status/ca/ird_green.png
data/icons/status/ca/ird_white.png
data/icons/status/ca/ird_yellow.png
data/icons/status/ca/nagra_green.png
data/icons/status/ca/nagra_white.png
data/icons/status/ca/nagra_yellow.png
data/icons/status/ca/nds_green.png
data/icons/status/ca/nds_white.png
data/icons/status/ca/nds_yellow.png
data/icons/status/ca/powervu_green.png
data/icons/status/ca/powervu_white.png
data/icons/status/ca/powervu_yellow.png
data/icons/status/ca/seca_green.png
data/icons/status/ca/seca_white.png
data/icons/status/ca/seca_yellow.png
data/icons/status/ca/via_green.png
data/icons/status/ca/via_white.png
data/icons/status/ca/via_yellow.png
data/icons/status/ca/x_green.png
data/icons/status/ca/x_white.png
data/icons/status/ca/x_yellow.png
data/icons/status/channel/16_9.png
data/icons/status/channel/16_9_gray.png
data/icons/status/channel/ca2.png
data/icons/status/channel/ca2_gray.png
data/icons/status/channel/dd.png
data/icons/status/channel/dd_avail.png
data/icons/status/channel/dd_gray.png
data/icons/status/channel/radiotextget.png
data/icons/status/channel/radiotextoff.png
data/icons/status/channel/radiotextwait.png
data/icons/status/channel/res_000.png
data/icons/status/channel/res_1080.png
data/icons/status/channel/res_1280.png
data/icons/status/channel/res_1440.png
data/icons/status/channel/res_1920.png
data/icons/status/channel/res_288.png
data/icons/status/channel/res_352.png
data/icons/status/channel/res_382.png
data/icons/status/channel/res_480.png
data/icons/status/channel/res_528.png
data/icons/status/channel/res_544.png
data/icons/status/channel/res_576.png
data/icons/status/channel/res_704.png
data/icons/status/channel/res_720.png
data/icons/status/channel/res_hd.png
data/icons/status/channel/res_sd.png
data/icons/status/channel/subt.png
data/icons/status/channel/subt_gray.png
data/icons/status/channel/tuner_1.png
data/icons/status/channel/tuner_2.png
data/icons/status/channel/tuner_3.png
data/icons/status/channel/tuner_4.png
data/icons/status/channel/vtxt.png
data/icons/status/channel/vtxt_gray.png
data/icons/status/various/ats.png
data/icons/status/various/ats_gray.png
data/icons/status/various/ca.png
data/icons/status/various/lock.png
data/icons/status/various/mounted.png
data/icons/status/various/mute.png
data/icons/status/various/not_mounted.png
data/icons/status/various/pip.png
data/icons/status/various/rec_event_marker.png
data/icons/status/various/rec_gray.png
data/icons/status/various/zap.png
data/locale/Makefile.am
data/locale/english.locale
data/pictures/backgrounds/1280x720/start.jpg
src/driver/fb_accel_sti.cpp
src/gui/Makefile.am
src/gui/dboxinfo.cpp
src/gui/infoviewer_bb.cpp
src/gui/movieplayer.cpp
src/gui/osd_setup.cpp
src/gui/streaminfo2.cpp
src/gui/themes.cpp
src/neutrino.cpp
src/system/flashtool.cpp
src/system/settings.cpp
src/system/settings.h
Origin commit data
------------------
Commit: 4121099dcf
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-18 (Wed, 18 Oct 2017)
2017-10-18 09:41:46 +02:00
vanhofen
57e1571833
scripts: install restore_flash.sh on armbox
...
Origin commit data
------------------
Commit: 4d8f898aef
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-17 (Tue, 17 Oct 2017)
Origin message was:
------------------
- scripts: install restore_flash.sh on armbox
2017-10-17 23:03:48 +02:00
Thilo Graf
fcd9d06d45
Merge branch 'pu/mp' into 'master'
...
Origin commit data
------------------
Commit: ccb19a8880
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-10-17 (Tue, 17 Oct 2017)
2017-10-17 20:38:58 +02:00
Thilo Graf
a0ca1a25f3
icons: add new default iconset, thx OneOfNine
...
Hope it's complete, please report if somthing is missing!
Origin commit data
------------------
Commit: c6d6baa23e
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-10-16 (Mon, 16 Oct 2017)
2017-10-17 20:02:54 +02:00
Thilo Graf
2fc74b8284
data/pictures: add new default background/start image
...
Origin commit data
------------------
Commit: 1bfe78636c
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-10-16 (Mon, 16 Oct 2017)
2017-10-17 20:02:16 +02:00
vanhofen
3cb6cee626
backup-script: allow free definable filename for backup tarball
...
Origin commit data
------------------
Commit: cf1b3ef3ee
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-17 (Tue, 17 Oct 2017)
Origin message was:
------------------
- backup-script: allow free definable filename for backup tarball
2017-10-17 10:43:51 +02:00
vanhofen
81f27fbe8a
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: 356f0073b8
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-16 (Mon, 16 Oct 2017)
2017-10-16 16:44:27 +02:00
vanhofen
13d189d622
yWeb: enable auto-reload of screenshots
...
Origin commit data
------------------
Commit: 9eb1060cbb
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-16 (Mon, 16 Oct 2017)
Origin message was:
------------------
- yWeb: enable auto-reload of screenshots
2017-10-16 16:43:15 +02:00
Jacek Jendrzej
041101db81
Merge branch 'master' into pu/mp
...
Origin commit data
------------------
Commit: 4b8cf23d70
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-10-16 (Mon, 16 Oct 2017)
2017-10-16 13:17:17 +02:00
vanhofen
4eff70753a
yWeb: signalize standby-mode in status-button's color; thx to fred_feuerstein
...
Origin commit data
------------------
Commit: e4f29657ce
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-16 (Mon, 16 Oct 2017)
Origin message was:
------------------
- yWeb: signalize standby-mode in status-button's color; thx to fred_feuerstein
2017-10-16 12:05:35 +02:00
vanhofen
851e9df179
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: 2470f59ece
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-14 (Sat, 14 Oct 2017)
2017-10-14 12:41:52 +02:00
vanhofen
047ab7d836
yWeb: fix grab-handling
...
Origin commit data
------------------
Commit: 488d8a6670
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-14 (Sat, 14 Oct 2017)
Origin message was:
------------------
- yWeb: fix grab-handling
2017-10-14 12:41:20 +02:00
vanhofen
d8355fe5e4
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Conflicts:
src/gui/components/cc_frm_footer.cpp
Origin commit data
------------------
Commit: 33857873dc
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-14 (Sat, 14 Oct 2017)
2017-10-14 07:15:30 +02:00
vanhofen
a11d152062
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: 84484832c3
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-14 (Sat, 14 Oct 2017)
2017-10-14 07:10:33 +02:00
vanhofen
92ff583696
yWeb: fix manual selection of remote control
...
Origin commit data
------------------
Commit: 41e94dbaa3
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-13 (Fri, 13 Oct 2017)
Origin message was:
------------------
- yWeb: fix manual selection of remote control
2017-10-13 18:40:49 +02:00
vanhofen
8395c08d7e
yWeb: add Mutant HD51 remote control; thx to fred_feuerstein
...
Origin commit data
------------------
Commit: 546342b01d
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-13 (Fri, 13 Oct 2017)
Origin message was:
------------------
- yWeb: add Mutant HD51 remote control; thx to fred_feuerstein
2017-10-13 18:40:49 +02:00
vanhofen
7c747e2875
yWeb: improve rc_hd51.png
...
Origin commit data
------------------
Commit: 497aaa29d2
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-13 (Fri, 13 Oct 2017)
Origin message was:
------------------
- yWeb: improve rc_hd51.png
2017-10-13 16:08:39 +02:00
vanhofen
d2bbb94b16
yWeb: fix up/down <-> pageup/pagedown keys; enable sleep key
...
Origin commit data
------------------
Commit: 5a777e82d1
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-13 (Fri, 13 Oct 2017)
Origin message was:
------------------
- yWeb: fix up/down <-> pageup/pagedown keys; enable sleep key
2017-10-13 14:50:13 +02:00
vanhofen
68c3d20998
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Conflicts:
src/gui/infoviewer_bb.cpp
Origin commit data
------------------
Commit: ccb70fd1b1
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-13 (Fri, 13 Oct 2017)
2017-10-13 14:13:22 +02:00
vanhofen
e41ad78e8f
add UHD icons to infoviewer
...
Conflicts:
src/gui/infoviewer_bb.cpp
Origin commit data
------------------
Commit: db184e3abe
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-12 (Thu, 12 Oct 2017)
Origin message was:
------------------
- add UHD icons to infoviewer
Conflicts:
src/gui/infoviewer_bb.cpp
2017-10-13 14:10:34 +02:00
vanhofen
a4bdbfdea2
yWeb: enable grab to do screenshots
...
Origin commit data
------------------
Commit: 641346d84b
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-13 (Fri, 13 Oct 2017)
Origin message was:
------------------
- yWeb: enable grab to do screenshots
2017-10-13 14:06:04 +02:00
Thilo Graf
a2bd290f38
CTimerList: localize info and send timer buttons
...
Origin commit data
------------------
Commit: c1d4da731b
Author: Thilo Graf <dbt@novatux.de >
Date: 2017-10-12 (Thu, 12 Oct 2017)
2017-10-13 12:35:59 +02:00
vanhofen
18bbbbabfe
audio_select: copy full code from TangoCash
...
Just compile tested. Maybe some more alignments needed.
Origin commit data
------------------
Commit: e264e6334b
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-12 (Thu, 12 Oct 2017)
Origin message was:
------------------
- audio_select: copy full code from TangoCash
Just compile tested. Maybe some more alignments needed.
2017-10-12 08:52:32 +02:00
vanhofen
8045ab1dd5
add UHD icons to infoviewer
...
Origin commit data
------------------
Commit: d367c33842
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-12 (Thu, 12 Oct 2017)
Origin message was:
------------------
- add UHD icons to infoviewer
2017-10-12 00:36:45 +02:00
TangoCash
9d0691f1ef
update webif
...
Origin commit data
------------------
Commit: d329663148
Author: TangoCash <eric@loxat.de >
Date: 2017-10-12 (Thu, 12 Oct 2017)
2017-10-12 00:36:45 +02:00
vanhofen
c2cc8c434f
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Conflicts:
src/gui/hdd_menu.cpp
src/gui/hdd_menu.h
Origin commit data
------------------
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-10-02 (Mon, 02 Oct 2017)
2017-10-02 23:21:37 +02:00
Jacek Jendrzej
419a1fe9af
Merge branch 'master' into pu/mp
...
Origin commit data
------------------
Commit: 08dc0d7561
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-09-30 (Sat, 30 Sep 2017)
2017-09-30 13:22:29 +02:00
vanhofen
ffcc694393
deutsch.locale: adjust EPGPlus.remind
...
Origin commit data
------------------
Commit: 17ea8e7d63
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-30 (Sat, 30 Sep 2017)
Origin message was:
------------------
- deutsch.locale: adjust EPGPlus.remind
2017-09-30 13:18:12 +02:00
vanhofen
efe62f6905
deutsch.locale: adjust EPGPlus.remind
...
Origin commit data
------------------
Commit: 081ac08d86
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-30 (Sat, 30 Sep 2017)
Origin message was:
------------------
- deutsch.locale: adjust EPGPlus.remind
2017-09-30 10:13:52 +02:00
vanhofen
0d9a80486a
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Conflicts:
src/driver/rcinput.cpp
src/gui/audioplayer.cpp
src/gui/moviebrowser/mb.cpp
Origin commit data
------------------
Commit: a58f2cc447
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:36:34 +02:00
Stefan Seyfried
3c6d8b4f5c
radio-stations.xml: add some Radio BOB! streams
...
Origin commit data
------------------
Commit: d07e45166e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:52 +02:00
Stefan Seyfried
059c5107fb
radio-stations.xml: clean out nonworking entries
...
Remove all entries that give plain 404 errors or where the host
name cannot be resolved.
Left in some where the playlist url redirects to unreachable hosts
because that might be a temporary failure.
Origin commit data
------------------
Commit: c3b5af06a9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de >
Date: 2017-09-25 (Mon, 25 Sep 2017)
2017-09-25 11:25:52 +02:00
vanhofen
5c12837f35
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: 6dd6df52fb
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-18 (Mon, 18 Sep 2017)
2017-09-18 21:53:44 +02:00
Jacek Jendrzej
ebb4b89d93
Merge branch 'master' into pu/mp
...
Origin commit data
------------------
Commit: ea89db1ec2
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-09-16 (Sat, 16 Sep 2017)
2017-09-16 13:26:53 +02:00
vanhofen
5c5b4f4b0a
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/system/locals.h
src/system/locals_intern.h
Origin commit data
------------------
Commit: 4e868c860a
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-16 (Sat, 16 Sep 2017)
2017-09-16 13:01:20 +02:00
Jacek Jendrzej
6a908d7228
remove unused locale
...
Origin commit data
------------------
Commit: be671bcdc9
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-09-16 (Sat, 16 Sep 2017)
2017-09-16 12:53:03 +02:00
Jacek Jendrzej
678fa9560f
Merge branch 'master' into pu/mp
...
Origin commit data
------------------
Commit: e3998c1ced
Author: Jacek Jendrzej <overx300@gmail.com >
Date: 2017-09-15 (Fri, 15 Sep 2017)
2017-09-15 20:44:49 +02:00
vanhofen
c846cceba5
icons: rename slider icons to more logical names
...
Origin commit data
------------------
Commit: cd539af1f7
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-14 (Thu, 14 Sep 2017)
Origin message was:
------------------
- icons: rename slider icons to more logical names
2017-09-15 20:18:26 +02:00
vanhofen
1af6786518
icons: new slider icons with material colors
...
Origin commit data
------------------
Commit: eb22f29d3d
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-14 (Thu, 14 Sep 2017)
Origin message was:
------------------
- icons: new slider icons with material colors
2017-09-15 20:17:07 +02:00
vanhofen
b6d05461a8
keychooser: strip unneeded code; use hintbox instead of handcrafted paints
...
Origin commit data
------------------
Commit: 5370086103
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-15 (Fri, 15 Sep 2017)
Origin message was:
------------------
- keychooser: strip unneeded code; use hintbox instead of handcrafted paints
2017-09-15 16:34:23 +02:00
vanhofen
4867526810
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: b4701fdcb5
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-15 (Fri, 15 Sep 2017)
2017-09-15 12:53:19 +02:00
vanhofen
da3d2db042
keychooser: strip unneeded code; use hintbox instead of handcrafted paints
...
Origin commit data
------------------
Commit: 04c1cbe15e
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-15 (Fri, 15 Sep 2017)
Origin message was:
------------------
- keychooser: strip unneeded code; use hintbox instead of handcrafted paints
2017-09-15 12:41:06 +02:00
vanhofen
fe16fc9f1d
Merge branch 'ni/tuxbox' into ni/mp/tuxbox
...
Origin commit data
------------------
Commit: b72cda244d
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-09-14 (Thu, 14 Sep 2017)
2017-09-14 22:02:00 +02:00