MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-15 06:29:24 +01:00
Code Releases Wiki Activity
3,057 Commits 86 Branches 232 Tags 88 MiB
8f298df5c8
Commit Graph

880 Commits

Author SHA1 Message Date
Daniele Gobbetti
72f76b60d3 Pebble: send temperatures according to the configured measurement system 
Fixes #858
<Without further comments but feel free to insert a long rant about the beauty of the metric system>
 2017-11-01 17:58:58 +01:00
Daniele Gobbetti
e7839f1c39 Replace the Combined Charts with simple Line Charts 
Fixes #808
The datasets had to be separed in order to fill the area below each line with the right color.
 2017-11-01 17:35:05 +01:00
Daniele Gobbetti
98b04dd2fc Allow disabling left/right swipe on the graphs 
Fixes #860
 Added preference to control this option
 Swiping down will still toggle a sync of the data from the device (if connected) in any case
 2017-11-01 09:07:01 +01:00
Andreas Shimokawa
c43b31b1e7 bump version, update changelog 2017-10-30 09:10:03 +01:00
Andreas Shimokawa
958f586212 change "Bip" in settings to "Amazfit" (to include Cor) 2017-10-25 22:49:29 +02:00
Andreas Shimokawa
e20c88e3de update changelogs 2017-10-25 22:47:55 +02:00
Yaron Shahrabani
c2c0b87f3c Translated using Weblate (Hebrew) 
Currently translated at 100.0% (419 of 419 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/he/
 2017-10-25 22:38:35 +02:00
Hadrián Candela
3a6365681c Translated using Weblate (Galician) 
Currently translated at 100.0% (419 of 419 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/gl/
 2017-10-25 22:38:35 +02:00
Andreas Shimokawa
8cf69fbc80 Translated using Weblate (German) 
Currently translated at 98.8% (412 of 417 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/
 2017-10-25 22:38:35 +02:00
Jonas
e40644658e Translated using Weblate (French) 
Currently translated at 100.0% (417 of 417 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fr/
 2017-10-25 22:38:35 +02:00
Jonas
efa11127b7 Translated using Weblate (Spanish) 
Currently translated at 100.0% (417 of 417 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
 2017-10-25 22:38:35 +02:00
Andreas Shimokawa
94cfaadc41 Amazfit Cor: whitelist latest .res and .fw 
Add a note about this being totally untested, especially scary since the new res format is different.
 2017-10-25 22:26:38 +02:00
Andreas Shimokawa
55cdc6d1c5 Amazfit Cor: Untested firmware update support 
(refactor stuff along the way)
 2017-10-24 22:01:25 +02:00
Andreas Shimokawa
0f46ea2a59 Try to blindly add support for Amazfit Cor 2017-10-23 11:28:51 +02:00
Yaron Shahrabani
086974be8c Translated using Weblate (Hebrew) 
Currently translated at 100.0% (417 of 417 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/he/
 2017-10-22 22:31:30 +02:00
Jonas
5d94eada0d Translated using Weblate (Spanish) 
Currently translated at 100.0% (416 of 416 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
 2017-10-22 22:31:30 +02:00
Jonas
f05ae042c6 Translated using Weblate (French) 
Currently translated at 100.0% (416 of 416 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fr/
 2017-10-22 22:31:30 +02:00
Bożydar
13bd724f97 Translated using Weblate (Polish) 
Currently translated at 70.6% (294 of 416 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
 2017-10-22 22:31:30 +02:00
Bożydar
9d5afc50b6 Translated using Weblate (Polish) 
Currently translated at 70.4% (293 of 416 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/

Zależy od kontekstu
 2017-10-22 22:31:30 +02:00
Bożydar
0383311c18 Translated using Weblate (Polish) 
Currently translated at 60.5% (252 of 416 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
 2017-10-22 22:31:30 +02:00
Bożydar
0addf7ed06 Translated using Weblate (Polish) 
Currently translated at 59.3% (247 of 416 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/pl/
 2017-10-22 22:31:30 +02:00
Yaron Shahrabani
c5969918f9 Translated using Weblate (Hebrew) 
Currently translated at 99.7% (415 of 416 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/he/
 2017-10-22 22:31:30 +02:00
Daniele Gobbetti
5262c6e3d7 Add quick actions buttons to Gadgetbridge notification #759 
- Disconnect button if connected
- Fetch activity if connected and supported by device
- (re)connect the last connected device if disconnected

Known bug: In the last case, if multiple devices were connected, the wrong device gets re-connected
 2017-10-20 22:49:53 +02:00
Andreas Shimokawa
6603b3fa05 Merge branch 'background-javascript' 2017-10-16 23:06:36 +02:00
Jasper
32cb40394f Translated using Weblate (Dutch) 
Currently translated at 29.2% (121 of 413 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
 2017-10-15 23:57:11 +02:00
Yaron Shahrabani
fa6c98d969 Translated using Weblate (Hebrew) 
Currently translated at 99.7% (412 of 413 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/he/
 2017-10-15 23:57:11 +02:00
Jonas
3882b1703a Translated using Weblate (Spanish) 
Currently translated at 100.0% (413 of 413 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
 2017-10-15 23:57:11 +02:00
Andreas Shimokawa
54231ba490 update changelogs, bump version 2017-10-15 22:29:35 +02:00
Daniele Gobbetti
e99b802a35 Pebble: enable toggle background JS only if experimental features are enabled 2017-10-10 22:00:01 +02:00
Andreas Shimokawa
fbef490419 Merge branch 'master' into background-javascript 2017-10-04 21:49:39 +02:00
Andreas Shimokawa
32e1dec0f8 bump version update changelogs 
(release real 0.21.5 early because 0.21.4 had a mismatched version/tag)
 2017-10-04 19:44:21 +02:00
Andreas Shimokawa
49bebc3440 Merge branch 'master' into background-javascript 2017-10-01 23:36:22 +02:00
Andreas Shimokawa
58c7691142 fix typo 2017-10-01 22:50:05 +02:00
Andreas Shimokawa
b982d27c9a bump version, update changelog 2017-10-01 22:36:26 +02:00
naofum
8e0688ba66 Translated using Weblate (Japanese) 
Currently translated at 75.0% (310 of 413 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ja/
 2017-09-29 18:18:17 +02:00
LL
33d49dbdcc Translated using Weblate (French) 
Currently translated at 100.0% (413 of 413 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fr/
 2017-09-29 18:18:17 +02:00
Andreas Shimokawa
0ffa2ce45a move up measuerement system from hplus to global preferences 2017-09-29 12:33:08 +02:00
Andreas Shimokawa
e6d939e5cb Merge branch 'master' into background-javascript 2017-09-28 17:31:45 +02:00
Andreas Shimokawa
7e29234a7e bump version, update changelog 2017-09-28 16:09:48 +02:00
Andreas Shimokawa
0a9664d5ec Merge branch 'master' into background-javascript 2017-09-25 23:50:08 +02:00
Andreas Shimokawa
56269c5a37 bump version, add changelog 2017-09-25 22:22:59 +02:00
Daniele Gobbetti
e8ae47de79 Pebble: Make background JS support toggle-able 
- Add preference to enable background JS (default disabled)
- Remove the dummy activity used to create the webview, use ExternalPebbleJSActivity instead
- Add layout for legacy configuration, used if background JS is not enabled
- Create the view upon connecting, not when launching the application
- Remove the generic helpers used to find out if any device would need the background webview
- Drastic refactoring of WebviewSingleton moving internal classes in a new package "webview" in service/devices/pebble
 2017-09-25 17:12:35 +02:00
Daniele Gobbetti
af6271a428 Merge branch 'master' into background-javascript 2017-09-25 11:21:11 +02:00
Daniele Gobbetti
4d2cc8cfcb Reconcile with changes in italian strings file 
Closes #796
 2017-09-25 10:59:00 +02:00
Jonas
ad5dcb0836 Translated using Weblate (French) 
Currently translated at 100.0% (413 of 413 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fr/
 2017-09-25 09:58:31 +02:00
Hadrián Candela
a19c3093fc Translated using Weblate (Galician) 
Currently translated at 100.0% (413 of 413 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/gl/
 2017-09-25 09:58:31 +02:00
Hadrián Candela
a1ed51edde Translated using Weblate (Galician) 
Currently translated at 97.5% (403 of 413 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/gl/
 2017-09-25 09:58:31 +02:00
masakoodaa
71f10ee30e Translated using Weblate (Finnish) 
Currently translated at 8.4% (35 of 413 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fi/
 2017-09-25 09:58:31 +02:00
masakoodaa
d0725782c9 Translated using Weblate (Finnish) 
Currently translated at 0.7% (3 of 413 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fi/
 2017-09-25 09:58:31 +02:00
Jasper
8d27c9baab Translated using Weblate (Dutch) 
Currently translated at 23.0% (95 of 413 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/nl/
 2017-09-25 09:58:31 +02:00
masakoodaa
98250855bc Added translation using Weblate (Finnish) 2017-09-25 09:58:31 +02:00
Jasper
e86673fd1f Added translation using Weblate (Dutch) 2017-09-25 09:58:31 +02:00
c4ndel4
ac8524f503 Translated using Weblate (Galician) 
Currently translated at 38.7% (160 of 413 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/gl/
 2017-09-25 09:58:31 +02:00
c4ndel4
f230750a5c Translated using Weblate (Galician) 
Currently translated at 1.2% (5 of 413 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/gl/
 2017-09-25 09:58:31 +02:00
c4ndel4
178445e98c Added translation using Weblate (Galician) 2017-09-25 09:58:31 +02:00
Minori Hiraoka (미노리)
d533f92748 Translated using Weblate (Korean) 
Currently translated at 55.4% (229 of 413 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ko/
 2017-09-25 09:58:31 +02:00
Jonas
5150ec11a3 Translated using Weblate (Spanish) 
Currently translated at 100.0% (414 of 414 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
 2017-09-25 09:58:31 +02:00
Jonas
dc29bb7fca Translated using Weblate (French) 
Currently translated at 100.0% (414 of 414 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fr/
 2017-09-25 09:58:31 +02:00
Jonas
36cd9ba2b5 Translated using Weblate (French) 
Currently translated at 100.0% (409 of 409 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fr/
 2017-09-25 09:58:31 +02:00
Jonas
a59e9d8877 Translated using Weblate (Spanish) 
Currently translated at 100.0% (409 of 409 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
 2017-09-25 09:58:27 +02:00
Andreas Shimokawa
99d873a178 Merge branch 'master' into background-javascript 2017-09-13 21:51:55 +02:00
mueller-ma
92d79055e0 Remove nontranslatable string 2017-09-12 23:01:45 +02:00
mueller-ma
a845f21493 Make broadcast non translatable 2017-09-12 23:01:45 +02:00
mueller-ma
d7152f568f Adjust strings to meet material guidlines 
Signed-off-by: mueller-ma <mueller-ma@users.noreply.github.com>
 2017-09-12 23:01:45 +02:00
mueller-ma
37b5cd626e Translated using Weblate (German) 
Currently translated at 99.0% (410 of 414 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/
 2017-09-12 22:37:24 +02:00
Jonas
06c4a91eee Translated using Weblate (Spanish) 
Currently translated at 100.0% (414 of 414 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
 2017-09-12 22:37:24 +02:00
Jonas
13b141b22f Translated using Weblate (French) 
Currently translated at 100.0% (414 of 414 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fr/
 2017-09-12 22:37:24 +02:00
Minori Hiraoka (미노리)
3e48e97ab3 Translated using Weblate (Korean) 
Currently translated at 35.4% (145 of 409 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ko/
 2017-09-12 22:37:24 +02:00
naofum
0e0310efa8 Translated using Weblate (Japanese) 
Currently translated at 75.0% (307 of 409 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ja/
 2017-09-12 22:37:24 +02:00
Jonas
33aa1eff90 Translated using Weblate (French) 
Currently translated at 100.0% (409 of 409 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fr/
 2017-09-12 22:37:24 +02:00
Jonas
b190354ba1 Translated using Weblate (Spanish) 
Currently translated at 100.0% (409 of 409 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
 2017-09-12 22:37:24 +02:00
mueller-ma
78494f3155 Display button action settings as disabled when feature disabled 
Signed-off-by: mueller-ma <mueller-ma@users.noreply.github.com>
 2017-09-12 20:24:03 +02:00
Andreas Shimokawa
acf779a8e4 Amazfit Bip: fix long messages not being displayed at all 2017-09-11 23:20:57 +02:00
Andreas Shimokawa
0b8494faee Bump version, add changelog 2017-09-11 22:35:08 +02:00
Michal Novotny
05d0625b68 Mi Band 2: Implement multiple button actions 
This enables option for multiple button actions according to the "Delay after button action". This broadcast is being sent to the intent
along with button_id extra identifying how many times have the pass been done.

By pass defined number of button presses is meant.
 2017-09-10 23:02:13 +02:00
Daniele Gobbetti
6def9dc07e Pebble: allow to translate quick actions sent to the watch 
Fixes #789
 2017-09-10 17:57:18 +02:00
Andreas Shimokawa
3e05f8ff4a Merge branch 'master' into background-javascript 2017-09-05 22:49:07 +02:00
Andreas Shimokawa
1efd73af5e Update README and changelogs 2017-09-05 22:48:03 +02:00
Michal Novotny
fcf9be877a Support for button actions on Mi Band 2 device (#793) 
Implement button actions for MiBand 2
 2017-09-05 22:37:41 +02:00
Yaron Shahrabani
25fdf50525 Translated using Weblate (Hebrew) 
Currently translated at 100.0% (396 of 396 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/he/
 2017-09-05 21:04:21 +02:00
Yaron Shahrabani
4ea93a2471 Translated using Weblate (Hebrew) 
Currently translated at 100.0% (396 of 396 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/he/
 2017-09-05 21:04:21 +02:00
Jonas
0f6a86ef8f Translated using Weblate (Spanish) 
Currently translated at 100.0% (396 of 396 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
 2017-09-05 21:04:21 +02:00
Yaron Shahrabani
0e6b73502b Translated using Weblate (Hebrew) 
Currently translated at 97.9% (388 of 396 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/he/
 2017-09-05 21:04:21 +02:00
Jonas
345338b16a Translated using Weblate (French) 
Currently translated at 100.0% (396 of 396 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fr/
 2017-09-05 21:04:21 +02:00
Jonas
a727b859e0 Translated using Weblate (English) 
Currently translated at 100.0% (396 of 396 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/en/
 2017-09-05 21:04:21 +02:00
Jonas
3f800e5fd3 Translated using Weblate (French) 
Currently translated at 100.0% (396 of 396 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/fr/
 2017-09-05 21:04:21 +02:00
Jonas
fac2778d05 Translated using Weblate (Spanish) 
Currently translated at 100.0% (396 of 396 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/es/
 2017-09-05 21:04:21 +02:00
naofum
057cf7a0d8 Translated using Weblate (Japanese) 
Currently translated at 74.3% (296 of 398 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/ja/
 2017-09-05 21:04:21 +02:00
Jan Lolek
62e1b1fc84 Translated using Weblate (Czech) 
Currently translated at 79.3% (316 of 398 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/cs/
 2017-09-05 21:04:21 +02:00
Andreas Shimokawa
1f3530c22d Translated using Weblate (German) 
Currently translated at 98.7% (393 of 398 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/
 2017-09-05 21:04:21 +02:00
Daniele
a21c93359b Translated using Weblate (Italian) 
Currently translated at 91.1% (361 of 396 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/it/
 2017-09-05 21:04:20 +02:00
mueller-ma
ea3dd08d0e Translated using Weblate (German) 
Currently translated at 98.9% (392 of 396 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/
 2017-09-05 21:03:45 +02:00
Michal Novak
d6c2623ef2 Translated using Weblate (Czech) 
Currently translated at 79.2% (314 of 396 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/cs/
 2017-09-05 21:03:12 +02:00
mueller-ma
29ecac3557 Translated using Weblate (German) 
Currently translated at 86.8% (344 of 396 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/
 2017-09-05 21:02:42 +02:00
mueller-ma
03a8535078 Translated using Weblate (German) 
Currently translated at 98.2% (389 of 396 strings)

Translation: Freeyourgadget/Gadgetbridge
Translate-URL: https://hosted.weblate.org/projects/freeyourgadget/gadgetbridge/de/
 2017-09-05 21:02:00 +02:00
Andreas Shimokawa
a911ba5423 Merge branch 'master' into background-javascript 2017-09-04 21:08:36 +02:00
Sami Alaoui
f6ce0c1a0e Add initial support for Teclast H30 
Scan and connection, battery level, firmware version, date and time sync
(along with some other currently hardcoded settings), notification
support, alarm support, and some more.
 2017-09-04 20:59:09 +02:00
Daniele Gobbetti
bb962001a5 Merge branch 'master' into background-javascript 
# Conflicts:
#	app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBApplication.java
 2017-09-03 16:49:27 +02:00
protomors
259fc87b68 Added device icon in resources. 2017-09-01 22:19:33 +02:00
Andreas Shimokawa
c627d690c7 Merge branch 'master' into background-javascript 2017-08-29 22:53:38 +02:00