Skip to content

CS5331 Submission #27

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
Open
NgoKimPhu wants to merge 135 commits into
base: master
Choose a base branch
from
Open

CS5331 Submission #27

NgoKimPhu wants to merge 135 commits into from

Conversation

@NgoKimPhu
Copy link

@NgoKimPhu NgoKimPhu commented Mar 5, 2018

dd20cba2710bc0fe234cfba60a1124d0d84bb97f7c824ccda287efe853a8f335

NgoKimPhu and others added 30 commits February 23, 2018 23:14
@NgoKimPhu
Update team member list for the meta end-point
3d18a19
@NgoKimPhu
Ignore .pyc files
bcccf33
@NgoKimPhu
Add unit tests
0db39e2
@NgoKimPhu
Merge pull request #1 from cs5331jan2018-prdz/QA
06d3209 
QA unit tests
@OuyangDanwen
add commands to Dockerfile to set up MongoDB
96132e5
@OuyangDanwen
remove redundant file
136a8e4
@OuyangDanwen
add installation of pymongo to Dockerfile for interfacing with the da…
b9ea2c2 
…tabase in python
@OuyangDanwen
add database test
e34a620
@OuyangDanwen
add comments for exposing port and remove redundant import
dfd70bf
@OuyangDanwen
change assertEqual to assertDictEqual for dictionary comparison
1ea2f5d
@OuyangDanwen
fix assertEqual
a27c27b
@OuyangDanwen
fix wrong list
5672159
@OuyangDanwen
fix typo
5624db9
@OuyangDanwen
switch to insert
ce44305
@OuyangDanwen
syntax fix
6979229
@OuyangDanwen
syntax fix
10a64c4
@OuyangDanwen
fix import
903aa68
@OuyangDanwen
fix bson format
1f4d4d2
@NgoKimPhu
Revert back to using app.py in /service instead of src/service
8890508
@NgoKimPhu
Merge pull request #2 from cs5331jan2018-prdz/docker/setup_mongoDB
f12aa09 
Add MongoDB service with a sanity test
@OuyangDanwen
upgrade mongodb to 3.6 for security
f8671c5
@OuyangDanwen
update test
aec9f28
@OuyangDanwen
add mongoengine support to Dockerfile for schema design
993cac6
@OuyangDanwen
add simple schema for users and some api calls
315669e
@OuyangDanwen
add basic exception handing and proper imports
37e23b1
@OuyangDanwen
add test for registerUser
d093ab5
@OuyangDanwen
fix relative imports
6a3a793
@OuyangDanwen
fix import path for schema
a8bbc64
@OuyangDanwen
remove import
00cdd8b
@OuyangDanwen
switch to flask_mongoengine
ac5d234
zandercx and others added 30 commits February 28, 2018 03:31
@zandercx
Merge remote-tracking branch 'origin/master' into frontend
eaa1fa4
@zandercx
Registration, Login, Home Page API Call success.
824f907
@ruibinch
Included creation of diary entry
63b8ef1
@ruibinch
More FE-BE integration.
dcea629
@ruibinch
Minor bug fixes
b5f5ead
@ruibinch
More minor bug fixes
43df4d6
@ruibinch
Removed dummy data
42f8f80
@zandercx
viewentries.html bugfix. jquery buttons will now pop up.
fb25da4
@ruibinch
Implemented final feature, pending testing.
32efecf
@ruibinch
Merge branch 'frontend' of https://github.com/cs5331jan2018-prdz/rest…
dba0fe0 
…-api-development into frontend

# Conflicts:
#	src/html/viewentries.html
@ruibinch
All features integrated into FE, pending testing
0665db6
@zandercx
Some Minor Changes:
13b1333 
Removed UUID Dialog Popping Up
Client Side Validatation For Some Registration Fields
Small Cleanup
@zandercx
Cleaning up. Remove JS codes from html pages.
985fe10
@zandercx
Updated several stuff:
298e82a 
Changed path to relative instead of absolute.
Added API call to retrieve team members
Checked whether cookie value is valid before displaying pages (with JS)
@ruibinch
Fixed cosmetic display bug
9ce22bd
@ruibinch
Updated README.
3703c3d
@ruibinch
Merge branch 'frontend' of https://github.com/cs5331jan2018-prdz/rest…
0c93e67 
…-api-development into frontend
@zandercx
Update README.md
f05a512
@ruibinch
Minor changes to README.
516fd00
@ruibinch
Merge branch 'frontend' of https://github.com/cs5331jan2018-prdz/rest…
cff1c7f 
…-api-development into frontend

# Conflicts:
#	README.md
@ruibinch
Added DOMPurify for client-side XSS sanitisation.
ad5780e
@ruibinch
Removed redundant files.
5f8ce3a
@ruibinch
Minor changes to README.
28a0a90
@ruibinch
Updated README.
3bd1727
@NgoKimPhu
Update README.md in short questions and contribution parts
775c5bd
@ruibinch
Fixed issues with DOMPurify
c92bed3
@ruibinch
Removed redundant file.
9ab9bcf
@NgoKimPhu
Merge pull request #11 from cs5331jan2018-prdz/frontend
bb1cefe 
Front-end
@NgoKimPhu
Merge branch 'master' into release-1.0
6aabc03
@NgoKimPhu
Merge pull request #12 from cs5331jan2018-prdz/release-1.0
240095b 
Finalise README.md for Release 1.0
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.

4 participants

@NgoKimPhu @OuyangDanwen @zandercx @ruibinch