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

[#1003 #1025 #1032 #1073 #1075] Pull request for combination of issues #1094

Merged
merged 20 commits into from
Feb 16, 2015
Merged

[#1003 #1025 #1032 #1073 #1075] Pull request for combination of issues #1094

merged 20 commits into from
Feb 16, 2015

Conversation

KasperBrandt
Copy link
Contributor

A PR for a combination of issues:

@KasperBrandt
[#1032] Added sectors as filter on project directory page
7baede4
@KasperBrandt
[#1032] Data migration for sector cleanup
effbf62
@KasperBrandt
[#1032] Merged 'feature/rsr_v3' into branch
6da4761
@KasperBrandt
[#1025] Added document upload
ea28a27 
- Removed ProjectDocument model
- Changed Link model
  - Added IATI fields
  - Added document upload
  - Changed 'caption' to 'title'
- WIP because this migration will conflict with new migrations in other branches
@KasperBrandt
[#1032] Merged 'feature/rsr_v3' into branch
429a3b5
@KasperBrandt
[#1073] Only show 'reset all filters' when filters in place
111c8aa
@KasperBrandt
[#1025] Merge branch '1032_sector_filters' into 1025_document_upload
d018039
@KasperBrandt
[#1025] Updated migration
386a368
@KasperBrandt
[#1075] Re-odered the project admin
fa8f531
@KasperBrandt
[#1003 #1075] Set the correct admin extra's and renamed current statu…
e06da91 
…s to situation
@KasperBrandt
[#1025] Added document upload to ProjectDocument
64ab816
@KasperBrandt
[#1025 #1075] Merged '1025_document_upload' into branch
634ef3a
@KasperBrandt
[#1025] Small update to admin description of project document
68dd18c
@KasperBrandt
[#1025] Allow non-ascii characters in document upload
3a209bd
@KasperBrandt
[#1075] Added additional help texts
f9d69a4
@KasperBrandt
[#1025] Added project document migration
e8fad8e
@KasperBrandt
[#991] Merge branch 'develop' into 1075_admin_reorder
7ebf9cf
@KasperBrandt
[#991] Updated migrations
aef2da9
@KasperBrandt
[#1032] Updated sector handling
b905b58
@iperdomo
Copy link
Contributor

Checklist

  • Test plan
  • Copyright header
  • Code formatting

kardan added a commit that referenced this pull request Feb 16, 2015
@kardan
Merge pull request #1094 from akvo/1075_admin_reorder
4275784 
[#1003 #1025 #1032 #1073 #1075] Pull request for combination of issues
@kardan kardan merged commit 4275784 into develop Feb 16, 2015
@kardan kardan deleted the 1075_admin_reorder branch February 16, 2015 12:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@kardan kardan

Labels
None yet
Projects
RSR
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@KasperBrandt @iperdomo @kardan