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.

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

redirected /fellowship to /fellowships #1149

Merged
merged 2 commits into from Mar 6, 2018

Conversation

mmmavis
Copy link
Collaborator

@mmmavis mmmavis commented Mar 5, 2018

As suggested in #996 (review)

@mmmavis mmmavis requested a review from cadecairos March 5, 2018 22:07
@cadecairos cadecairos temporarily deployed to foundation-mofostaging-pr-1149 March 5, 2018 22:08 Inactive
url(r'^fellowship/(?P<path>.*)', RedirectView.as_view(
url='/fellowships/%(path)s',
query_string=True
)),
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

not sure if I need to add an extra line in between these 2 lines?

Choose a reason for hiding this comment

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

nope, not unless pep8 says we need it

Copy link

@cadecairos cadecairos left a comment

Choose a reason for hiding this comment

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

One small change to make, then we're good to go!

url(r'^fellowship/(?P<path>.*)', RedirectView.as_view(
url='/fellowships/%(path)s',
query_string=True
)),
url(r'^soc/', include('social_django.urls', namespace='social')),

Choose a reason for hiding this comment

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

please drop this line too, it's a dupe of line 33

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

weird, thought i deleted it 👀

url(r'^fellowship/(?P<path>.*)', RedirectView.as_view(
url='/fellowships/%(path)s',
query_string=True
)),

Choose a reason for hiding this comment

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

nope, not unless pep8 says we need it

@cadecairos cadecairos merged commit 0b7bf42 into fellowships Mar 6, 2018
@cadecairos cadecairos deleted the fellowships-fellowship branch March 6, 2018 19:01
mmmavis added a commit that referenced this pull request Mar 6, 2018
* Set stage for fellowships pages w/ django template (#961)

* Set stage for fellowships pages w/ django template

* Adding some stub urls for the fellowships site. (#971)

* Adding some stub urls for the fellowships site.

* Update some of the urls a bit more

* fellowships homepage wireframe (#965)

* Fix review apps for fellows (#1010)

* Test commit

* Find out which url is it resolving to

* Fix stuff

* Remove debugging stuff

* fixed rebase conflicts

* Fellowships support page (#1006)

Fellowships support page

* fixed rebase conflicts

* Responsive fellowships nav & better multi-page nav on mobile (#1020)

* Related to #1019 - repsonsive fellowships nav + #977 - better multi-page nav on mobile

* Updated fellowships homepage (#1042)

* updated fellowships homepage

* updated fellowships support page (#1049)

* Fellowships directory pages (#1046)

* Related to #955 - fellowships directory pages

* Update fellowships type pages (#1059)

* added illustration to fellowship types page and fellowships support page (#1061)

* made fellowships work use the new master template (#1069)

* updated /apply page so it's in 'application open' state (#1070)

* More assets (#1073)

* added more assets & created a svg sub-folder

* added hero image to fellowships homepage

* Related to #1062 - hide affiliation meta from front end (#1075)

* design tweaks (#1081)

* design tweaks

* show fellow location in fellowships directory (#1103)

* Added loading icon (#1093)

* Related to #1045 - added loading icon

* Featured fellows (#1112)

* added featured fellows on fellowships homehomepomepage (hardcoded)

* hide some incomplete content for now (#1113)

* Fixes #1092 - added back missing icon & ran task to optimize svgs (#1108)

* Added placeholder headshot to Person component (#1119)

* Related #1114 - added placeholder headshot

* Updated fellowships homepage content and layout again (#1122)

* Related to #1120 - updated fellowships homepage content and layout again
* Related to #1124 - hero banner adjustment

* Fixed #1096 - replaced a svg (#1123)

* Content changes to apply page (#1127)

* Related to #1116 - content changes to apply page

* Fixed broken 'see work' link (#1129)

* Fixed #1128 - fixed broken 'see work' link

* Fixes #1144 - fixed a fellow's social link (#1145)

* remmoved 'senior fellow' section from directory pages (#1150)

* redirected /fellowship to /fellowships (#1149)

* redirected /fellowship to /fellowships

* removed an extra line

* Fellowships improvements (#1157)

* code improvement

* removed a few empty files
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.

None yet

2 participants