Commit graph

2635 commits

Author SHA1 Message Date
Alessya
91b58446ca Rename Icon files 2018-04-17 15:59:00 +03:00
Alessya
b2fb14e57a New icons added for local profile screen 2018-04-17 15:57:54 +03:00
Alessya
383b26ab0c
Merge pull request #1 from MilosKozak/master
get latest changes 17-4-2018
2018-04-17 14:47:04 +03:00
AdrianLxM
050454fc73
Merge pull request #785 from MilosKozak/revert-784-master
Revert "Fixed typo: Temorär -> Temporär"
2018-03-20 19:48:39 +01:00
AdrianLxM
60247daca2
Revert "Fixed typo: Temorär -> Temporär" 2018-03-20 16:19:51 +01:00
AdrianLxM
0d0e219509
Merge pull request #784 from gonium/master
Fixed typo: Temorär -> Temporär
2018-03-20 16:19:27 +01:00
AdrianLxM
a14d698530
small correction to trigger travis again 2018-03-20 15:56:13 +01:00
Mathias Dalheimer
309ee1b9a6 Fixed typo: Temorär -> Temporär 2018-03-20 15:37:47 +01:00
Milos Kozak
f92669f364
Merge pull request #740 from MilosKozak/AdrianLxM-patch-1
Donations Button
2018-03-08 19:11:09 +01:00
AdrianLxM
4e1dbd072d
Donations Button 2018-03-08 18:58:33 +01:00
Milos Kozak
b9b99917d9
Merge pull request #634 from MilosKozak/dev
1.58
2018-02-01 09:55:48 +01:00
AdrianLxM
01e3dbaf44
Merge pull request #636 from MilosKozak/revert-633-patch-1
Revert "Update strings.xml"
2018-02-01 07:44:16 +01:00
AdrianLxM
0139047432
Revert "Update strings.xml" 2018-02-01 07:36:33 +01:00
Milos Kozak
2157022735 bump 1.58 2018-01-31 23:21:02 +01:00
AdrianLxM
13bcff9207
Merge pull request #633 from CaroGo/patch-1
Update strings.xml
2018-01-31 23:06:44 +01:00
AdrianLxM
588cae4282
Merge pull request #627 from andrew-warrington/watchfaces
Watchfaces
2018-01-31 23:05:41 +01:00
Milos Kozak
035770f6d3
Merge pull request #631 from jotomo/issue-template
Add issue template.
2018-01-31 20:26:19 +01:00
CaroGo
815247dabb
Update strings.xml
I did a few changes...
2018-01-31 16:51:00 +01:00
Johannes Mockenhaupt
1ea324d871
Add issue template. 2018-01-31 14:45:57 +01:00
Milos Kozak
fada51c380
Merge pull request #597 from triplem/test
Add a unit test for Insulin Plugin
2018-01-30 22:47:33 +01:00
Markus M. May
a6f65f5d33 Enhance insulin plugin test 2018-01-30 19:52:57 +01:00
Milos Kozak
56451a67bf
Merge pull request #628 from MilosKozak/AdrianLxM-filter-null-btdevices
filter null BT devices
2018-01-30 09:24:03 +01:00
AdrianLxM
3a0d5d73f8
filter null BT devices 2018-01-30 01:02:21 +01:00
Andrew Warrington
0f9273093a BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete. 2018-01-29 23:34:03 +01:00
Andrew Warrington
44e6c874c0 BaseWatchFace: Resolve issue causing Bolus and Wizard activities to fail to complete. 2018-01-29 23:31:54 +01:00
Milos Kozak
9255b93800 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into history 2018-01-29 20:06:16 +01:00
Milos Kozak
b11e301391 ES translations 2018-01-29 20:05:16 +01:00
Milos Kozak
1eba5b79b8 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-01-29 13:28:36 +01:00
Milos Kozak
4cef8db54b Dana plugin refactoring 2018-01-29 11:24:03 +01:00
Milos Kozak
f54452515b KO language cleanup 2018-01-28 23:29:33 +01:00
Milos Kozak
20d08afc31
Merge pull request #625 from warstar2187/dev
KR translation
2018-01-28 23:17:51 +01:00
warstar2187
c297ce88bb
Update strings.xml 2018-01-28 11:01:56 +09:00
warstar2187
76d606fddf
Update strings.xml 2018-01-28 10:51:09 +09:00
Milos Kozak
10af618492
Merge pull request #624 from RadoslavR/patch-50
Bg translation
2018-01-27 15:23:03 +01:00
Radoslav Radev
d4fe03ac30
Bg translation 2018-01-27 16:12:51 +02:00
Milos Kozak
ce3c888246 add RO language 2018-01-27 13:40:19 +01:00
Milos Kozak
d634ee7d4b CS translations 2018-01-26 22:10:27 +01:00
Milos Kozak
e5d20ca996 ButterKnife to Dana fragment 2018-01-26 17:18:40 +01:00
Milos Kozak
a7a4693e9c
Merge pull request #621 from jotomo/disable-release-checks
Disable release build checks until wear lib upgrade (#620).
2018-01-26 16:18:48 +01:00
Johannes Mockenhaupt
3100447167
Disable release build checks until wear lib upgrade (#620). 2018-01-26 15:57:26 +01:00
Milos Kozak
d8a6c0d111 Rv2,RS: use safe carb diff 30s 2018-01-26 15:47:45 +01:00
Milos Kozak
6be2988e31
Merge pull request #619 from MilosKozak/sdk27
Sdk27
2018-01-26 10:14:21 +01:00
Milos Kozak
3c1e18d5d2
Merge pull request #617 from jotomo/push-carbs-to-supported-pumps-only
Push carbs only to pumps supporting storing carbs.
2018-01-26 10:10:16 +01:00
Milos Kozak
26852e1ed3
Merge pull request #618 from jotomo/format-specifier-fixes
Fix format specifices in Spanish translation, add MainApp.gs(id, args).
2018-01-26 10:03:17 +01:00
Johannes Mockenhaupt
0067eb75d5
Fix format specifiers in Spanish translation, add MainApp.gs(id, args). 2018-01-25 20:28:21 +01:00
Milos Kozak
9213182b7b travis accept license manually 2018-01-25 13:28:46 +01:00
Johannes Mockenhaupt
ed1226ae67
Push carbs only to pumps supporting storing carbs. 2018-01-25 13:22:01 +01:00
Milos Kozak
91bd21131d Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-01-25 11:27:17 +01:00
Milos Kozak
ca01168474
Merge pull request #611 from MilosKozak/min_unreachable
minimum of 30 min for unreachable alert
2018-01-25 11:24:09 +01:00
Milos Kozak
1ba793304f
Merge pull request #616 from jotomo/check-that-box
Overview: make checkbox labels toggle state as well.
2018-01-25 11:23:06 +01:00