- Improvements for gnip #2211

 - Improvements for the management of the Importer Session next ID

 - Improvements for the management of the Importer Session next ID

 - Fix for Issue #2273

 - Integration upload test

 - fix pep8 violations and typos

 - removing celery kwargs, need more investigation

Fix When choose Window-cp-874 encoding
Use 'cp874'
https://docs.python.org/2/library/codecs.html#standard-encodings

 - Fix for 2279

Moving the category field label to the correct place in the layer metadata form

add owners api, faster version of profiles for filtering purpose

Fixing a string concatenation for pycsw description in settings

Upgrade font awesome to 4.4.0

Upgrade gsconfig and gsimporter to 1.0.0

Updated changelog for version 2.4b27

Correctly aligned "Your selections" and "Clear all filters" button to the rest of the page

1. Pass category_form from views.layer_upload to layer_upload.html
2. Require user to choose category before uploading (upload.js)
3. Pass chosen category via cookie (cookie.js, upload.js)
4. Parse category_id from cookie in POST section of views.layer_upload

1. Pass category_form from views.layer_upload to layer_upload.html
2. Require user to choose category before uploading (upload.js)
3. Pass chosen category via cookie (cookie.js, upload.js)
4. Parse category_id from cookie in POST section of views.layer_upload

Chage "//" to "#" for .py comment

Coding style fixes based on Travis CL output

Whitespace fixes as per Travis Cl output:

More whitespace nonsense

Whitespace hell

Whitespace hell 4real

Consistent use of whitespaces

add support for preserving XML metadata with upload (#2250)

fix indentation

fix ref

fix syntax

fix pep8

Revert "(Hold for 2.5.x) add support for preserving XML metadata with upload (#2250)"

Added explicit import of cookie.js

Using geonode-supplied {% static %} to accomodate non-root install

fixed issue with years before 1900

removed unused package

added comment on strftime issue

add wgs84 map viewer support

 - Adding afabiani among AUTHORS list

 - deps

 - doc

explicitly create the uploaded directories and assign them to apache

removal of old references to form.cleaned_data["category"] which
are not used (yet) because passing chosen category via cookie
rather than adding category form to formset at submission.

remove logging statements ... ooops.

exclude bing until we figure out what changed

More resilient layer delete

fixed issues with alternative map projection

remove base layers from package local_settings.

PEP8 fixes.

Bump Django to include latest security patch.

Includes a API_INCLUDE_REGIONS_COUNT setting to enable region facets count. It also add region code to the api filtering fields

Updated changelog for version 2.4b28

Added gsolat to AUTHORS

gsolat contributed a black and white theme to geoext for the 2.4 release based on fontawesome

Fixes #2310

Better handles topic category pick in layer upload form

In layer upload topic category must be passed as string

bump pycsw / OWSLib

Adding geonode version number to static files in order to force reload in browser every time there is a new geonode version

fix some text search issues, special characters, positioning and free search

Fixes layout for some pages

add owner autocomplete in metadata page

assign upload session to owner on metadata save, fixes #2222

make sure there are upload sessions before updating the user

Updated changelog for version 2.4c1

Fixes html layout in some account pages

Updated changelog for version 2.4c2

added german as language

make dynamic to work with datastore

fix dynamic to correctly use the basefile

add verbose name plural and set geomanager as default for dynamic

sycing

sycing tsf

Message posted to Slack after layer upload

Not make Point a multipoint

Update

Fix People page layout

Fix group and profile layout page

Fix logo in group detail page

Fix keyword style in group page

set additional store parameters, fixes #2337. Thanks @afabiani

sycing

sycing tsf

Message posted to Slack after layer upload

get doc_url extension using urlparse

Clear all SEVERE and ERROR messages from building docs

fix more inconsistencies on docs source files

get doc_url extension using urlparse

Clear all SEVERE and ERROR messages from building docs

fix more inconsistencies on docs source files

Restore primary button in group list page

Restore settings and search.js

add credentials on was statistics generation, fixes #1412

use sld_url to retrieve the correct sld location, fixes #2048

'added additional filetypes for geonode.importer - gdal specific'

add support for data.json output (#1022)

Changes to include spherical projections and better error handling when logging

body_href is a property then and bump gsconfig to 1.0.3

Revert category choice in upload, also fixes #2323

 - Proposal Refactoring for GeoNode Documentation

- Proposal Refactoring for GeoNode Documentation

- Proposal Refactoring for GeoNode Documentation

Now bingmaps base layer will be enabled if a BING_API_KEY is defined. Refs #2314

Fixes #2301

initial support for shopping cart

add bulk permissions in cart

removed unnecessary css rule

fix cart empty message

add cart button and add/remove behavior

more fixed own the cart templates

Fix cart templates

Updated changelog for version 2.4c3

Updated changelog for version 2.4c4

Added instructions to build geoserver debian package

support XML metadata uploads with filenames like xyz.shp.xml (#2351)

hide the add to cart icon if there's no cart

the add to cart is now visible despite the user is logged in or not

Minor layout fixes in People and Group pages

don't show the resource div if there are no resources in profile detail

limit title length in cart

Change cart default text

updated few screenshots

test doc build without readme

Documents Upload Page improvements

Mobile Design / Extent Search #2171

fixed logs

changed map initial zoom to 0

Changed $scope to var

bump owslib to 0.10

Fixed the problem with DateTimeFields not accepting PM datetimes

Corrected flake8 violations

make CSW GetDomain display facet counts

Updated geoserver's debian package building documentation

Updated geoserver's debian package building documentation

Updated changelog for version 2.4

implement ident/status JSON (#2100)

add support for preserving XML metadata with upload (#2250)

Fix issue #2368

 - Issue #2337

 - Issue #2337

 - deps management

 - Improvements for gnip #2211

 - pep8 violations

Added management command script to change titles of layers on particular maps.

 - a bit more robust check on db connection

 - more robust with maps without layers or broken configuration

 - fix wMS test case

 - fix WMS test case

use WCS version 2.0.1, no need to do getCapabilities

update integration tests to reflect the correct mime

make nullable metadata_uploaded_preserve

revert previous commit, sorry

Add SSL configuration to docs

updating the condition in line 321

the condition must check if geonode.geoserver is in the installed apps

remove unsupported ISO property (#2385)

added a tutorial for installing geonode devmode on centos 7

specified centos version

added devmode install on centos to the index

added devinstall centos to the index

modified in order to render correctly in the html page

Keywords not restricted by type

added .. code-block:: console

added newline for readability

Update users-groups.txt

Changed "add a new users" to "add a new user"

Fix bug preventing set_permissions from granting layer perms to AnonymousUsers.

Allow permissions to be set in gs_slurp.

 - Issue #2402

 - Issue #2403

update deprecated Django argument

add CSW code example

fix the datastore for the geomanager

remove GeoNode.js

 - relax few base library dependencies

Some minor changes to development environment setup docs

Getting rid of duplicate dev mode installation instructions.

 - Merging Indexes for issue: Getting rid of duplicate dev mode installation instructions.

bind shapely to 1.3.1

Modal user menu Help link fix. Changed to Django template tag.

 - Issue #2417

Commit Message

wmsStore added as countable layer

wmsStore added as countable layer

wmsStore added as countable layer

wmsStore added as countable layer

wmsStore added as countable layer

remove unused fields (#2422)

add zlib1g-dev to Dockerfile

 - updated db port and password on win bin installer documentation

add startIndex and count parameter bindings to OpenSearch Description

set conditional for default map crs

To resolve this issue:
#2432

point quick install to the stable package

old win-installer script clean up

Fixed typo in origin year

implementation of a exclusive page that display metadata detail for layers, maps and documents

fix #2381

bump OWSLib and pycsw

flexibly port for dev geoserver

Fixes some i18n issues:

- Adds untranslated strings in templates

- Marks some missing strings for translation in python code of forms, models and templates

- Adds a default value of empty string when displaying atributes labels and descriptions in Layer detail template

- Adds pt-br to the LANGUAGES list settings

Update django.po

Small typo fixing and translation adding

Added option to provide a custom date to importlayers management command.

Explicitly parse a provided importlayers date string into a datetime object.

 - temporarly disabled gxplorer playback -

 - fix flake8 issues

AUTHORS

@@ -1,4 +1,4 @@
-GeoNode development was started in 2006. 
+GeoNode development was started in 2009. 
 
 The PRIMARY AUTHORS are (and/or have been):
 
@@ -33,7 +33,7 @@ The PRIMARY AUTHORS are (and/or have been):
     * Derek Hohls (gamesbook)
     * Stefano Menegon (menegon)
     * Patrick Dufour (pjdufour)
-
+    * Alessio Fabiani (afabiani)
 
 
 
@@ -77,6 +77,8 @@ Yewondwossen Assefa (assefay)
 Simone Balbo (sbsimo)
 Cristina Ospino (cristinao)
 John Jediny (nepanode)
+Guillermo Solano (gsolat)
+
 
 A big THANK YOU goes to:
 

Dockerfile

@@ -3,7 +3,7 @@ FROM ubuntu:14.04
 RUN \
   apt-get update && \
   apt-get install -y build-essential && \
-  apt-get install -y libxml2-dev libxslt1-dev libjpeg-dev gettext git python-dev python-pip && \
+  apt-get install -y libxml2-dev libxslt1-dev libjpeg-dev gettext git python-dev python-pip zlib1g-dev && \
   apt-get install -y python-pillow python-lxml python-psycopg2 python-django python-bs4 python-multipartposthandler transifex-client python-paver python-nose python-django-nose python-gdal python-django-pagination python-django-jsonfield python-django-extensions python-django-taggit python-httplib2 && \
   apt-get install -y --force-yes openjdk-6-jdk ant maven2 --no-install-recommends
 

docs/Makefile

@@ -2,7 +2,7 @@
 #
 
 # You can set these variables from the command line.
-LANG        = en
+LANG          = en
 SPHINXBUILD   = sphinx-build
 PAPER         =
 SOURCEDIR     = .

docs/conf.py

@@ -44,20 +44,21 @@
 
 # General information about the project.
 project = u'GeoNode'
-copyright = u'2013, GeoNode Development Team'
+copyright = u'2015, GeoNode Development Team'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '2.0'
+version = '2.4'
 # The full version, including alpha/beta/rc tags.
-release = '2.0'
+release = '2.4'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
 #language = None
+language = 'en'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
@@ -231,7 +232,7 @@
 epub_title = u'GeoNode'
 epub_author = u'GeoNode Development Team'
 epub_publisher = u'GeoNode Development Team'
-epub_copyright = u'2013, GeoNode Development Team'
+epub_copyright = u'2015, GeoNode Development Team'
 
 # The language of the text. It defaults to the language option
 # or en if the language is not set.

docs/index.txt

@@ -1,3 +1,5 @@
+.. _mainindex:
+
 =======================
 GeoNode's Documentation
 =======================
@@ -11,9 +13,9 @@ First Steps
 
 The following sections give an overview of GeoNode from different perspectives, they are targeted at a non-technical audience and the quick installation guide at people who just want to get it installed and will come back later to the complete documentation.
 
- * :doc:`About GeoNode <organizational/about>`
- * :doc:`Quick Installation Guide <tutorials/admin/install/quick_install>`
- * :doc:`GeoNode Users Quickstart Manual <tutorials/users/quickstart/index>`
+ * :doc:`About GeoNode <about>`
+ * :doc:`Quick Installation Guide <tutorials/install_and_admin/quick_install>`
+ * :doc:`GeoNode Users Quickstart Manual <tutorials/overview_and_ref/introduction/geonode_quickstart>`
 
 
 How To Use The Documentation
@@ -35,6 +37,14 @@ The documentation is divided into three sections:
 Table of contents
 =================
 
+About GeoNode
+-------------
+
+.. toctree::
+    :maxdepth: 5
+
+    about 
+
 Tutorials
 ---------
 
@@ -85,9 +95,4 @@ Having trouble? Cant find what you are looking for? We'd like to help!
 .. _Freenode's web based client: http://webchat.freenode.net
 .. _ticket tracker: http://github.com/GeoNode/geonode/issues
 
-.. toctree::
-   :maxdepth: 4
 
-   organizational
-   tutorials
-   reference

docs/make.bat

@@ -5,8 +5,21 @@ REM Command file for Sphinx documentation
 if "%SPHINXBUILD%" == "" (
 	set SPHINXBUILD=sphinx-build
 )
-set BUILDDIR=_build
+
 set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
+set LANG=
+if NOT "%2" == "" (
+	set LANG=%2
+)
+
+if NOT "%LANG%" == "" (
+	set ALLSPHINXOPTS=-D language=%LANG% %ALLSPHINXOPTS%
+    set BUILDDIR=_build/%LANG%
+)
+if "%LANG%" == "" (
+    set BUILDDIR=_build
+)
+
 if NOT "%PAPER%" == "" (
 	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
 )
@@ -41,6 +54,7 @@ if "%1" == "clean" (
 )
 
 if "%1" == "html" (
+    rem echo %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
 	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
 	if errorlevel 1 exit /b 1
 	echo.

docs/organizational/contribute/contrib_on_github.txt

@@ -0,0 +1,65 @@
+.. _contrib_on_github:
+
+=====================================
+Contributing to Open Source on GitHub
+=====================================
+
+.. warning:: This section is freely adapted from the official `GitHub guides <https://guides.github.com>`_.
+
+A great way to get involved in open source is to contribute to the existing projects you’re using.
+
+A Typical GitHub Project Structure
+==================================
+
+The Community
+-------------
+
+Projects often have a community around them, made up of other users in different (formal or informal) roles:
+
+* **Owner** is the user or organization that created the project has the project on their account.
+* **Maintainers** and Collaborators are the users primarily doing the work on a project and driving the direction. Oftentimes the owner and the maintainer are the same. They have write access to the repository.
+* **Contributors** is everyone who has had a pull request merged into a project.
+* **Community** Members are the users who often use and care deeply about the project and are active in discussions for features and pull requests.
+
+Readme
+------
+
+Nearly all GitHub projects include a README.md file. The readme provides a lay of the land for a project with details on how to use, build and sometimes contribute to a project.
+
+License
+-------
+
+A `LICENSE` file, well, is the license for the project. An open source project’s license informs users what they can and can’t do (e.g., use, modify, redistribute), and contributors, what they are allowing others to do.
+
+Documentation and Wikis
+-----------------------
+
+Many larger projects go beyond a readme to give instructions for how people can use their project. In such cases you’ll often find a link to another file or a folder named `docs` in the repository.
+
+.. figure:: img/docs-folder.png
+   :align: center
+
+Alternatively, the repository may instead use the GitHub wiki to break down documentation.
+
+.. figure:: img/d3-wiki.png
+   :align: center
+
+Issues
+------
+
+Issues are a great way to keep track of tasks, enhancements, and bugs for your projects. They’re kind of like email—except they can be shared and discussed with the rest of your team. Most software projects have a bug tracker of some kind. GitHub’s tracker is called Issues, and has its own section in every repository.
+
+.. figure:: img/navigation-highlight.png
+   :align: center
+
+For more information on how Issues work, see the section ":ref:`work_with_github`"
+
+Pull Requests
+-------------
+
+If you’re able to patch the bug or add the feature yourself, make a pull request with the code. 
+Be sure you’ve read any documents on contributing, understand the license and have signed a CLA if required. 
+
+Once you’ve submitted a pull request the maintainer(s) can compare your branch to the existing one and decide whether or not to incorporate (pull in) your changes.
+
+For more information on how Pull Requests work, see the section ":ref:`work_with_github`"

docs/organizational/contribute/contribute_to_documentation.txt

@@ -89,7 +89,7 @@ done here
 .. image:: img/create_file.png
 
 If you click on *create new file here* you can first subdirect to another folder by typing the *foldername* followed by /. If this folder
-doesn't exist until now, one will be created. To create a new file in this folder just type *filename.rst* into the box and hit enter.
+doesn't exist until now, one will be created. To create a new file in this folder just type *filename.txt* into the box and hit enter.
 A short example on how to manage this is given here http://i.stack.imgur.com/n3Wg3.gif.
 
 .. image:: img/create_file_test.PNG

docs/organizational/contribute/contribute_to_translation.txt

@@ -90,7 +90,7 @@ Only for transifex maintainers
 .. note:: This section is only for the maintainers of a transifex group!
 
 For main Geonode localization files
-----------------------------------
+-----------------------------------
 
 These files are generated using standard django-admin tools : makemessages and compilemessages command line tools.
 

docs/organizational/contribute/documentation_guidelines.txt

@@ -73,7 +73,7 @@ Level 5 sections should have a single dot,periol symbol (.)::
 Page labels
 -----------
 
-**Ensure every page has a label.** For example if the page is named ``foo_bar.rst`` then the page should have the label at the top of the file (line1) ::
+**Ensure every page has a label.** For example if the page is named ``foo_bar.txt`` then the page should have the label at the top of the file (line1) ::
 
    ..  _foo_bar:
 

docs/organizational/contribute/index.txt

@@ -4,20 +4,21 @@
 Contributing to GeoNode
 =======================
 
+.. warning:: This section is freely adapted from the official `GitHub guides <https://guides.github.com>`_.
+
 If you are interested in helping us to make GeoNode, there are many ways to do so.
 
 Participate in the Discussion
 -----------------------------
 
 GeoNode has a mailing list (https://groups.google.com/d/forum/geonode-users) where users can ask and answer questions about the software.
-There is also an IRC chat room #geonode on Freenode (http://freenode.net/) where users and developers can discuss GeoNode in real time.
+There are also IRC chats on Gitter where users (https://gitter.im/GeoNode/general) and developers (https://gitter.im/GeoNode) can discuss GeoNode in real time.
 Sometimes users also post interesting tips for managing sites running GeoNode.
 If you want to help out with GeoNode, one easy way is to sign up for the mailing list and help answer questions.
 
 Report Problems on the Issue Tracking System
----------------
+--------------------------------------------
 
-While we do our best to keep GeoNode fast and bug-free, problems can and do arise.
 Informative bug reports are a key part of the bug fixing process, so if you do run into a problem with GeoNode, please don't hesitate to report it on our bug tracker, available online at http://github.com/GeoNode/geonode/issues.
 Useful information for bug reports includes:
 
@@ -28,9 +29,9 @@ Useful information for bug reports includes:
   * What version of the software are you using?
     Please also note any changes from the default configuration.
   * If there is a data file involved in the bug (such as a Shapefile that doesn't render properly), please consider including it in the bug report.
-    We do understand that not all data files are freely distributable.
+    Be aware that not all data files are freely distributable.
 
-To help us better address the issue you can tag the ticket with one or more lables
+To help GeoNode to better address the issue you can tag the ticket with one or more lables
 that you can find on the side column.
 
 Write Documentation
@@ -39,20 +40,35 @@ Write Documentation
 GeoNode's documentation can always use improvement - there are always more questions to be answered.
 For managing contributions to the manual, GeoNode uses a process similar to that used for managing the code itself.
 The documentation is generated from source files in the `docs/` directory within the GeoNode source repository.
-See http://sphinx.pocoo.org/ for more information on the documentation system we use.
+See http://sphinx.pocoo.org/ for more information on the documentation system GeoNode uses.
 
-If you want to learn more about contributing to the documentation, please go ahead to the :ref:`contrib_docu`. We also have some guidelines to help with writing once you are set up :ref:`doc_guidelines`.
+If you want to learn more about contributing to the documentation, please go ahead to the "`How to contribute to GeoNode's Documentation <http://docs.geonode.org/en/latest/organizational/contribute/contribute_to_documentation.html#contrib-docu>`_". 
+GeoNode also have some guidelines to help with writing once you are set up "`How to write Documentation <http://docs.geonode.org/en/latest/organizational/contribute/documentation_guidelines.html#doc-guidelines>`_".
 
 Provide Translations
 --------------------
 
 If GeoNode doesn't provide a user interface in your native language, consider contributing a new translation.
-To get started here are the instructions :ref:`contrib_trans`.
+To get started here are the instructions "`How to contribute to GeoNode's Translation <http://docs.geonode.org/en/latest/organizational/contribute/contribute_to_translation.html>`_".
 
 Write Code
 ----------
 
-Of course since GeoNode is an open source project we do encourage contributions of source code as well.
-If you are interested in making small changes, you can find an open ticket on http://github.com/GeoNode/geonode/issues, hack away, and get started on the Patch Review Process.
+Of course since GeoNode is an open source project which encourages contributions of source code as well.
+If you are interested in making small changes, you can find an open ticket on http://github.com/GeoNode/geonode/issues, hack away, and get started on the "`Patch Review Process <http://docs.geonode.org/en/latest/organizational/contribute/review_criteria.html>`_".
+
+Further Reading
+---------------
+
+:ref:`contrib_on_github`
+
+:ref:`work_with_github`
 
+:ref:`roadmap`
 
+.. toctree::
+   :hidden:
+
+   contrib_on_github
+   work_with_github
+   roadmap

docs/organizational/contribute/roadmap_process.txt

@@ -0,0 +1,30 @@
+.. _roadmap:
+
+===============
+Roadmap Process
+===============
+
+
+The GeoNode Roadmap Process is designed to complement the more technical **GeoNode Improvement Proposals** and strives to make it easier for the various organizations invested in GeoNode to collaborate on features of common interest.
+
+It is based on the "`roadmap items <https://spreadsheets.google.com/a/opengeo.org/spreadsheet/ccc?key=0AklXlBUnMqOrdDNackdvX3ZRS0Fha0xCeGhjSjZ1dEE>`_" developed at the `GeoNode Roadmapping Summit <http://geonode.org/2011/05/roadmapping-summit/>`_ held in May 2011.
+
+Overall, the process for adding items to the collective roadmap is as follows:
+
+#. Organizational partner has an intent to add a feature to the roadmap.
+#. Organizational partner communicates with the `organizational partners list <https://groups.google.com/a/opengeo.org/group/geonode-org/>`_ about the change to gauge interest and determine who else is committed to making it happen.
+#. Organizational partner creates a feature specification on the wiki to further flesh out the idea.
+#. Organizational partner finds a committer on the `developer list <https://groups.google.com/a/opengeo.org/group/geonode-dev/>`_ to shepherd the roadmap item through the **GeoNode Improvement Proposals**.
+
+Each roadmap item will go through four stages:
+
+#. Descriptive Stage (under discussion/"Active")
+#. Technical Stage
+#. Development Stage
+#. Released
+
+After communicating on the `organizational partners list <https://groups.google.com/a/opengeo.org/group/geonode-org/>`_ the roadmap items enters the *Descriptive Stage* and must have a wiki page that lays out the description, user stories, and other interested parties. Optionally, the roadmap item will also include an idea of the difficulty and goals as well as any wireframes, technical diagrams, or prior art.
+
+A roadmap item enters the *Technical Stage* once a committer has been found to shepherd the roadmap item through the **GeoNode Improvement Proposals** process, then the wiki page must contain a clear sense of the technical assumptions, requirements or dependencies, and suggested implementation. Some roadmap items may need to be divided into multiple independent GNIP proposals.
+
+Once it passes through the **GeoNode Improvement Proposals** process, a roadmap item enters the *Development Stage* on its way to *Release*.