Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Development #88

Open
wants to merge 238 commits into
base: master
Choose a base branch
from
Open

Development #88

wants to merge 238 commits into from

Conversation

rriesebos
Copy link
Collaborator

No description provided.

PJEilers and others added 30 commits April 29, 2018 13:23
@PJEilers
Removed time and dose from medicine
c784b26
@RoelBrandenburg
sign in has authentication now, not via database yet. need to positio…
206dadd 
…n invalid message still
@PJEilers
Fixed merge conflict
dbd02ad
@rriesebos
Improved code for changing taken state with checkboxes
d07c7e4
@RoelBrandenburg
now shows a proper message when entering invalid credentials
4f8cf7d
@rriesebos
Update calendar after takenState is updated
a7ad2ee
@rriesebos
Added checkmark and cross icons, might have to improve the looks of i…
2534fed 
…t in the future
@rriesebos
Small change to dummy data..
1762ab9
@rriesebos
Adjusted transparency and made checkmark show up if date is today
7051c8d
@RoelBrandenburg
Merge pull request #40 from RUGSoftEng/rriesebos
241e0c5 
Rriesebos
@PJEilers
merge
dd971e6
@rriesebos
Merge pull request #41 from RUGSoftEng/signIn-Roel
ccd5510 
Basic sign in functionality, does not communicate with database yet.
@RoelBrandenburg
start on API call
d398628
@MarcoGTL
wider quiz, video in the scrollview
7903ee1 
Made the quiz activity wider, aswell as including the video in the scrollview
@PJEilers
merge
711b727
@PJEilers
Merge branch 'development' of https://github.com/RUGSoftEng/2018-Tube…
1f33d38 
…rculosis-Android into Medicine-PJ
@PJEilers
Added on click to see if medication was taken today and a more info b…
7608484 
…utton
@rriesebos
Fixed small bug where red crosses didnt show up
af2ef75
@PJEilers
Changed layout of medication click
bc4e611
@MarcoGTL
Setting up an adapter
9c26028 
Does not yet accomodate radiobuttons nor onclick functionality
@RoelBrandenburg
API is successful from login now, can't manage to save respone yet
1bbe88f
@RoelBrandenburg
Merge pull request #42 from RUGSoftEng/rriesebos
d1c3177 
Fixed small bug where red crosses didnt show up
@RoelBrandenburg
Merge pull request #43 from RUGSoftEng/Medicine-PJ
d87c98a 
Changed medicine screen
@RoelBrandenburg
Merge pull request #44 from RUGSoftEng/signInAPI-Roel
117ca14 
API call to server is working now (using retrofit)
@rriesebos
Fixed logic
dfc0615
@RoelBrandenburg
hotfix for signIn by PJ:)
b381487
@RoelBrandenburg
Merge pull request #45 from RUGSoftEng/rriesebos
8952e04 
Fixed logic
@RoelBrandenburg
set boolean connectedToDatabase to false for easier testing
15e5bc3
@rriesebos
Merge pull request #46 from RUGSoftEng/signIn
d3d6a5a 
hotfix for signIn by PJ:)
@rriesebos
Change colors and transparency
f854255
RoelBrandenburg and others added 30 commits June 10, 2018 11:24
@RoelBrandenburg
Merge pull request #89 from RUGSoftEng/rriesebos
c27c242 
Added videos icon to signIn tab, changed strings information -> video…
@RoelBrandenburg
API DELETE method works fine, POST method should work, but it does no…
67b32e5 
…t work on the server yet
@RoelBrandenburg
resolve merge conflicts
3bee70b
@RoelBrandenburg
hotfix for FAQ calls
c5aaeaf
@RoelBrandenburg
cursor is now at the end of text when editing
10402fc
@RoelBrandenburg
make layout a bit more consistent
cecdc75
@MarcoGTL
Merge pull request #90 from RUGSoftEng/askPhysician-Roel-merge
ea8f728 
Now the patient can view and edit previously asked questions (also hotfix for faq calls)
@RoelBrandenburg
placed .gitignore to root directory and removed files that should be …
2b838eb 
…be ignored by the gitignore file
@RoelBrandenburg
update gitignore file
0470609
@RoelBrandenburg
removed unused text classes
972361f
@RoelBrandenburg
update gradlew to use unix style (LF) instead of windows style (CRLF)
88638e9
@RoelBrandenburg
Update gradlew
49a2375
@RoelBrandenburg
Update .travis.yml
46b79dd
@RoelBrandenburg
move travis file to the android file
3ecd246
@RoelBrandenburg
or not...
6ac8753
@RoelBrandenburg
Update .travis.yml
88a595d
@RoelBrandenburg
Update .travis.yml
ad652dd
@RoelBrandenburg
Update .travis.yml
cde1d9f
@RoelBrandenburg
Update .travis.yml
c02d558
@RoelBrandenburg
Update .travis.yml
46b4840
@RoelBrandenburg
Update .travis.yml
1640e0a
@RoelBrandenburg
Update .travis.yml
1ebdea4
@RoelBrandenburg
Update .travis.yml
b5c9931
@RoelBrandenburg
added translations
6deaf34
@RoelBrandenburg
Merge branch 'travis_try' of https://github.com/RUGSoftEng/2018-Tuber…
76dee53 
…culosis-Android into travis_try
@RoelBrandenburg
some changes to make travis happy
5dd5eb8
@rriesebos
Merge pull request #91 from RUGSoftEng/travis_try
b3a998a 
TravisCI finally accepts the build
@PJEilers
Fixed scrolling in medication tab, fixed the sorting
6897114
@PJEilers
Medicine tab updates right away when changing taken status in calendar
f2ea552
@RoelBrandenburg
Merge pull request #92 from RUGSoftEng/Medicine-PJ
1153de9 
Some bugfixes and medicine now update right away with changes on calendar
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@rriesebos @PJEilers @RoelBrandenburg @MarcoGTL @NiekdeVries