Merge pull request #508 from akvo/release/candidate

RSR v2.3.5 Uglyfruit Release/Candidate

Author: KasperBrandt

.gitignore

@@ -98,3 +98,5 @@ tramp
 
 # Vagrant
 .vagrant
+
+*.hp6rKR

AUTHORS.txt

@@ -1,24 +1,35 @@
-AUTHORS.txt v1.3, 11 December 2009, pb 
+AUTHORS.txt v1.4, 9 April 2014, pb, adriancollier
 
 AUTHORS of Akvo RSR
 
 The PRIMARY AUTHORS are (and/or have been):
 
 - Malte Beckmann
+- Kasper Brandt
 - Paul Burt
 - Thomas Bjelkeman-Pettersson
 - Mark Charmer
+- Adrian Collier
+- Carl Crowder
 - Oliver Galloway-Lunn
 - Gabriel von Heijne
 - Daniel Karlsson
+- Stellan Lagerström
 - Gino Lee
 - Peter van der Linde
+- Robert Rochette
+- Loïc Sans
+- Anna-Marthe Sessink
 - Elizabeth Whiteside
 
 Translation support by:
 
 - Malte Beckmann
 - Anke van Lenteren
+- Isabelle Olivetti
+- Isabel Ordonez
+- Sergio Atristain
+- Jura Khrapunov
 
 Contributors, here is an inevitably incomplete list of MUCH APPRECIATED
 CONTRIBUTORS whom without, Akvo RSR would not have been the same:
@@ -29,7 +40,7 @@ CONTRIBUTORS whom without, Akvo RSR would not have been the same:
 - Jeroen van der Sommen
 - Mark Tiele Westra
 
-Further team members can be found at < http://www.akvo.org/web/team >
+Further team members can be found at < http://akvo.org/about-us/team/ >
 
 Funding partners, without them Akvo RSR could not have happened
 
@@ -43,5 +54,4 @@ Funding partners, without them Akvo RSR could not have happened
 - Simavi
 
 Many more partners, who all have greatly contributed to Akvo RSR in
-many ways can be found at: < http://www.akvo.org/web/ngo_partners >
-and < http://www.akvo.org/web/become_a_project_partner >
+many ways can be found at: < http://akvo.org/about-us/partners/ >

LICENSE.md

@@ -1,6 +1,6 @@
-LICENSE.md, v1.1, 29 May 2012 [ogl]
+LICENSE.md, v1.2, 9 April 2014 [ogl, adriancollier]
 
-Copyright (C) 2007-2012 Stichting Akvo (Akvo Foundation)
+Copyright (C) 2007-2014 Stichting Akvo (Akvo Foundation)
 
 This file is part of Akvo RSR.
 

README.md

@@ -1,10 +1,14 @@
-README.md v1.2, 29 May 2012 [ogl]
+README.md v1.3, 9 April 2014 [ogl, adriancollier]
 
 # Akvo Really Simple Reporting (Akvo RSR)
 
-Akvo RSR is part of the Akvo Platform. The Akvo Platform is used on Akvo.org to combat poverty through small-scale water and sanitation projects. We believe that Akvo RSR can be used in many other development aid scenarios, in areas such as education, health care, agriculture, etc.
+Akvo Foundation is a non-profit foundation that builds open source internet and mobile phone software which is used to make international development cooperation and governance more effective and transparent.
 
-Read more about the [Akvo Platform](http://www.akvo.org/web/akvo_platform_overview).
+Akvo RSR is part of the Akvo platform. Akvo RSR is a web and Android-based system that makes it easy for international development teams to bring complex networks of projects online and instantly share progress with everyone involved and interested.
+
+We believe that Akvo RSR can be used in many other scenarios, including environmental programs and monitoring.
+
+Read more about [Akvo Products](http://akvo.org/products/).
 
 More information in these files:
 

RELEASE_NOTES.md

@@ -5,6 +5,133 @@ We provide Akvo RSR as a service on your own URL and with your own branding, as
 Check out [Introducing Akvo Really Simple Reporting](http://akvo.org/products/rsr/).
 Read more about [Akvo Products](http://akvo.org/products/).
 
+Akvo RSR ver 2.3.5 Uglyfruit
+---
+
+Wednesday 9th April 2014, adriancollier
+
+New Features
+---
+
+### IATI Export
+
+On popular demand we have created the first installment of the IATI Export functionality. This feature will allow us to create an IATI XML file based on the projects that an organisation has within RSR to publish within the IATI Registry.
+
+There will be further improvements to this functionality including visibility of files within the website, automatic publishing and historical file access over the coming weeks.
+
+Github issue [#334](https://github.com/akvo/akvo-rsr/issues/334)
+
+### Donate Buttons on Projects and Widgets
+
+We have had a couple of requests from partners to prevent the donate button from appearing on their projects. Primarily this is due to the organisation not wishing to accomodate donations on specific projects. We have now added the functionality for partners to be able to turn on/off the visibility of the Donate button from the Project Admin per project.
+
+This setting affects where the project is visible on Akvo.org, Akvo Pages and within Widgets.
+
+Github issue [#310](https://github.com/akvo/akvo-rsr/issues/310) & [#491](https://github.com/akvo/akvo-rsr/issues/491)
+
+
+### Image Upload Recommendations
+
+We noticed that many users were unaware of the right size or dimentions of images to use when uploading to RSR projects or updates. To help guide users to have the best quality of images on their projects we have added some recommendations including the limits related to file sizes that the system imposes.
+
+Github issue [#219](https://github.com/akvo/akvo-rsr/issues/219)
+
+### Update warning on empty content
+
+If a user wants to post an update without any content and only a title, then we think they should be allowed to do this. However we also think it's great if users do add content and not just the title. So we have added a reminder to the form to advise users to include content in case this is a mistake. Just like if you send an email without a subject.
+
+Github issue [#304](https://github.com/akvo/akvo-rsr/issues/304)
+
+### Registrations via Akvo Pages (aka Partnersites)
+
+When users want to register directly from Akvo Pages they used to have to select the organisation that they want to register under. To improve integration we have now pre-selected this, so that users now automatically are registering under the organisation that owns the Akvo Pages.
+
+Github issue [#309](https://github.com/akvo/akvo-rsr/issues/309)
+
+### Organisation input guidelines
+
+We've made some small improvements in the documentation available for organisations wishing to import organisations using the API.
+
+Github issue [#425](https://github.com/akvo/akvo-rsr/issues/425)
+
+### Improved 404 page
+
+We'd prefer it if no-one sees a 404 error page, but when they do, we want it to be a nice 404 error page, so we've now added the same one we use on Akvo.org as we like it.
+
+Github issue [#450](https://github.com/akvo/akvo-rsr/issues/450)
+
+### Partner Types
+
+We made a change a while back to only allow partners to be added to projects where they are enabled for that particular role, e.g. Support Partner. This has created some processing issues affecting Admin users and causing a bit of a long process for maintaining projects. As a workaround for this, we have now enabled all organisations to be either Field or Funding partners on projects. As before if organisations need to be added as a Support or Sponsor partner then this will need to be approved by the Akvo Partner Team, but this small change should help a lot of project admins have a simpler time with their work.
+
+Github issue [#462](https://github.com/akvo/akvo-rsr/issues/462)
+
+### Improved API resource for Project Updates
+
+As we would like to display more information about project updates in different places, and as this information is stored in multiple different tables within the database, we have created a common single resource to be able to collect all this information with a single API call.
+
+Github issue [#463](https://github.com/akvo/akvo-rsr/issues/463)
+
+### Widget Improvements
+
+We have made several visual improvements on the Widget templates in this release based on some partner feedback from CommonSites to make them clearer and look that little bit more impressive.
+
+Github issue [#479](https://github.com/akvo/akvo-rsr/issues/479)
+
+### Better documentation on Github Process
+
+We've improved the developer documentation for our Github process internally to make things clearer for everyone in the team.
+
+Github issue [#422](https://github.com/akvo/akvo-rsr/issues/422) & [#481](https://github.com/akvo/akvo-rsr/issues/481)
+
+Bug Fixes
+---
+
+### Error in maps for Internet Explorer 8 (IE8)
+
+There was an issue with displaying maps in IE8 within RSR. While IE8 is being discontinued by Microsoft soon, we still notice some traffic to RSR via this browser so we have made an update to the maps code to render these maps correctly when viewed there.
+
+Github issue [#474](https://github.com/akvo/akvo-rsr/issues/474)
+
+### Links wrapping on Akvo Pages (aka Partnersites)
+
+Links that are added to projects to connect information from Akvopedia or other external sources were not wrapping within the field correctly. This has now been resolved.
+
+Github issue [#179](https://github.com/akvo/akvo-rsr/issues/179)
+
+### Akvo Pages (aka Partnersites) organisation Lists not paginated
+
+All organisations that were participating in projects in the Akvo Pages were being listed in a single page, we have now corrected this to ensure that the organisations are listed in pages containing 10 at a time.
+
+Github issue [#285](https://github.com/akvo/akvo-rsr/issues/285)
+
+### Sign In fields alignment
+
+Sign In fields were being displayed as too large for the box they were sitting in. We have fixed this visual bug.
+
+Github issue [#322](https://github.com/akvo/akvo-rsr/issues/322)
+
+### Donation email in Gmail
+
+There was a styling issue in Gmail when viewing the donation email we send to users who have completed a donation in RSR. This template now uses a table rather than floating div elements so the visuals always match what is expected of them.
+
+Github issue [#460](https://github.com/akvo/akvo-rsr/issues/460)
+
+
+### External links tab use
+
+When opening multiple external links from a project page, the same tab or window was being used again, so only the most recent link was being displayed to you. We've resolved this to create a new tab or window for each link selected.
+
+Github issue [#323](https://github.com/akvo/akvo-rsr/issues/323)
+
+### Header Sign In & Register options in browser
+
+When a browser was not maximised, the Sign In and Register options were no longer visible in the header, and the scrollbar didn't allow for them to be pulled into view. This has been resolved.
+
+Github issue [#408](https://github.com/akvo/akvo-rsr/issues/408)
+
+
+
 Akvo RSR ver 2.3.4 Tamarine
 ---
 

akvo/api/resources/__init__.py

@@ -22,7 +22,7 @@
 from .partnership import PartnershipResource, IATIPartnershipResource
 from .project import ProjectResource, IATIProjectResource
 from .project_comment import ProjectCommentResource
-from .project_update import ProjectUpdateResource
+from .project_update import ProjectUpdateResource, ProjectUpdateResourceExtra
 from .right_now_in_akvo import RightNowInAkvoResource
 from .user import UserResource
 from .user_profile import UserProfileResource
@@ -56,6 +56,7 @@
     'ProjectMapLocationResource',
     'ProjectMapResource',
     'ProjectUpdateResource',
+    'ProjectUpdateResourceExtra',
     'RightNowInAkvoResource',
     'UserResource',
     'UserProfileResource',

akvo/api/resources/project_update.py

@@ -3,7 +3,7 @@
 # Akvo RSR is covered by the GNU Affero General Public License.
 # See more details in the license.txt file located at the root folder of the Akvo RSR module.
 # For additional details on the GNU license please see < http://www.gnu.org/licenses/agpl.html >.
-
+from django.core.urlresolvers import reverse
 
 from django.forms.models import ModelForm
 
@@ -62,3 +62,55 @@ def dehydrate(self, bundle):
             del bundle.data['created_at']
             del bundle.data['last_modified_at']
             return bundle
+
+
+class ProjectUpdateResourceExtra(ProjectUpdateResource):
+    class Meta(ProjectUpdateResource.Meta):
+        allowed_methods = ['get',]
+        resource_name = 'project_update_extra'
+
+    def dehydrate(self, bundle):
+        def org_data_for_update(update):
+            """ return relevant data for the organisation that is linked to an update through the user that created the update
+            """
+            update_org = update.user.get_profile().organisation
+            return dict(
+                absolute_url=update_org.get_absolute_url(),
+                long_name=update_org.long_name,
+                name=update_org.name,
+                resource_uri=reverse(
+                    'api_dispatch_detail', kwargs={
+                        'resource_name':'organisation', 'api_name': 'v1', 'pk': update_org.pk
+                    }
+                ),
+            )
+
+        def user_data_for_update(user):
+            if user.first_name or user.last_name:
+                return dict(
+                    full_name=u"{} {}".format(user.first_name, user.last_name)
+                )
+            return {}
+
+        bundle = super(ProjectUpdateResourceExtra, self).dehydrate(bundle)
+        org = org_data_for_update(bundle.obj)
+        user_resource_uri = bundle.data['user']
+        bundle.data['user'] = user_data_for_update(bundle.obj.user)
+        bundle.data['user'].update(resource_uri=user_resource_uri)
+        bundle.data['user']['organisation'] = org
+        return bundle
+
+    def build_schema(self):
+        data = super(ProjectUpdateResourceExtra, self).build_schema()
+        data['fields']['user'] = {
+            'default': "No default provided.",
+            'type': "to_one",
+            'nullable': False,
+            'blank': False,
+            'readonly': True,
+            'help_text': "A custom related resource with parts of data from user and the organisation the user belongs to. "
+                "Includes the fields full_name, organisation and resource_uri of user and absolute_url, long_name, name and resource_uri "
+                "of organisation.",
+            'unique': False,
+        }
+        return data

akvo/api/xml/iati-xslt.xsl

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- Edited by XMLSpy® -->
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:akvo="http://akvo.org/api/v1/iati-activities">
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:akvo="http://akvo.org/iati-activities">
 
   <xsl:template match="iati-activities">
       <xsl:apply-templates select="iati-activity" />