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

Tony #10

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

Tony #10

wants to merge 35 commits into from

Conversation

widmonstertony
Copy link
Member

fixed #1

qidian99 and others added 20 commits November 4, 2018 23:00
@qidian99
fix #2
2a9e904
@EnqiZhang99
Merge branch 'master' of https://github.com/UCSDCSSA/duanzu-backend i…
94764e0 
…nto leasing
@qidian99
set up env
6503fac
@qidian99
fix #2
4757451
@EnqiZhang99
Change leasing - comment out all but insert
439509e
@EnqiZhang99
Merge branch 'leasing' of https://github.com/UCSDCSSA/duanzu-backend …
acacc16 
…into leasing
@EnqiZhang99
Delete merge markers
97c7f14
@EnqiZhang99
No change
b42562a
@qidian99 @EnqiZhang99
fix #2
5540e23
@qidian99 @EnqiZhang99
fix #2
28718a0
@EnqiZhang99
Change leasing - comment out all but insert
cfc8451
@EnqiZhang99
Delete merge markers
4cb5aa6
@EnqiZhang99
No change
fad85c1
@EnqiZhang99
several function in api/leasing #2
d848830
@widmonstertony
fixed password function.
54619b8
@widmonstertony
Merge branch 'Tony' of https://github.com/UCSDCSSA/duanzu-backend int…
8c85223 
…o Tony
@widmonstertony
fixed all current user functions.
c3595f3
@YunanAZ
initial commit
648801b
@EnqiZhang99
Ajax: insert and search
6d41f8e
@EnqiZhang99
Merge branch 'leasing' of https://github.com/UCSDCSSA/duanzu-backend …
4df2190 
…into leasing

fix #2
@widmonstertony widmonstertony added this to In progress in Code Cleanup via automation Nov 11, 2018
Liby99
Liby99 requested changes Nov 15, 2018
View reviewed changes
Copy link
Member

@Liby99 Liby99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please address minor code changes. Otherwise this looks good~

src/api/user.js Outdated Show resolved Hide resolved
src/api/user.js Outdated Show resolved Hide resolved
src/ajax/user.js Show resolved Hide resolved
src/api/user.js Outdated Show resolved Hide resolved
src/api/user.js Outdated Show resolved Hide resolved
src/api/user.js Outdated Show resolved Hide resolved
Liby99
Liby99 requested changes Nov 15, 2018
View reviewed changes
Copy link
Member

@Liby99 Liby99 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As Above

src/ajax/user.js Show resolved Hide resolved
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Liby99 Liby99 Liby99 requested changes

@miyujian miyujian Awaiting requested review from miyujian

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
Code Cleanup
  
In progress
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Fix ajax/user.js Linter Error
5 participants
@widmonstertony @Liby99 @qidian99 @EnqiZhang99 @YunanAZ