Mary Tran
|
48df7d76b6
|
Added initial values
|
2018-12-03 20:33:42 -05:00 |
|
Mary Tran
|
a8f5aade8b
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus into DBBranch
|
2018-12-03 18:01:06 -05:00 |
|
Mary Tran
|
80794c51c4
|
Added defaults
|
2018-12-03 17:59:57 -05:00 |
|
Batuhan Berk Başoğlu
|
a553346fb2
|
Finalized UML
|
2018-12-02 17:24:03 -05:00 |
|
Anshu Sharma
|
3758bb594f
|
whatever I have.
|
2018-12-02 12:10:19 -05:00 |
|
Anshu Sharma
|
aa0e073669
|
final logic
|
2018-12-02 12:08:04 -05:00 |
|
Mary Tran
|
789239155f
|
Put back validation and allowed for empty password
|
2018-12-02 11:45:17 -05:00 |
|
Mary Tran
|
e0564d3e2b
|
Fixed test file
|
2018-12-02 11:22:19 -05:00 |
|
Mary Tran
|
9b19c2e820
|
Added hashing of passwords
|
2018-12-02 11:21:08 -05:00 |
|
Mary Tran
|
4d25a0c460
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus into DBBranch
|
2018-12-01 21:57:17 -05:00 |
|
IvanaE
|
36ff2f2e60
|
added show cancelled optional
|
2018-12-01 18:09:28 -05:00 |
|
IvanaE
|
7d3ef3bf92
|
fixed confirming and deleting bookings
|
2018-12-01 17:42:28 -05:00 |
|
Mary Tran
|
7f169fe0e6
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus into DBBranch
|
2018-11-28 22:28:05 -05:00 |
|
Mary Tran
|
3c4e875a03
|
Little fixes everywhere
|
2018-11-28 22:26:20 -05:00 |
|
IvanaE
|
8999a149cb
|
latest code
|
2018-11-28 22:12:08 -05:00 |
|
IvanaE
|
e50c681d54
|
Merge branch 'DBBranch'
|
2018-11-28 13:13:13 -05:00 |
|
IvanaE
|
89b982a152
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
|
2018-11-28 13:12:32 -05:00 |
|
IvanaE
|
8e6bced748
|
added comment to ui
|
2018-11-28 13:11:37 -05:00 |
|
Batuhan Berk Başoğlu
|
746316b097
|
Added comments
|
2018-11-27 17:30:53 -05:00 |
|
Mary Tran
|
0452609381
|
Fixed some bugs and added comment to rating
|
2018-11-27 11:37:53 -05:00 |
|
IvanaE
|
95d9913136
|
new ui for del 4
|
2018-11-26 21:09:54 -05:00 |
|
IvanaE
|
b7df84eb5b
|
Merge branch 'DBBranch'
|
2018-11-25 15:20:41 -05:00 |
|
Batuhan Berk Başoğlu
|
bf002bbdbc
|
Added the test files for final deliverable
|
2018-11-24 20:24:42 -05:00 |
|
Mary Tran
|
8d5f01325c
|
Added a small clarification thing
|
2018-11-24 15:17:40 -05:00 |
|
Mary Tran
|
b3771bf12c
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus into DBBranch
|
2018-11-24 14:57:22 -05:00 |
|
Mary Tran
|
ee4bc0e409
|
Changed fetch service providers to include first and last name
|
2018-11-24 14:23:17 -05:00 |
|
IvanaE
|
c42098ad28
|
combined booking classes
|
2018-11-23 14:51:40 -05:00 |
|
Batuhan Berk Başoğlu
|
6815ba0cd0
|
Build has been created
|
2018-11-23 12:03:36 -05:00 |
|
Mary Tran
|
44a2fe402e
|
wow I closed a cursor before finishing using it
|
2018-11-21 22:58:35 -05:00 |
|
Mary Tran
|
4914779451
|
Trying again to fix DB things
|
2018-11-20 23:54:03 -05:00 |
|
Mary Tran
|
3cf1f74dc4
|
Completed booking and lookup by time available
|
2018-11-20 23:43:16 -05:00 |
|
Mary Tran
|
da469fe266
|
Added some DB functionalities - not done yet
|
2018-11-20 13:03:26 -05:00 |
|
IvanaE
|
c29889070d
|
month starts at 1
|
2018-11-20 12:28:51 -05:00 |
|
IvanaE
|
89be9c3680
|
actually fixed errors?
|
2018-11-19 21:52:14 -05:00 |
|
IvanaE
|
ffce249510
|
fixed errors?
|
2018-11-19 21:50:06 -05:00 |
|
FunwithaPorpoise
|
49b01c0e5a
|
Merge pull request #20 from ebivibe/DBBranch
Updated booking
|
2018-11-19 21:39:52 -05:00 |
|
Mary Tran
|
fb4c32bcb1
|
Updated booking
|
2018-11-19 21:37:27 -05:00 |
|
Mary Tran
|
465c082115
|
Added a few things to Booking
|
2018-11-19 21:33:39 -05:00 |
|
Batuhan Berk Başoğlu
|
5b6734cbbb
|
Updated UML Diagram
|
2018-11-19 21:14:30 -05:00 |
|
IvanaE
|
a385f7e18c
|
added some new ui
|
2018-11-19 20:37:32 -05:00 |
|
FunwithaPorpoise
|
f7545624bd
|
Merge pull request #19 from ebivibe/DBBranch
Pre-create Service Provider
|
2018-11-18 17:23:29 -05:00 |
|
Mary Tran
|
cae9e119b5
|
Pre-create Service Provider
|
2018-11-18 17:15:44 -05:00 |
|
Batuhan Berk Başoğlu
|
2607a7d10d
|
pulling
|
2018-11-18 16:35:06 -05:00 |
|
IvanaE
|
2c75c50435
|
added more of the finding and edit profile
|
2018-11-18 15:35:32 -05:00 |
|
Batuhan Berk Başoğlu
|
65e1cb6200
|
pulling
|
2018-11-18 15:05:52 -05:00 |
|
Batuhan Berk Başoğlu
|
4dfd27d96f
|
pulling
|
2018-11-18 15:05:25 -05:00 |
|
IvanaE
|
abc98d59f2
|
updates needed
|
2018-11-18 14:48:15 -05:00 |
|
IvanaE
|
3bdd8b5ad6
|
waiting for dbhelper to finish recycler view
|
2018-11-18 13:40:28 -05:00 |
|
IvanaE
|
5b8b0fdfd2
|
fixed it
|
2018-11-18 13:39:25 -05:00 |
|
IvanaE
|
f5c191a781
|
added rating
|
2018-11-18 13:38:43 -05:00 |
|