 susott
|
26abfa578f
|
try to fix merge conflicts
|
2018-12-09 16:40:48 +01:00 |
|
|
susott
|
76ff1745b5
|
try to solve merge conflicts
|
2018-12-09 16:28:42 +01:00 |
|
|
susott
|
5444278795
|
improve on review issues
|
2018-12-09 16:03:25 +01:00 |
|
|
Julia Friesel
|
7d10fbffec
|
Update README.md
|
2018-12-09 14:08:35 +00:00 |
|
|
Julia Friesel
|
f0449ca19d
|
Merge branch '112-connect-cervix-mode-to-app' into 'master'
Resolve "Connect cervix mode to app"
Closes #112
See merge request bloodyhealth/drip!126
|
2018-12-09 13:00:51 +00:00 |
|
|
Julia Friesel
|
f9ca0c62d8
|
Improve switch label wording
|
2018-12-08 17:27:12 +01:00 |
|
|
Julia Friesel
|
709bae2319
|
Use nfp mode setting in sympto adapter
|
2018-12-08 09:44:16 +01:00 |
|
|
Julia Friesel
|
b23bd19270
|
Add cervix setting
|
2018-12-08 09:44:16 +01:00 |
|
|
bl00dymarie
|
08e05ec984
|
adds windows problems;
adds link to emulator
|
2018-12-07 12:33:10 +00:00 |
|
|
Julia Friesel
|
03e149062d
|
Merge branch 'use-icon-font-for-home-icons' into 'master'
Use icon font for home icons
See merge request bloodyhealth/drip!115
|
2018-12-06 08:31:20 +00:00 |
|
|
tina
|
426a3bda30
|
Merge branch 'settings-password-confirmation' into 'master'
Adds password confirmation on setting a new password on Settings screen
Closes #194
See merge request bloodyhealth/drip!124
|
2018-12-05 11:03:49 +00:00 |
|
|
Sofiya Tepikin
|
2a7ffa4666
|
Adds password confirmation on setting a new password on Settings screen
|
2018-12-04 22:52:49 +01:00 |
|
|
Julia Friesel
|
7444aedef4
|
Merge branch 'lowercase-labels' into 'master'
Transforms labels to lowercase
Closes #212
See merge request bloodyhealth/drip!123
|
2018-12-04 14:27:57 +00:00 |
|
|
bl00dymarie
|
d39d59c3a3
|
Update CONTRIBUTING.md
|
2018-12-04 10:50:02 +00:00 |
|
|
bl00dymarie
|
735b89ef9b
|
Update CONTRIBUTING.md
|
2018-12-04 10:46:33 +00:00 |
|
|
mashazyu
|
55acd26a39
|
Transforms labels to lowercase
|
2018-12-03 19:19:05 +01:00 |
|
|
Julia Friesel
|
9843fb0157
|
Update README.md
|
2018-12-03 17:37:55 +00:00 |
|
|
Julia Friesel
|
28a809fb5c
|
Merge branch 'today-overview-header' into 'master'
Changes header of today's cycle day overview page
Closes #216
See merge request bloodyhealth/drip!122
|
2018-12-03 17:03:21 +00:00 |
|
|
Julia Friesel
|
da1a8af648
|
Merge branch 'fix-fertility-icon-space' into 'master'
Fix fertility icon space
Closes #237
See merge request bloodyhealth/drip!121
|
2018-12-03 17:01:00 +00:00 |
|
|
mashazyu
|
96d2459777
|
Changes header of today's cycle day overview page
|
2018-12-02 19:23:02 +01:00 |
|
|
susott
|
7d802184f0
|
added old fonts back
|
2018-12-02 19:08:14 +01:00 |
|
|
mashazyu
|
1b5c637d4e
|
Fixes fertility icon space
|
2018-12-02 13:52:17 +01:00 |
|
|
mashazyu
|
0c22644c54
|
Extracts buttons on home screen as a component
|
2018-12-02 13:15:46 +01:00 |
|
|
Julia Friesel
|
9131c7a602
|
Merge branch 'symptom-header-center' into 'master'
Centers the Symptom header title
Closes #248
See merge request bloodyhealth/drip!119
|
2018-12-01 19:35:03 +00:00 |
|
|
Julia Friesel
|
ba817951c9
|
Merge branch 'patch-1' into 'master'
Add macOS hints
See merge request bloodyhealth/drip!117
|
2018-12-01 19:28:19 +00:00 |
|
|
susott
|
ab55bf4f94
|
Merge branch 'master' into 230-change-standard-font
|
2018-12-01 19:21:32 +01:00 |
|
|
tina
|
f3d53ef876
|
Merge branch '229-change-app-icon' into 'master'
Change App Icon
Closes #229
See merge request bloodyhealth/drip!118
|
2018-12-01 15:35:01 +00:00 |
|
|
susott
|
9cfecaf886
|
deleting once more
|
2018-12-01 16:30:05 +01:00 |
|
|
susott
|
df12825ab5
|
deleted unnecessary font files
|
2018-12-01 16:25:25 +01:00 |
|
|
Kornelius Kalnbach
|
6d80c3b417
|
add missing file
|
2018-12-01 16:23:28 +01:00 |
|
|
Kornelius Kalnbach
|
a111967f94
|
fix app icon zoom
|
2018-12-01 16:18:55 +01:00 |
|
|
susott
|
72c35b0711
|
changed standard text fonts to dosis-light/dosis-extralight
|
2018-12-01 16:05:15 +01:00 |
|
|
Sofiya Tepikin
|
57e77341c6
|
Centers the Symptom header title
|
2018-12-01 15:59:39 +01:00 |
|
|
Kornelius Kalnbach
|
a2d28bda3b
|
update logo in password prompt
|
2018-12-01 15:46:50 +01:00 |
|
|
Kornelius Kalnbach
|
a6876708b6
|
add new icon with Android Studio
|
2018-12-01 15:37:23 +01:00 |
|
|
bl00dymarie
|
16702284fd
|
Merge branch 'edit-readme' into 'master'
Edit readme
See merge request bloodyhealth/drip!116
|
2018-12-01 13:37:06 +00:00 |
|
|
Kornelius Kalnbach
|
f622f33e57
|
Update README.md
|
2018-12-01 13:26:16 +00:00 |
|
|
Lisa Hillebrand
|
998f0f3526
|
Edited readme
|
2018-12-01 12:57:24 +01:00 |
|
|
Lisa Hillebrand
|
c8ec09b08a
|
Edit readme
|
2018-12-01 12:55:33 +01:00 |
|
|
Julia Friesel
|
f1684a8701
|
Update react-native-share
|
2018-12-01 12:43:14 +01:00 |
|
|
bl00dymarie
|
2e3c9e98a0
|
Update README.md
|
2018-12-01 11:20:49 +00:00 |
|
|
Julia Friesel
|
306aa9bfaf
|
Fix color
|
2018-11-30 12:06:52 +01:00 |
|
|
bl00dymarie
|
264602df6f
|
Merge branch 'Removes-copy/en' into 'master'
Removes copy/en folder
See merge request bloodyhealth/drip!114
|
2018-11-30 10:44:22 +00:00 |
|
|
Julia Friesel
|
a9923fae9f
|
Use icon font for home icons
|
2018-11-30 11:28:09 +01:00 |
|
|
emelko
|
eb03bbce02
|
Removes copy/en folder
|
2018-11-30 10:44:19 +01:00 |
|
|
Julia Friesel
|
563e9303ab
|
Merge branch '247-improve-node-install-instructions' into 'master'
Directly include instructions for Node v9 installation in readme, fix #247
Closes #247
See merge request bloodyhealth/drip!113
|
2018-11-29 15:06:23 +00:00 |
|
|
tina
|
47b9d1ce6d
|
Merge branch '251-set-up-labels-folder-and-reorganize-labels' into 'master'
Resolve "set up labels folder and reorganize labels"
Closes #251
See merge request bloodyhealth/drip!112
|
2018-11-29 14:27:26 +00:00 |
|
|
Jan-Christoph Borchardt
|
ffe9141bc4
|
Directly include instructions for Node v9 installation in readme, fix #247
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
|
2018-11-29 10:27:27 +01:00 |
|
|
tina
|
d5f3fdbde5
|
renames folder with labels, splits up the setting labels from rest
|
2018-11-28 16:10:38 +01:00 |
|
|
tina
|
11ceb21921
|
moves labels to copy folder
|
2018-11-28 15:07:52 +01:00 |
|