RSR v2.3.5 Uglyfruit Release/Candidate #508
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When an updates only consisted of a link that would
not get urlized. We have to do some escape dancing to
make sure urls are urlized by Django & that markdown
works properly. And at the same time be safe and not
allow things like <script>alert('unsafe');</script>
to be evaluated.
The project_update_extra resource adds some data from User and Organisation to the normal project_update resource. This is needed for the JSON-fetching plugin on akvo.org since it needs all data in one go (or at least that makes things very much simpler).
Not perfect, but better than before. Needs either better CSS knowledge or a much larger refactoring (probably both) to make it look really good.
Fix the target attribute for the links to pages related to the project.
Extend the schema with a description of the User and Organisation data inlined in the "user" field.
When registering while at a Pages site the registration should default to be with the organisation of the site. Change the link to registration to reflect this, going directly to step two. Add a second link pointing to step one of registraion if the user wants to register with another organisation. Also set target on those links to "_blank" to open a new window/tab for the registration since we can't redirect back correctly.
[#462] Script for partner types
[#285] Added pagination fix
Update develop with missing commits from master Merging to resolve the issue.
[#219] Added help text on photo upload
[#460] Removed floating Div / Replaced by a table
[#491] Removed donation buttons from widgets
Looks good to me
[#334] IATI export script
[#474] New project-map.py for all RSR and Pages maps
#496 adding release notes for uglyfruit
RSR v2.3.5 Uglyfruit Release/Candidate
[#474] Set maps to scrollable and reset interactive global maps
[#501] update to authors, readme and licence info in repo
KasperBrandt
added a commit
that referenced
this pull request
Apr 9, 2014
RSR v2.3.5 Uglyfruit Release/Candidate
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Final Pull Request for 2.3.5 Release - button to be pushed at 11:00 CEST.