Mary Tran
|
d767ccc37a
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus into DBBranch
|
2018-12-03 18:01:06 -05:00 |
|
Mary Tran
|
d8a5d33924
|
Added defaults
|
2018-12-03 17:59:57 -05:00 |
|
|
|
134b7b99fd
|
Finalized UML
|
2018-12-02 17:24:03 -05:00 |
|
Anshu Sharma
|
238acf5488
|
whatever I have.
|
2018-12-02 12:10:19 -05:00 |
|
Anshu Sharma
|
1cedc6b92d
|
final logic
|
2018-12-02 12:08:04 -05:00 |
|
Mary Tran
|
7cba1b21ad
|
Put back validation and allowed for empty password
|
2018-12-02 11:45:17 -05:00 |
|
Mary Tran
|
ed589c4e95
|
Fixed test file
|
2018-12-02 11:22:19 -05:00 |
|
Mary Tran
|
b531cddc2b
|
Added hashing of passwords
|
2018-12-02 11:21:08 -05:00 |
|
Mary Tran
|
07d180b4c0
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus into DBBranch
|
2018-12-01 21:57:17 -05:00 |
|
IvanaE
|
b2c33cea8e
|
added show cancelled optional
|
2018-12-01 18:09:28 -05:00 |
|
IvanaE
|
11e8fa677f
|
fixed confirming and deleting bookings
|
2018-12-01 17:42:28 -05:00 |
|
Mary Tran
|
af86a5f1d4
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus into DBBranch
|
2018-11-28 22:28:05 -05:00 |
|
Mary Tran
|
dca1145aa5
|
Little fixes everywhere
|
2018-11-28 22:26:20 -05:00 |
|
IvanaE
|
ec9fabdef2
|
latest code
|
2018-11-28 22:12:08 -05:00 |
|
IvanaE
|
61287c62f5
|
Merge branch 'DBBranch'
|
2018-11-28 13:13:13 -05:00 |
|
IvanaE
|
8a22a81aa7
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus
|
2018-11-28 13:12:32 -05:00 |
|
IvanaE
|
a5a25902d1
|
added comment to ui
|
2018-11-28 13:11:37 -05:00 |
|
|
|
611cf2934c
|
Added comments
|
2018-11-27 17:30:53 -05:00 |
|
Mary Tran
|
adb9da3690
|
Fixed some bugs and added comment to rating
|
2018-11-27 11:37:53 -05:00 |
|
IvanaE
|
5faed3fd4a
|
new ui for del 4
|
2018-11-26 21:09:54 -05:00 |
|
IvanaE
|
9fabb41d83
|
Merge branch 'DBBranch'
|
2018-11-25 15:20:41 -05:00 |
|
|
|
8ec11d9fd5
|
Added the test files for final deliverable
|
2018-11-24 20:24:42 -05:00 |
|
Mary Tran
|
fc0e17658a
|
Added a small clarification thing
|
2018-11-24 15:17:40 -05:00 |
|
Mary Tran
|
874df37f72
|
Merge branch 'master' of https://github.com/ebivibe/SEG2105-Olympus into DBBranch
|
2018-11-24 14:57:22 -05:00 |
|
Mary Tran
|
c49c2ca8d8
|
Changed fetch service providers to include first and last name
|
2018-11-24 14:23:17 -05:00 |
|
IvanaE
|
bb23d12201
|
combined booking classes
|
2018-11-23 14:51:40 -05:00 |
|
|
|
269ce3fa7f
|
Build has been created
|
2018-11-23 12:03:36 -05:00 |
|
Mary Tran
|
8f42ac5183
|
wow I closed a cursor before finishing using it
|
2018-11-21 22:58:35 -05:00 |
|
Mary Tran
|
5a3b59b1d9
|
Trying again to fix DB things
|
2018-11-20 23:54:03 -05:00 |
|
Mary Tran
|
e6c383f1f9
|
Completed booking and lookup by time available
|
2018-11-20 23:43:16 -05:00 |
|
Mary Tran
|
168d8be0c7
|
Added some DB functionalities - not done yet
|
2018-11-20 13:03:26 -05:00 |
|
IvanaE
|
ab64c2bb0d
|
month starts at 1
|
2018-11-20 12:28:51 -05:00 |
|
IvanaE
|
ed1c35d487
|
actually fixed errors?
|
2018-11-19 21:52:14 -05:00 |
|
IvanaE
|
b3332768fc
|
fixed errors?
|
2018-11-19 21:50:06 -05:00 |
|
FunwithaPorpoise
|
8de6cfa9be
|
Merge pull request #20 from ebivibe/DBBranch
Updated booking
|
2018-11-19 21:39:52 -05:00 |
|
Mary Tran
|
944c1226b7
|
Updated booking
|
2018-11-19 21:37:27 -05:00 |
|
Mary Tran
|
f69b8a2a1d
|
Added a few things to Booking
|
2018-11-19 21:33:39 -05:00 |
|
|
|
567e9c0739
|
Updated UML Diagram
|
2018-11-19 21:14:30 -05:00 |
|
IvanaE
|
534bb270f4
|
added some new ui
|
2018-11-19 20:37:32 -05:00 |
|
FunwithaPorpoise
|
9787466a06
|
Merge pull request #19 from ebivibe/DBBranch
Pre-create Service Provider
|
2018-11-18 17:23:29 -05:00 |
|
Mary Tran
|
c61a703041
|
Pre-create Service Provider
|
2018-11-18 17:15:44 -05:00 |
|
|
|
213845f5f3
|
pulling
|
2018-11-18 16:35:06 -05:00 |
|
IvanaE
|
ef7d9db62b
|
added more of the finding and edit profile
|
2018-11-18 15:35:32 -05:00 |
|
|
|
56e0b9e13e
|
pulling
|
2018-11-18 15:05:52 -05:00 |
|
|
|
d6117810be
|
pulling
|
2018-11-18 15:05:25 -05:00 |
|
IvanaE
|
489141194d
|
updates needed
|
2018-11-18 14:48:15 -05:00 |
|
IvanaE
|
3be7d85c8d
|
waiting for dbhelper to finish recycler view
|
2018-11-18 13:40:28 -05:00 |
|
IvanaE
|
8cd1ea33d8
|
fixed it
|
2018-11-18 13:39:25 -05:00 |
|
IvanaE
|
86b189aeb9
|
added rating
|
2018-11-18 13:38:43 -05:00 |
|
IvanaE
|
d15af93180
|
added new activities, started find service provider
|
2018-11-18 13:26:50 -05:00 |
|
