Commit graph

1752 commits

Author SHA1 Message Date
Milos Kozak
c94dda1f0a
Merge branch 'dev' into ench_1455_custom_actions 2019-02-22 15:27:00 +01:00
Andy Rozman
b0fe8fc5aa Merge branch 'dev' into ench_1455_custom_actions 2019-02-20 23:41:09 +00:00
Milos Kozak
95297a6292 Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2019-02-19 16:26:35 +01:00
Milos Kozak
1f3696608e Tomato BGSource plugin 2019-02-19 16:26:16 +01:00
AdrianLxM
c38d07950a
key not translatable 2019-02-17 21:01:06 +01:00
Milos Kozak
57d472212b
New Crowdin translations (#1622)
* New translations strings.xml (Afrikaans)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Korean)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Russian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Dutch)

* New translations strings.xml (Czech)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (French)

* New translations strings.xml (Italian)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Korean)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Russian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Dutch)

* New translations strings.xml (Czech)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (French)

* New translations strings.xml (Italian)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Slovak)

* New translations strings.xml (Czech)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (German)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations strings.xml (Russian)

* New translations insight_alert_codes.xml (Russian)

* New translations insight_alert_descriptions.xml (Russian)

* New translations strings.xml (Russian)

* New translations insight_alert_descriptions.xml (Russian)

* New translations insight_alert_titles.xml (Russian)

* New translations strings.xml (Russian)

* New translations insight_alert_titles.xml (Russian)

* New translations insight_alert_titles.xml (Russian)

* New translations insight_exceptions.xml (Russian)

* New translations strings.xml (German)

* New translations strings.xml (Slovak)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)
2019-02-17 18:26:59 +01:00
TebbeUbben
361cc158e8 Timeout during handshake notification 2019-02-16 20:28:49 +01:00
TebbeUbben
d2b0665af1 Merge branch 'master' into insight-dev2 2019-02-12 15:01:29 +01:00
TebbeUbben
a4312acb3e Incremental recovery duration 2019-02-12 14:54:27 +01:00
TebbeUbben
05aa369bae Merge branch 'master' into insight-dev
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/Wear/ActionStringHandler.java
2019-02-09 22:52:01 +01:00
TebbeUbben
6cb3b5fcac Change Insight driver strings 2019-02-09 22:01:11 +01:00
Milos Kozak
42032eede8 Merge branch 'dev' into G6 2019-02-08 19:25:33 +01:00
Milos Kozak
f540c70f22 Merge branch 'dev' into G6 2019-02-08 19:11:38 +01:00
Milos Kozak
97ace868d0
New Crowdin translations (#1614)
* New translations strings.xml (Czech)

* New translations strings.xml (Afrikaans)

* New translations strings.xml (Romanian)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Polish)

* New translations strings.xml (Korean)

* New translations strings.xml (Turkish)

* New translations strings.xml (Swedish)

* New translations strings.xml (Russian)

* New translations strings.xml (Spanish)

* New translations strings.xml (Slovak)

* New translations strings.xml (Dutch)

* New translations strings.xml (Czech)

* New translations strings.xml (Chinese Simplified)

* New translations strings.xml (Bulgarian)

* New translations strings.xml (French)

* New translations strings.xml (Italian)

* New translations strings.xml (Greek)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Slovak)

* New translations insight_exceptions.xml (Slovak)

* New translations insight_alert_titles.xml (Slovak)

* New translations insight_alert_codes.xml (Slovak)

* New translations insight_alert_descriptions.xml (Slovak)

* New translations strings.xml (Bulgarian)
2019-02-08 18:53:19 +01:00
AdrianLxM
9df8273694
Merge pull request #1613 from TebbeUbben/dev-nico
Status lights with Insight support
2019-02-02 23:45:52 +01:00
Milos Kozak
5b462c4931
Merge pull request #1600 from tim2000s/dev
Upadted AMA Autosens string
2019-02-02 18:07:28 +01:00
Milos Kozak
3e694de755
New Crowdin translations (#1581)
* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations strings.xml (Turkish)

* New translations strings.xml (German)

* New translations strings.xml (Spanish)

* New translations strings.xml (Spanish)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Dutch)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Dutch)

* New translations strings.xml (Swedish)

* New translations strings.xml (Portuguese)

* New translations strings.xml (Russian)

* New translations insight_alert_codes.xml (Polish)

* New translations insight_alert_codes.xml (Romanian)

* New translations insight_exceptions.xml (Portuguese)

* New translations insight_alert_titles.xml (Portuguese)

* New translations insight_alert_descriptions.xml (Portuguese)

* New translations insight_alert_codes.xml (Portuguese)

* New translations insight_exceptions.xml (Polish)

* New translations insight_alert_titles.xml (Polish)

* New translations insight_alert_descriptions.xml (Polish)

* New translations insight_alert_titles.xml (Romanian)

* New translations insight_exceptions.xml (Korean)

* New translations insight_alert_titles.xml (Korean)

* New translations insight_alert_descriptions.xml (Korean)

* New translations insight_alert_codes.xml (Korean)

* New translations insight_exceptions.xml (Japanese)

* New translations insight_alert_titles.xml (Japanese)

* New translations insight_alert_descriptions.xml (Japanese)

* New translations insight_alert_codes.xml (Japanese)

* New translations insight_alert_descriptions.xml (Romanian)

* New translations insight_exceptions.xml (Romanian)

* New translations insight_alert_titles.xml (Italian)

* New translations insight_alert_descriptions.xml (Spanish)

* New translations insight_alert_titles.xml (Turkish)

* New translations insight_alert_descriptions.xml (Turkish)

* New translations insight_alert_codes.xml (Turkish)

* New translations insight_exceptions.xml (Swedish)

* New translations insight_alert_titles.xml (Swedish)

* New translations insight_alert_descriptions.xml (Swedish)

* New translations insight_alert_codes.xml (Swedish)

* New translations insight_exceptions.xml (Spanish)

* New translations insight_alert_titles.xml (Spanish)

* New translations insight_alert_codes.xml (Spanish)

* New translations insight_exceptions.xml (Slovak)

* New translations insight_alert_titles.xml (Slovak)

* New translations insight_alert_descriptions.xml (Slovak)

* New translations insight_alert_codes.xml (Slovak)

* New translations insight_exceptions.xml (Russian)

* New translations insight_alert_titles.xml (Russian)

* New translations insight_alert_descriptions.xml (Russian)

* New translations insight_alert_codes.xml (Russian)

* New translations insight_exceptions.xml (Italian)

* New translations insight_alert_descriptions.xml (Italian)

* New translations insight_alert_titles.xml (Chinese Simplified)

* New translations insight_exceptions.xml (Dutch)

* New translations insight_alert_titles.xml (Dutch)

* New translations insight_alert_descriptions.xml (Dutch)

* New translations insight_alert_codes.xml (Dutch)

* New translations insight_exceptions.xml (Czech)

* New translations insight_alert_titles.xml (Czech)

* New translations insight_alert_descriptions.xml (Czech)

* New translations insight_alert_codes.xml (Czech)

* New translations insight_exceptions.xml (Chinese Simplified)

* New translations insight_alert_descriptions.xml (Chinese Simplified)

* New translations insight_alert_codes.xml (Chinese Simplified)

* New translations insight_exceptions.xml (Bulgarian)

* New translations insight_alert_titles.xml (Bulgarian)

* New translations insight_alert_descriptions.xml (Bulgarian)

* New translations insight_alert_codes.xml (Bulgarian)

* New translations insight_exceptions.xml (Afrikaans)

* New translations insight_alert_titles.xml (Afrikaans)

* New translations insight_alert_descriptions.xml (Afrikaans)

* New translations insight_alert_codes.xml (Afrikaans)

* New translations insight_alert_codes.xml (French)

* New translations insight_alert_codes.xml (Italian)

* New translations insight_exceptions.xml (Irish)

* New translations insight_alert_titles.xml (Irish)

* New translations insight_alert_descriptions.xml (Irish)

* New translations insight_alert_codes.xml (Irish)

* New translations insight_exceptions.xml (Hebrew)

* New translations insight_alert_titles.xml (Hebrew)

* New translations insight_alert_descriptions.xml (Hebrew)

* New translations insight_alert_codes.xml (Hebrew)

* New translations insight_exceptions.xml (Greek)

* New translations insight_alert_descriptions.xml (French)

* New translations insight_alert_titles.xml (Greek)

* New translations insight_alert_descriptions.xml (Greek)

* New translations insight_alert_codes.xml (Greek)

* New translations insight_exceptions.xml (German)

* New translations insight_alert_titles.xml (German)

* New translations insight_alert_descriptions.xml (German)

* New translations insight_alert_codes.xml (German)

* New translations insight_exceptions.xml (French)

* New translations insight_alert_titles.xml (French)

* New translations insight_exceptions.xml (Turkish)

* New translations strings.xml (German)

* New translations insight_alert_codes.xml (German)

* New translations insight_alert_descriptions.xml (German)

* New translations insight_alert_titles.xml (German)

* New translations insight_exceptions.xml (German)

* New translations strings.xml (German)

* New translations insight_alert_descriptions.xml (German)

* New translations strings.xml (German)

* New translations strings.xml (Czech)

* New translations strings.xml (Czech)

* New translations insight_exceptions.xml (Czech)

* New translations strings.xml (Portuguese)

* New translations insight_alert_titles.xml (Portuguese)

* New translations insight_exceptions.xml (Portuguese)
2019-02-02 18:02:19 +01:00
TebbeUbben
cc189d360f Merge remote-tracking branch 'nico/dev-wip' into dev-nico 2019-02-02 16:58:21 +01:00
TebbeUbben
d1f7086651 Merge branch 'master' into insight-dev
# Conflicts:
#	app/src/main/java/info/nightscout/androidaps/plugins/Overview/notifications/Notification.java
2019-01-31 13:08:33 +01:00
TebbeUbben
5475d9bceb Withdraw connection request when deleting pairing 2019-01-25 22:55:15 +01:00
TebbeUbben
53f7cf0dcf Revert "Improve connection routine"
This reverts commit 8116a24
2019-01-25 22:53:35 +01:00
TebbeUbben
8116a24fc6 Improve connection routine 2019-01-25 22:32:22 +01:00
TebbeUbben
85ae946296 Indicate in fragment if cartridge is not inserted 2019-01-19 00:41:29 +01:00
TebbeUbben
2770a49869 Local Insight driver 2019-01-18 22:40:22 +01:00
Tim Street
50f1049674
Updated Use AMA Autosens Features string
Updates the naming to remove AMA - line 441.
2019-01-13 21:45:51 +00:00
Milos Kozak
2b9b3b4f16 Eversense support 2018-12-11 21:56:57 +01:00
Nico Schmitz
9e03f0f8ca Update to current dev branch 2018-12-11 14:51:26 +01:00
Milos Kozak
8610dcc21d G5 2018 app version support 2018-12-10 19:35:01 +01:00
Milos Kozak
cad22dc8ed
New Crowdin translations (#1575) 2018-12-08 19:04:31 +01:00
Milos Kozak
d664136b6e G6 overview button support 2018-12-01 00:26:04 +01:00
Milos Kozak
946b2bfd12 Initial G6 support 2018-12-01 00:16:15 +01:00
Milos Kozak
b8a83216a7
Merge pull request #1556 from gregorybel/gregorybel-android-auto3
Gregorybel: Add android auto
2018-11-29 15:24:31 +01:00
Milos Kozak
c7fec8178d
New Crowdin translations (#1570) 2018-11-28 20:59:00 +01:00
Milos Kozak
f9cea45082
New Crowdin translations (#1568) 2018-11-26 16:46:44 +01:00
Milos Kozak
b1606d2452
Merge pull request #1551 from triplem/pr_1550
Total Basal in NS Profile
2018-11-25 22:40:03 +01:00
Milos Kozak
b0cbd5458d
New Crowdin translations (#1567) 2018-11-25 20:54:54 +01:00
Milos Kozak
297a592f91
New Crowdin translations (#1564) 2018-11-24 22:14:26 +01:00
Milos Kozak
f600ff045f Merge branch 'dev' of https://github.com/MilosKozak/AndroidAPS into dev 2018-11-20 14:40:44 +01:00
Milos Kozak
864fe32626 Turkish 2018-11-20 14:40:38 +01:00
Milos Kozak
9092983bef
New Crowdin translations (#1563) 2018-11-19 21:25:11 +01:00
Milos Kozak
46e20a4b13
New Crowdin translations (#1560) 2018-11-19 19:58:43 +01:00
Milos Kozak
b6cd214006
Merge pull request #1562 from MilosKozak/fixes
Fixes
2018-11-19 19:55:34 +01:00
Milos Kozak
6e1a01e9d3
Merge pull request #1543 from triplem/suspend_with_loop_disabled
Allow disconnection/suspend of pump even while Loop is deactivated
2018-11-18 21:24:39 +01:00
Milos Kozak
d4ddaf9041
New Crowdin translations (#1547) 2018-11-18 21:23:17 +01:00
gregorybel
2d04b277ff add xml 2018-11-12 22:40:13 +01:00
Milos Kozak
abb1dd956c Fix sending SMS in Android 8 2018-11-12 19:00:06 +01:00
triplem
eea79c5d0f fixes PR#1550 2018-11-08 21:14:44 +01:00
triplem
4cd9b19868 REname pump reconnection 2018-11-04 19:29:44 +01:00
Milos Kozak
a73b6422f5 New translations strings.xml (German) 2018-11-04 12:01:41 +01:00
Milos Kozak
1a335debc0 New translations strings.xml (Czech) 2018-11-02 09:21:57 +01:00