Commit graph

10851 commits

Author SHA1 Message Date
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
Milos Kozak 063c27fb89 ChooseActionDialog to kotlin 2019-07-22 22:47:26 +02:00
Milos Kozak a809c0ac35 ActionListAdapter to kotlin 2019-07-22 21:41:42 +02:00
Milos Kozak e539dbc112 fix tests, use location form service 2019-07-22 16:58:25 +02:00
Milos Kozak 77d7f1ca65 Merge branch 'automation' of https://github.com/MilosKozak/AndroidAPS into automation 2019-07-22 16:28:57 +02:00
Milos Kozak c3b90275aa relocate trigger dummy objects 2019-07-22 16:28:53 +02:00
Milos Kozak 12f436c681 hide ok button on wrong input 2019-07-22 13:58:50 +02:00
Milos Kozak 4848aca82e
Merge pull request #1860 from MilosKozak/l10n_dev
New Crowdin translations
2019-07-22 11:56:46 +02:00
Milos Kozak 11edd1b4a0
Merge pull request #1876 from andyrozman/ref_manufacturer
Ref manufacturer
2019-07-22 09:56:43 +02:00
Milos Kozak 2ee8467243
Merge pull request #1880 from PoweRGbg/automationTests
more Automation tests
2019-07-22 09:54:59 +02:00
Roumen Georgiev 4cc556b1cb TriggerRecurringTime tests 2019-07-19 14:19:54 +03:00
Milos Kozak 01e87e0a93 New translations insight_exceptions.xml (Korean) 2019-07-19 13:14:08 +02:00
Milos Kozak 00caa39ba3 New translations insight_alert_titles.xml (Korean) 2019-07-19 13:14:07 +02:00
Milos Kozak e27df9a0f3 New translations insight_alert_descriptions.xml (Korean) 2019-07-19 13:14:06 +02:00
Milos Kozak 412be05cc6 New translations insight_alert_codes.xml (Korean) 2019-07-19 13:14:05 +02:00
Milos Kozak ff4ff43146 New translations strings.xml (Korean) 2019-07-19 13:03:23 +02:00
Milos Kozak 12c3b3c300 New translations strings.xml (Korean) 2019-07-19 12:53:51 +02:00
Milos Kozak 048b3fce15 New translations strings.xml (Korean) 2019-07-19 12:43:54 +02:00
Milos Kozak 03bcdf82b3 validate on focus change 2019-07-19 11:44:43 +02:00
Roumen Georgiev 04c3236258 increase coverage in TriggerTime 2019-07-19 11:57:30 +03:00