[#991] Join 'develop' with 'feature/rsr_v3' #1090
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
…ter for 2.4 Astana release
Hotfix release of 2.4.1 for API changes
The middleware adds a response header of the format: X-RSR-Verision: "Tag:<tag name> Commit:<commit hash> Branch:<git branch name>"
ProjectResource.get_object_list() does not return unpublished projects when the API is queried by an authenticated user. Fix by calling ApiKeyAuthentication.is_authenticated() to check if the user is authorized to view unpublished projects.
The xpath for those two methods is searching from the root (xpath search string starts with "//") in the belief that the tree only encompassed one activity. But this seems not to be the case resulting in _all_ activities being searched. Fix by removing the "//".
Add settings for the URLs to use when fetching the RAIN organisations and activities XML. Add settings for a pair of log labels.
Add load_xml(). This function is moved from rain_project_upload.py Also add save_xml() to allow saving of the fetched XML for logging purposes.
Fetch organisation XML from the RAIN website. The XML fetched is saved for logging/debugging in the same folder as the import logfiles.
Fetch activities XML from the RAIN website. The XML fetched is saved for logging/debugging in the same folder as the import logfiles.
Add methods for setting the category, sync_owner and publishing status of all imported RAIN projects.
Fetch activities XML from the RAIN website.
[#748] Continent code for 'BQ' added
[#745] Add exclude keyword option to Akvo Pages
[#710] rain iati import
[#756] Astana hotfix 2.4.2
_publish() now published projects that have both an image and a location other than 0, 0. Add logging for this too.
Add filtering to project_update_extra that returns only updates newer than the time queried for. The querystring is on the form created_at__gt=YYYY-MM-DDTHH:MM:SS
…e/749_rsr_version_header
- Made sure to add auth_groups if the required onces are not there in save() on Employmen. - Updated type checks in permissions - Changed order on permission middleware - Added a setting for required auth_groups - In the add update template moved JS from the head to the jq block where $ is defined.
- Updated README with quick instructions on how to get started. - Fixed a typo in the Vagrantfile
… This will use the newest RSR basebox but also move the insertion of testdata into the RSR codebase
Since some BSDs allow . (dot) in the username & we can just as well use the more common : between group and user.
To be able to load and dump user images (db folder) and database content we need two matching script. The dump script should be used to create what we want to host on files.akvo-ops.org.
- Updated load.sh and dump.sh to now work properly - Updated load_test_db.sh provisioning script to use load.sh - Added short README text
- Updated to latest sorl-thumbnail to get clear_delete_all management command. - Updated curl to follow redirects (for Dropbox).
- Now downloading data from akvo-ops server - Removed old code
- Generated new datafile, that is now referenced. - Enabled migrations at the end of load_test_db.
- Removed commented code - Updated local settings template - Documented how to get started. - Added Copyright headers - Changed to more portable shebang in load/dump scripts
Checklist
|
KasperBrandt
added a commit
that referenced
this pull request
Feb 12, 2015
[#991] Join 'develop' with 'feature/rsr_v3'
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.
After this we should be able to merge feature/rsr_v3 with develop and get one line of development.