IvanaE
|
2c75c50435
|
added more of the finding and edit profile
|
2018-11-18 15:35:32 -05:00 |
|
IvanaE
|
abc98d59f2
|
updates needed
|
2018-11-18 14:48:15 -05:00 |
|
IvanaE
|
7bb04d516b
|
added new activities, started find service provider
|
2018-11-18 13:26:50 -05:00 |
|
IvanaE
|
16402a2aff
|
added booking class
|
2018-11-18 11:48:03 -05:00 |
|
IvanaE
|
924bb3319e
|
fixed bad constructor
|
2018-11-16 15:50:56 -05:00 |
|
Batuhan Berk Başoğlu
|
5e781ee225
|
Added comments
|
2018-11-16 12:31:19 -05:00 |
|
Batuhan Berk Başoğlu
|
a2ff9fc82c
|
Added comments
|
2018-11-16 12:30:21 -05:00 |
|
Anshu Sharma
|
1a1a9cc6a0
|
Comments for Availability class.
|
2018-11-16 12:24:13 -05:00 |
|
Anshu Sharma
|
2d9e2d565b
|
commit changes
|
2018-11-16 12:10:19 -05:00 |
|
Anshu Sharma
|
3d1c4b24af
|
changes
|
2018-11-16 12:08:25 -05:00 |
|
IvanaE
|
3eb2b0dafe
|
fixed availibilities ui
|
2018-11-16 12:02:27 -05:00 |
|
Mary Tran
|
9f5883bdee
|
Fixed 0 start time bug
|
2018-11-15 12:32:37 -05:00 |
|
Anshu Sharma
|
5eed3f6ee3
|
check
|
2018-11-14 21:21:27 -05:00 |
|
IvanaE
|
1634fcfb16
|
fixed spinner i think?
|
2018-11-14 20:38:39 -05:00 |
|
IvanaE
|
60f9008151
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
# Conflicts:
# OlympusServices/.idea/caches/build_file_checksums.ser
|
2018-11-14 14:15:06 -05:00 |
|
IvanaE
|
6b72b3162c
|
fixed small errors
|
2018-11-14 14:14:22 -05:00 |
|
Batuhan Berk Başoğlu
|
24b16fd8b1
|
Finished the test files
|
2018-11-14 13:59:26 -05:00 |
|
Batuhan Berk Başoğlu
|
e45e742d71
|
merging with master
|
2018-11-14 12:34:44 -05:00 |
|
Batuhan Berk Başoğlu
|
3be59387a4
|
Updated the branch
|
2018-11-14 12:26:28 -05:00 |
|
Batuhan Berk Başoğlu
|
d4fd4900ed
|
Fixed UML
|
2018-11-13 16:07:24 -05:00 |
|
IvanaE
|
1da25d2aff
|
broken code will be fixed soon :(
|
2018-11-13 13:40:14 -05:00 |
|
Batuhan Berk Başoğlu
|
19b42bf9a5
|
Updated UML Diagram
|
2018-11-12 17:26:29 -05:00 |
|
IvanaE
|
32f1031782
|
deliverable 3 ui, methods to be filled in
|
2018-11-11 15:52:55 -05:00 |
|
Batuhan Berk Başoğlu
|
4fd07d81b1
|
Updated UML Diagram
|
2018-11-11 11:47:23 -05:00 |
|
Anshu Sharma
|
163b1173cf
|
comments for project.
|
2018-11-09 11:48:05 -05:00 |
|
IvanaE
|
f615b2f6e1
|
file wasn't stages
|
2018-11-07 11:39:37 -05:00 |
|
IvanaE
|
4520816740
|
Merge branch 'lBranch'
# Conflicts:
# OlympusServices/.idea/caches/build_file_checksums.ser
# OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/EditServiceDialogFragment.java
# OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/NewServiceDialogFragment.java
|
2018-11-07 11:39:08 -05:00 |
|
IvanaE
|
ef6446f05b
|
chaoe ensuing
|
2018-11-07 11:28:54 -05:00 |
|
Anshu Sharma
|
d4f1433f91
|
whatever
|
2018-11-07 11:26:51 -05:00 |
|
Batuhan Basoglu
|
aa56f4d772
|
testing 123
|
2018-11-03 22:54:32 -04:00 |
|
Batuhan Berk Başoğlu
|
0ad149265f
|
Merged JUnit with Master
|
2018-11-02 11:40:15 -04:00 |
|
Batuhan Berk Başoğlu
|
2ea28277c3
|
Fixed the order of tests
|
2018-11-01 21:09:22 -04:00 |
|
IvanaE
|
695ab61b15
|
trying some wild stuff
|
2018-11-01 12:49:40 -04:00 |
|
Batuhan Berk Başoğlu
|
ec69678da4
|
Added basic JUnit files
|
2018-10-31 13:24:01 -04:00 |
|
IvanaE
|
073885ebeb
|
accidentally changed to many things
|
2018-10-30 11:16:06 -04:00 |
|
IvanaE
|
3491212fbc
|
refactored user to homeowner
|
2018-10-30 11:08:08 -04:00 |
|
IvanaE
|
7790edac33
|
added popups and services
|
2018-10-28 19:31:34 -04:00 |
|
Batuhan Berk Başoğlu
|
6c270be5ce
|
Updated UML Diagram for Deliverable 2
|
2018-10-26 14:43:41 -04:00 |
|
IvanaE
|
c91d38cf18
|
added admin welcome page
|
2018-10-22 14:48:11 -04:00 |
|
IvanaE
|
d740cf72d3
|
Merge branch 'lBranch'
# Conflicts:
# OlympusServices/.idea/caches/build_file_checksums.ser
# OlympusServices/.idea/vcs.xml
# OlympusServices/app/src/main/java/com/uottawa/olympus/olympusservices/SignUp.java
# OlympusServices/app/src/main/res/layout/activity_main.xml
# OlympusServices/app/src/main/res/layout/activity_sign_up.xml
# OlympusServices/build.gradle
|
2018-10-19 19:02:28 -04:00 |
|
Anshu Sharma
|
8be4ccbbd7
|
Logic
|
2018-10-19 16:45:18 -04:00 |
|
Batuhan Berk Başoğlu
|
9cd04e06da
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
|
2018-10-17 17:53:59 -04:00 |
|
Batuhan Berk Başoğlu
|
5599bd9179
|
Changed UML
|
2018-10-17 17:53:33 -04:00 |
|
IvanaE
|
6f9590413f
|
gave credit to style repos, removed admin option from sign up drop down
|
2018-10-15 10:36:54 -04:00 |
|
Batuhan Berk Başoğlu
|
ab84abd042
|
Fixed UML Diagram
|
2018-10-14 09:27:59 -04:00 |
|
Batuhan Berk Başoğlu
|
0d9cf73143
|
Fixed UML Diagram
|
2018-10-14 00:05:55 -04:00 |
|
Batuhan Berk Başoğlu
|
7cde8be55a
|
Fixed UML Diagram
|
2018-10-14 00:02:58 -04:00 |
|
IvanaE
|
296aaf05e3
|
fixed merge conflict, when you pull check the right dependency is in your build.gradle file
|
2018-10-10 13:44:55 -04:00 |
|
IvanaE
|
0b36bb32e3
|
added appointment class and finished ui
|
2018-10-05 12:35:05 -04:00 |
|
IvanaE
|
f299770923
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
|
2018-10-05 11:57:47 -04:00 |
|