Skip to content

merge master to prod#107

Open
jhan25 wants to merge 5 commits intoprodfrom
master
Open

merge master to prod#107
jhan25 wants to merge 5 commits intoprodfrom
master

Conversation

@jhan25
Copy link
Copy Markdown
Contributor

@jhan25 jhan25 commented Dec 5, 2019

Description

Pls do

  • Tested and working
  • Unit tests

Test plan

Cscotttaakan and others added 5 commits March 3, 2019 17:31
* README

* begin blog

* remove venv

* BlogPost model

* Added image model, began serializer

* Create User View

* modified settings

* Testing view

* begin rud

* Multiple image upload

* updating blogviews

* Returns images now

* Working on regex body

* Update included

* Begin tests

* Tests

* Remove from S3

* fixing tests

* stash changes

* Added serializer

* finished tests

* Added more comments

* Added readme

* Fixed readme

* readme touchups

* touch ups

* added anonymous field

* Touch up tests

* Added screenshots

* Fixed urls

* Finishing touches

* Fixed makefile

* README && Makefile fixes

* Adding published field

* Added published feature

* Removed commented out code

* Added to README

* Fixed timestamps

* fixed tests
* README

* Begin comments

* Serializer

* Nested Comments

* rf kv

* Created RUD Comments

* update likes

* Get all blogs comments

* Recursive serializing

* Beginning Tests

* Finished Tests

* Documentation

* Minor typos

* migrations
* added filtering functionality (name, major, and bio)

* fixed views

* in progress

* in progress

* checking out master

* pr ready, but test is inconsistent

* final commit on searchAlgoFix: all test cases return true, all filters implemented.

* cleaned up users/views.py

* removed print + comments
* Fixed a little typo in the ReadMe file

Added in three missing backticks so that the code segments and headers are properly displayed now.

* Fixed another typo under "Create Comment"

The request "type" should be either "blog" or "comment", not "blog" or "post"
* Fixed a little typo in the ReadMe file

Added in three missing backticks so that the code segments and headers are properly displayed now.

* Fixed another typo under "Create Comment"

The request "type" should be either "blog" or "comment", not "blog" or "post"

* fixed a bug in mentor search. The mentor search result no longer depends on the order of the words in the search query. Moreover, duplicates are removed from the result as well.

* removed some unused imports in users/views.py

* removed one extra print statement

* mentor search result now sorted by profile completion > similarity to the search query
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants