Milos Kozak
7db694044d
Merge branch 'dev' into iobfix
2019-07-28 01:49:52 +02:00
Milos Kozak
2952fffc1e
Merge remote-tracking branch 'origin/dev' into lint
2019-07-28 01:44:04 +02:00
Milos Kozak
7b946f8cc9
Merge branch 'dev' into lint
2019-07-28 01:43:49 +02:00
Milos Kozak
74bcf3e73e
Rx drivers: set new TBR if running is expiring
2019-07-28 01:37:44 +02:00
Milos Kozak
f58a219d2d
pass enforceNew properly
2019-07-28 01:22:00 +02:00
Milos Kozak
4f365213b5
Merge remote-tracking branch 'origin/dev' into rsfix
2019-07-28 00:02:01 +02:00
Milos Kozak
4bf1b777a2
Rx drivers: set new TBR if running is expiring
2019-07-27 23:59:27 +02:00
Milos Kozak
58a07c72f8
Merge pull request #1891 from jotomo/travis-openjdk8
...
Travis fix
2019-07-27 20:04:21 +02:00
Milos Kozak
84ecb92771
lint recommendations
2019-07-27 19:56:07 +02:00
Milos Kozak
7bf54a8ce9
New Crowdin translations ( #1889 )
...
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Polish)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Russian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
2019-07-27 19:53:22 +02:00
Johannes Mockenhaupt
b8617cb636
cleanup
2019-07-27 12:19:13 +02:00
Johannes Mockenhaupt
1371f47ac4
_
2019-07-27 03:11:26 +02:00
Johannes Mockenhaupt
1cc554cdcc
_
2019-07-27 03:05:35 +02:00
Johannes Mockenhaupt
22fa95e57e
_
2019-07-27 02:59:34 +02:00
Johannes Mockenhaupt
bd11fc5729
Travis: s/oraclejdk8/openjdk8/
2019-07-27 02:49:56 +02:00
Milos Kozak
1baec16c4b
remove unneeded semicolons
2019-07-26 23:21:01 +02:00
Milos Kozak
b49f377549
New Crowdin translations ( #1886 )
...
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Slovak)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Italian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Italian)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Czech)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* 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 (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Italian)
* New translations strings.xml (Polish)
* New translations strings.xml (Italian)
* New translations strings.xml (Polish)
* New translations strings.xml (Italian)
* New translations strings.xml (Swedish)
* New translations strings.xml (Italian)
* New translations strings.xml (Swedish)
* New translations strings.xml (Russian)
2019-07-26 22:30:43 +02:00
Milos Kozak
c925072649
Merge pull request #1786 from MilosKozak/signature_verifier
...
Signature Verifier
2019-07-26 22:28:49 +02:00
Milos Kozak
b448bbe670
Merge branch 'dev' into signature_verifier
2019-07-26 22:28:22 +02:00
Milos Kozak
3b2c9248a1
remove forgotten file
2019-07-26 22:20:02 +02:00
Milos Kozak
48316dbd4c
fix calculation, conditional rendering
2019-07-26 20:30:58 +02:00
Milos Kozak
595bf0314c
Merge branch 'dev' into iobfix
2019-07-26 00:39:40 +02:00
Milos Kozak
7735612daf
Merge pull request #1888 from MilosKozak/bwfix
...
Bolus wizard confirmation
2019-07-25 23:59:41 +02:00
Milos Kozak
bd22bddd2a
Merge pull request #1887 from jotomo/pump-activation-warning
...
Pump activation warning
2019-07-25 23:59:11 +02:00
Milos Kozak
76439777b0
Better bolus wizard warning
2019-07-25 23:32:00 +02:00
Johannes Mockenhaupt
d9de09d7f0
Confirm pump plugin activation for all hardware pumps (MDT, Insight).
2019-07-25 22:30:47 +02:00
Johannes Mockenhaupt
cf1bcf9943
Dedup pump activation confirmation.
2019-07-25 22:30:25 +02:00
Milos Kozak
75baa473f1
fix carbtime in BolusWizard
2019-07-25 21:45:54 +02:00
Milos Kozak
efb44331b0
New Crowdin translations ( #1885 )
...
* New translations strings.xml (Portuguese)
* New translations strings.xml (Spanish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Swedish)
2019-07-25 20:45:28 +02:00
Milos Kozak
c3be06d4e2
Merge pull request #1701 from MilosKozak/automation
...
Automation
2019-07-25 20:44:37 +02:00
Milos Kozak
c0116b744e
remove failing test
2019-07-25 20:07:32 +02:00
Milos Kozak
97c75052e5
Merge branch 'dev' into automation
2019-07-25 18:22:46 +02:00
Milos Kozak
a6e0ced920
New Crowdin translations ( #1884 )
...
* New translations strings.xml (Hebrew)
* New translations strings.xml (Portuguese, Brazilian)
* New translations strings.xml (Portuguese)
* New translations strings.xml (Polish)
* New translations strings.xml (Romanian)
* New translations strings.xml (Lithuanian)
* New translations strings.xml (Korean)
* New translations strings.xml (Turkish)
* New translations strings.xml (Swedish)
* New translations strings.xml (Spanish)
* New translations strings.xml (Slovak)
* New translations strings.xml (Russian)
* New translations strings.xml (Japanese)
* New translations strings.xml (Chinese Simplified)
* New translations strings.xml (Dutch)
* New translations strings.xml (Czech)
* New translations strings.xml (Bulgarian)
* New translations strings.xml (Afrikaans)
* New translations strings.xml (Finnish)
* New translations strings.xml (Italian)
* New translations strings.xml (Irish)
* New translations strings.xml (Greek)
* New translations strings.xml (German)
* New translations strings.xml (French)
2019-07-25 17:08:53 +02:00
Milos Kozak
0d5ea4f700
add Lithuanian language 2
2019-07-25 16:43:39 +02:00
Milos Kozak
838e19877b
add Lithuanian language
2019-07-25 16:43:00 +02:00
Milos Kozak
09270f36bf
Merge branch 'dev' into automation
2019-07-25 16:17:16 +02:00
Milos Kozak
0b28c92c2d
Merge pull request #1868 from andyrozman/medtronic_andy_merge
...
Medtronic driver merge
2019-07-25 16:15:17 +02:00
Andy Rozman
c4b3a75c73
Merge branch 'medtronic_andy_merge' of https://github.com/andyrozman/AndroidAPS into medtronic_andy_merge
2019-07-25 14:54:24 +01:00
Andy Rozman
dbc527605b
- disabled test
2019-07-25 14:49:43 +01:00
Milos Kozak
41f22176dd
fix failing travis
2019-07-25 15:22:08 +02:00
Milos Kozak
283fa0debf
fix string
2019-07-25 15:17:58 +02:00
Andy Rozman
29d0545d47
- fixed manufacturer and model
2019-07-25 13:41:57 +01:00
Milos Kozak
51bc5d3618
Merge branch 'dev' into medtronic_andy_merge
2019-07-25 13:40:37 +02:00
Andy Rozman
da0b3c84f9
- added translatable="false" to all new keys
2019-07-24 16:42:10 +01:00
Andy Rozman
b1320c4bcb
- added keys for preferences and fixes on all other places
2019-07-23 16:09:56 +01:00
Milos Kozak
f778e0ac0d
fix code after merge
2019-07-23 13:32:21 +02:00
Milos Kozak
e02681ac31
Merge branch 'dev' into automation
2019-07-23 13:13:26 +02:00
Milos Kozak
29c8740e08
Merge pull request #1879 from MilosKozak/psfix
...
ProfileSwitch validation
2019-07-23 09:18:12 +02:00
Milos Kozak
ae7332df2d
cleanup
2019-07-23 00:26:59 +02:00
Milos Kozak
47ed0acec2
ChooseTriggerDialog to kotlin
2019-07-23 00:04:44 +02:00
