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

Restructure #9

Merged
merged 74 commits into from
Apr 29, 2020
Merged

Restructure #9

merged 74 commits into from
Apr 29, 2020

Conversation

ayanchoudhary
Copy link
Member

@ayanchoudhary ayanchoudhary commented Apr 7, 2020 •
edited
Loading

fixes #7
Separate user-related logic to another app.

@ayanchoudhary
added url field to departmentApi
8687cb2
@ayanchoudhary
added url field to department and made courseApi
fa492dd
@ayanchoudhary
completed models, serializers, views and made api endpoints for get r…
50daa44 
…equests
@ayanchoudhary
added delete api and cors whitelist
f5e99ab
@ayanchoudhary
changes in delete request for courses
3b1eaa6
@ayanchoudhary
made port changes
49520cb
@ayanchoudhary
added query for department with abbr and course with code
611deda
@ayanchoudhary
made fileUpload changes to file model and made dynamic renderring fun…
77e27e9 
…ctions from file data
@ayanchoudhary
added file field to serializer
3219bf1
@ayanchoudhary
fixed delete request
beddc95
@ayanchoudhary
changes in api
8b1dd1d
@ayanchoudhary
fix:merge cherry-pick commit
bad4b61
@ayanchoudhary
changes in file model
1f25778
@ayanchoudhary
fix driveid field
326a7a1
@ayanchoudhary
removed unnecessary prints
a81c1d5
@ayanchoudhary
fixed post request for files
bea9de7
@ayanchoudhary
feat:added course fetch and get department detail through one request
26b73a1
@ayanchoudhary
refactor: department post requests
3c9c222
@ayanchoudhary
feat:made user and upload models
bebd864
@ayanchoudhary
lint fixes
858e7d8
@ayanchoudhary
made uploads model
dc26f7b
@ayanchoudhary
feat:configured request get and creation post requests
a39418e
@ayanchoudhary
feat:configured update route on request
2873d93
@ayanchoudhary
feat:integrateg falcon client and completed user get and post functions
14d38be
@ayanchoudhary
fix: alter profile_image field to hold image url
397de52
@ayanchoudhary
feat:retrieved file from frontend in backend
30cc0c9
@ayanchoudhary
feat:integrated file upload route with drive api
0d7cc47
@ayanchoudhary
feat:added filetype field to upload
fae096c
@ayanchoudhary
feat:implemented JWT and added courses array field to user model
5c05f0e
@ayanchoudhary
feat:made add course route
9d1ca9c
mhk19 and others added 17 commits April 10, 2020 23:29
@mhk19
fixed conflicts
b0678c1
@mhk19
added setup instructions
f365e39
@mhk19
added command to initialize indexes
19af5e1
@ayanchoudhary
Merge pull request #11 from sdslabs/mahak
06826ee 
Mahak
@ayanchoudhary
refactor: separate user related functions into a separate app
e1dde87
@ayanchoudhary
feat: rebase search and remove unnecessary url registers
ca89b76
@ayanchoudhary
feat: configure elastic search and django server to docker
81762de
@ayanchoudhary
merge rebase
1c94598
@ayanchoudhary
chore: added test data and ingestion script
7cc2754
@ayanchoudhary
chore: remove config/postgres.yml from .gitignore
e190a4b
@ayanchoudhary
docs: update setup instructions in README
e2798fa
@ayanchoudhary
chore: add index rebuilding script to ingest.sh
80d9567
@ayanchoudhary
chore: remove litter from Dockerfile
dc60437
@ayanchoudhary
chore: simplify data addition through ingest script
466beb6
@ayanchoudhary
feat: integrated file initial upload to review folders functionality
7c2beb3
@ayanchoudhary
fix: remove non finalized files from search index
7b6a725
@ayanchoudhary
fix: added makemigrations command to docker-compose
ad31a30
@ayanchoudhary ayanchoudhary added this to the Studyportal v2 milestone Apr 22, 2020
@ayanchoudhary ayanchoudhary changed the base branch from development to master April 28, 2020 17:34
kanav99
kanav99 approved these changes Apr 28, 2020
View reviewed changes
Copy link
Member

@kanav99 kanav99 left a comment

Choose a reason for hiding this comment

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

LGTM

@kanav99 kanav99 merged commit dbbde8c into master Apr 29, 2020
@ayanchoudhary ayanchoudhary deleted the restructure branch April 29, 2020 14:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kanav99 kanav99 kanav99 approved these changes

@pandeykartikey pandeykartikey Awaiting requested review from pandeykartikey

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Studyportal v2
Development

Successfully merging this pull request may close these issues.

Add tests for API routes
3 participants
@ayanchoudhary @kanav99 @mhk19