[ckan-changes] [ckan/ckan] 6e4c91: [#1409] Fix the e-mail bodies' translation strings
GitHub
noreply at github.com
Mon Feb 3 12:52:22 UTC 2014
Branch: refs/heads/remove-ckan-abbreviation-explanations
Home: https://github.com/ckan/ckan
Commit: 6e4c9103bb2a940c13c7d4c68cb7c1d7d4d0dbf8
https://github.com/ckan/ckan/commit/6e4c9103bb2a940c13c7d4c68cb7c1d7d4d0dbf8
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-12-18 (Wed, 18 Dec 2013)
Changed paths:
M ckan/lib/mailer.py
Log Message:
-----------
[#1409] Fix the e-mail bodies' translation strings
We ended up creating a string with extra whitespace before the paragraphs,
like "...to be reset\n\n Please click the following...".
But the i18n message key doesn't have these whitespaces, so we always send
that in English. To solve it, we could either fix the message key in all .po
files, or change how we construct the string in mailer.py. I prefer the
latter.
Commit: b90d2810eeb6acfea39aeaec2215bb12afb7f74a
https://github.com/ckan/ckan/commit/b90d2810eeb6acfea39aeaec2215bb12afb7f74a
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-12-19 (Thu, 19 Dec 2013)
Changed paths:
M ckan/lib/mailer.py
Log Message:
-----------
[#1409] Remove pdb breakpoint
Commit: 747f2cd24e45aaf0471be1973cf15ebe9feae2d3
https://github.com/ckan/ckan/commit/747f2cd24e45aaf0471be1973cf15ebe9feae2d3
Author: amercader <amercadero at gmail.com>
Date: 2014-01-08 (Wed, 08 Jan 2014)
Changed paths:
M ckan/templates/group/snippets/group_form.html
Log Message:
-----------
[#1426] Remove duplicated require notice
Commit: 6eeb2b1bd0605cc470e4ad742b2dbdedf4d74b79
https://github.com/ckan/ckan/commit/6eeb2b1bd0605cc470e4ad742b2dbdedf4d74b79
Author: amercader <amercadero at gmail.com>
Date: 2014-01-08 (Wed, 08 Jan 2014)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
[#1421] Ensure that check_access is called on activity_create
Otherwise when disabling the activity streams the action returned before
calling the auth function, which made the auth audit fail
Commit: 337b5c9b7010f897d622779f508478eb96c879e8
https://github.com/ckan/ckan/commit/337b5c9b7010f897d622779f508478eb96c879e8
Author: amercader <amercadero at gmail.com>
Date: 2014-01-08 (Wed, 08 Jan 2014)
Changed paths:
M ckan/logic/__init__.py
Log Message:
-----------
[#1421] Better exception message for auth audit
Commit: 3a00b572e795e03b915f6250dfed8b83aad768f7
https://github.com/ckan/ckan/commit/3a00b572e795e03b915f6250dfed8b83aad768f7
Author: amercader <amercadero at gmail.com>
Date: 2014-01-08 (Wed, 08 Jan 2014)
Changed paths:
M ckan/templates/group/read.html
M ckan/templates/organization/read.html
Log Message:
-----------
[#1368] Fix dataset ordering on org and group pages
Match dataset ordering options with those on the main search
Commit: 917e4c6d775a9bc92efe4aa205f3a535ed826c12
https://github.com/ckan/ckan/commit/917e4c6d775a9bc92efe4aa205f3a535ed826c12
Author: kindly <kindly at gmail.com>
Date: 2014-01-09 (Thu, 09 Jan 2014)
Changed paths:
M ckan/lib/dictization/__init__.py
Log Message:
-----------
[#1427] add contitional to allow 0.8 sqlalchemy
Commit: ed05bad70c03b3dc79429160ecb6ee5847c704bf
https://github.com/ckan/ckan/commit/ed05bad70c03b3dc79429160ecb6ee5847c704bf
Author: David Read <david.read at hackneyworkshop.com>
Date: 2014-01-14 (Tue, 14 Jan 2014)
Changed paths:
M ckan/controllers/group.py
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
[#1420] Fix group_show by taking schema out of the context when making sub-calls.
Commit: 2da633fa09b64362aed5d4b22057ae0ad90da452
https://github.com/ckan/ckan/commit/2da633fa09b64362aed5d4b22057ae0ad90da452
Author: Nigel Babu <nigel.babu at okfn.org>
Date: 2014-01-19 (Sun, 19 Jan 2014)
Changed paths:
M doc/install-from-package.rst
Log Message:
-----------
[#1437] Instruction to restart apache and nginx
Commit: 56d2857e6bd04ee4a63bf96bac6a5cf278143e25
https://github.com/ckan/ckan/commit/56d2857e6bd04ee4a63bf96bac6a5cf278143e25
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2014-01-20 (Mon, 20 Jan 2014)
Changed paths:
M ckan/lib/mailer.py
Log Message:
-----------
[#1409] Change string formatting to use "{foo}".format(foo="bar")
Commit: b5b751028b582938c9d207ae60f4b408b29d40a6
https://github.com/ckan/ckan/commit/b5b751028b582938c9d207ae60f4b408b29d40a6
Author: Nigel Babu <nigel.babu at okfn.org>
Date: 2014-01-20 (Mon, 20 Jan 2014)
Changed paths:
M doc/upgrade-package-to-minor-release.rst
M doc/upgrade-package-to-patch-release.rst
Log Message:
-----------
Add restart instructions in upgrade docs too
Commit: 62337405ed21f795f1362e0627e0826a9ab9cfb3
https://github.com/ckan/ckan/commit/62337405ed21f795f1362e0627e0826a9ab9cfb3
Author: amercader <amercadero at gmail.com>
Date: 2014-01-20 (Mon, 20 Jan 2014)
Changed paths:
M doc/install-from-package.rst
M doc/upgrade-package-to-minor-release.rst
M doc/upgrade-package-to-patch-release.rst
Log Message:
-----------
Merge branch '1437-package-update'
Commit: c886cb77a110368365f649addb9806c4258a288c
https://github.com/ckan/ckan/commit/c886cb77a110368365f649addb9806c4258a288c
Author: amercader <amercadero at gmail.com>
Date: 2014-01-20 (Mon, 20 Jan 2014)
Changed paths:
M ckan/lib/dictization/__init__.py
Log Message:
-----------
Merge branch '1427-sqlalchamy-08-compatability'
Commit: 47b38e5645b6cc1309d2c933827064756d1e462a
https://github.com/ckan/ckan/commit/47b38e5645b6cc1309d2c933827064756d1e462a
Author: amercader <amercadero at gmail.com>
Date: 2014-01-20 (Mon, 20 Jan 2014)
Changed paths:
M ckan/public/base/less/dataset.less
Log Message:
-----------
[#1428] Fix superimposing resource items
This was caused by removing the "This resource has no description"
message in #1302.
Commit: 7f5ec21cb964a7c5948dbae8205a2f421857a0db
https://github.com/ckan/ckan/commit/7f5ec21cb964a7c5948dbae8205a2f421857a0db
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M ckan/logic/__init__.py
M ckan/logic/action/create.py
Log Message:
-----------
Merge pull request #1421 from okfn/1421-activity_create-auth-exception
Disabling activity_streams borks editing groups and user
Commit: f3c706d41045c92c5e18ddd9893debcbce505459
https://github.com/ckan/ckan/commit/f3c706d41045c92c5e18ddd9893debcbce505459
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M ckan/public/base/less/dataset.less
Log Message:
-----------
Merge pull request #1428 from okfn/1428-superimposing-resources
Superimposing resources on dataset page
Commit: 134bd00fc62c8d4d53dce36a374d904b34afff2c
https://github.com/ckan/ckan/commit/134bd00fc62c8d4d53dce36a374d904b34afff2c
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M ckan/templates/group/snippets/group_form.html
Log Message:
-----------
Merge pull request #1426 from okfn/1426-duplicated-required-tag
Duplicated Required Fields notice on Group form
Commit: 3f0d11b7242bc83daaab65e6473fae524133d2b4
https://github.com/ckan/ckan/commit/3f0d11b7242bc83daaab65e6473fae524133d2b4
Author: kindly <kindly at gmail.com>
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M ckan/templates/group/read.html
M ckan/templates/organization/read.html
Log Message:
-----------
Merge pull request #1368 from okfn/1368-org-datasets-ordering
Default search ordering on organization home page is broken
Commit: 412fba44ace2bef514f54891afdec897dd702e6e
https://github.com/ckan/ckan/commit/412fba44ace2bef514f54891afdec897dd702e6e
Author: Rachel Knowler <rachel.knowler at liip.ch>
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/lib/helpers.py
Log Message:
-----------
Changed license to licenses in facet titles where this makes more sense.
Commit: 4936c7c2ceb0987f80446ae69128281757f8e69e
https://github.com/ckan/ckan/commit/4936c7c2ceb0987f80446ae69128281757f8e69e
Author: amercader <amercadero at gmail.com>
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#1429] Pass came_from to login handler after creating a user
Otherwise you lose the language setting for the UI. I'm not entirely
sure but that may involve two redirects.
Commit: ae5c63a48670611cb04afa75b13a673357a6f132
https://github.com/ckan/ckan/commit/ae5c63a48670611cb04afa75b13a673357a6f132
Author: Gael Pasgrimaud <gael at gawel.org>
Date: 2014-01-21 (Tue, 21 Jan 2014)
Changed paths:
M ckan/controllers/feed.py
Log Message:
-----------
avoid UnicodeEncodeError when params contains non ascii characters
Commit: cd648de7d085c002475065be1e8ff50ec185251d
https://github.com/ckan/ckan/commit/cd648de7d085c002475065be1e8ff50ec185251d
Author: amercader <amercadero at gmail.com>
Date: 2014-01-22 (Wed, 22 Jan 2014)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#1429] PEP8 fixes
Commit: cc2d3545d7ccf8f41a708c64d62bde680d6e9c01
https://github.com/ckan/ckan/commit/cc2d3545d7ccf8f41a708c64d62bde680d6e9c01
Author: amercader <amercadero at gmail.com>
Date: 2014-01-22 (Wed, 22 Jan 2014)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/lib/helpers.py
Log Message:
-----------
Merge branch 'ogdch-refer-to-licenses-in-facets-2'
Commit: 0b0d046a8c25d71ad8e2bc53d7bd65490efb18e4
https://github.com/ckan/ckan/commit/0b0d046a8c25d71ad8e2bc53d7bd65490efb18e4
Author: amercader <amercadero at gmail.com>
Date: 2014-01-22 (Wed, 22 Jan 2014)
Changed paths:
M ckan/controllers/feed.py
Log Message:
-----------
Merge branch 'urlencode_error' of github.com:regardscitoyens/ckan into regardscitoyens-urlencode_error
Commit: c9d05af7b5fc45ad114e373c83ff50814769f8ef
https://github.com/ckan/ckan/commit/c9d05af7b5fc45ad114e373c83ff50814769f8ef
Author: amercader <amercadero at gmail.com>
Date: 2014-01-22 (Wed, 22 Jan 2014)
Changed paths:
M ckan/controllers/feed.py
Log Message:
-----------
Merge branch 'regardscitoyens-urlencode_error'
Commit: fd257d06b5f689cb70b4e6b40cfab0f9a9e2a888
https://github.com/ckan/ckan/commit/fd257d06b5f689cb70b4e6b40cfab0f9a9e2a888
Author: Ian Ward <ian at excess.org>
Date: 2014-01-22 (Wed, 22 Jan 2014)
Changed paths:
M ckanext/datastore/db.py
Log Message:
-----------
we need try, except to handle local datastore use
This reverts commit 129aec805528f1cba3c6ac73c7363421d35e38d2.
Commit: b6b981c07744c1193f82a64c08087d6d934c7d8a
https://github.com/ckan/ckan/commit/b6b981c07744c1193f82a64c08087d6d934c7d8a
Author: amercader <amercadero at gmail.com>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M ckanext/datapusher/plugin.py
Log Message:
-----------
[#1446] Require ckan.site_url when using the DataPusher
Commit: 306c3d84a3d45e845c4206796a681059941f1210
https://github.com/ckan/ckan/commit/306c3d84a3d45e845c4206796a681059941f1210
Author: David Read <david.read at hackneyworkshop.com>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#1433] Flesh out the context for group/about setup_template_variables.
Commit: 0230587df78bae50288272f78b0a69527335e1fa
https://github.com/ckan/ckan/commit/0230587df78bae50288272f78b0a69527335e1fa
Author: amercader <amercadero at gmail.com>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M ckan/config/deployment.ini_tmpl
M doc/configuration.rst
Log Message:
-----------
[#1446] Better defaults for DataPusher config options + docs
Commit: b128ebb1437c4f882be1304feb2020eebddc95a8
https://github.com/ckan/ckan/commit/b128ebb1437c4f882be1304feb2020eebddc95a8
Author: amercader <amercadero at gmail.com>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M doc/datastore.rst
M doc/install-from-package.rst
Log Message:
-----------
[#1446] Clarify DataPusher issues in docs
Commit: 853568a023662308113fb1756d606f1c0c4b216c
https://github.com/ckan/ckan/commit/853568a023662308113fb1756d606f1c0c4b216c
Author: amercader <amercadero at gmail.com>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M ckan/config/deployment.ini_tmpl
Log Message:
-----------
[#1446] Remove SQLite urls from template ini file
Commit: 213e14f37d40163a541348dd80550258d76c8f5d
https://github.com/ckan/ckan/commit/213e14f37d40163a541348dd80550258d76c8f5d
Author: Ian Ward <ian at excess.org>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M ckanext/datastore/db.py
Log Message:
-----------
pep8
Commit: 770df34be2a487b4f3b81286987cd38e74c9ebf8
https://github.com/ckan/ckan/commit/770df34be2a487b4f3b81286987cd38e74c9ebf8
Author: Ian Ward <ian at excess.org>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M ckan/controllers/group.py
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
Merge branch '1420-group-view-schema-fix'
Commit: 1613ed86d45a7694281ba9b161cb5a2c23dc8acf
https://github.com/ckan/ckan/commit/1613ed86d45a7694281ba9b161cb5a2c23dc8acf
Author: amercader <amercadero at gmail.com>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M ckanext/datapusher/plugin.py
Log Message:
-----------
[#1446] Enable DataPusher for private datasets
There's no need to prevent the import to the datastore on them, as the
datastore will manage the authorization, and logged in users still
expect these files to get imported to the DataStore.
Commit: 699dac215996c01afecc93fc062d3a230d8e810e
https://github.com/ckan/ckan/commit/699dac215996c01afecc93fc062d3a230d8e810e
Author: amercader <amercadero at gmail.com>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M doc/datastore.rst
Log Message:
-----------
[#1446] Remove misleading datastore warning in docs
Commit: 6247a8110807c7a9daa92adfb1dcbe0ea46c75f5
https://github.com/ckan/ckan/commit/6247a8110807c7a9daa92adfb1dcbe0ea46c75f5
Author: amercader <amercadero at gmail.com>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M ckan/public/base/css/main.css
Log Message:
-----------
Recompile main.css (should have been done after #1428 merge)
Commit: fc60167013fb0e4842514d20d47dfbd728c583fa
https://github.com/ckan/ckan/commit/fc60167013fb0e4842514d20d47dfbd728c583fa
Author: amercader <amercadero at gmail.com>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M ckanext/datastore/db.py
Log Message:
-----------
Merge branch 'fix-local-datastore' of github.com:wardi/ckan into wardi-fix-local-datastore
Commit: 1017a28bc6f45851c2362f1ce498fd2fcd0716c4
https://github.com/ckan/ckan/commit/1017a28bc6f45851c2362f1ce498fd2fcd0716c4
Author: amercader <amercadero at gmail.com>
Date: 2014-01-23 (Thu, 23 Jan 2014)
Changed paths:
M ckanext/datastore/db.py
Log Message:
-----------
Merge branch 'wardi-fix-local-datastore'
Commit: e8c8bdaae7109f9255be763ad91205cb2fad04ea
https://github.com/ckan/ckan/commit/e8c8bdaae7109f9255be763ad91205cb2fad04ea
Author: kindly <kindly at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckanext/datapusher/plugin.py
M doc/configuration.rst
M doc/datastore.rst
M doc/install-from-package.rst
Log Message:
-----------
Merge pull request #1446 from okfn/1446-datapusher-integration-issues
DataPusher integration issues
Commit: f9638b4a01b961f5afd6a5658889287a96606b8d
https://github.com/ckan/ckan/commit/f9638b4a01b961f5afd6a5658889287a96606b8d
Author: kindly <kindly at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
R ckan/public/base/vendor/jquery.ui.widget.min.js
Log Message:
-----------
[#1450] remove min file as it does not work properly with fanstatic
Commit: a0b7780bd20298b0c8c26624f1e708fb3e69cada
https://github.com/ckan/ckan/commit/a0b7780bd20298b0c8c26624f1e708fb3e69cada
Author: kindly <kindly at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
M ckanext/datapusher/logic/action.py
Log Message:
-----------
[#1451] use site url to get callback url for datapusher
Commit: 558a38cd90d350e731677b3cec8961e9d206cc63
https://github.com/ckan/ckan/commit/558a38cd90d350e731677b3cec8961e9d206cc63
Author: amercader <amercadero at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
M ckan/public/base/javascript/modules/custom-fields.js
Log Message:
-----------
[#1449] Fix extras deletion
The custom-fields module was actually disabling the fields when clicking
the delete extra cross button. This prevented the key and value from
being sent, which caused a validation error.
We now change only the class to make it look disabled, which should be
good enough.
Commit: d65d22d8c53cd3b8822a21a110bf035aa3db318c
https://github.com/ckan/ckan/commit/d65d22d8c53cd3b8822a21a110bf035aa3db318c
Author: amercader <amercadero at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
M ckanext/textpreview/tests/test_preview.py
Log Message:
-----------
[#1452] Fix text preview tests
Commit: bc9d7fbd2557bf6a2094a01af0bdee7c6d3f0a42
https://github.com/ckan/ckan/commit/bc9d7fbd2557bf6a2094a01af0bdee7c6d3f0a42
Author: kindly <kindly at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
M ckan/lib/helpers.py
M ckan/logic/validators.py
M ckan/templates/package/snippets/package_basic_fields.html
Log Message:
-----------
[#1453] remove item for select list if config not set by adding helper and change validator to fail when config is set with empty string
Commit: 336dfd5304f1a6416dc6ffcd45cd51cf72d594e0
https://github.com/ckan/ckan/commit/336dfd5304f1a6416dc6ffcd45cd51cf72d594e0
Author: kindly <kindly at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
M ckanext/textpreview/tests/test_preview.py
Log Message:
-----------
Merge pull request #1452 from okfn/1452-textpreview-tests
Text preview tests fail when using production JS scripts
Commit: b332fe6dea77dc8c072f2b399a32b01db20c4659
https://github.com/ckan/ckan/commit/b332fe6dea77dc8c072f2b399a32b01db20c4659
Author: amercader <amercadero at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
R ckan/public/base/vendor/jquery.ui.widget.min.js
Log Message:
-----------
Merge branch '1450-resource-reordering-production'
Commit: 4fa7b5ce666e271f1f6e9f315456a0f1cbe0bce2
https://github.com/ckan/ckan/commit/4fa7b5ce666e271f1f6e9f315456a0f1cbe0bce2
Author: amercader <amercadero at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
M ckan/lib/helpers.py
M ckan/logic/validators.py
M ckan/templates/package/snippets/package_basic_fields.html
Log Message:
-----------
Merge branch '1453-sysadmins-not-create-unown-datasets'
Commit: 55959f6d979b94c0082e65396f837258a64924e7
https://github.com/ckan/ckan/commit/55959f6d979b94c0082e65396f837258a64924e7
Author: amercader <amercadero at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
M ckan/public/base/test/spec/modules/custom-fields.spec.js
Log Message:
-----------
[#1449] Remove unneeded tests
Commit: 155fd9bde4009a1500a33efdd3853fbb4e7f0f32
https://github.com/ckan/ckan/commit/155fd9bde4009a1500a33efdd3853fbb4e7f0f32
Author: kindly <kindly at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
M ckanext/datapusher/logic/action.py
Log Message:
-----------
[#1451] pep8 and a few things to make things a look nicer
Commit: e7cae2c43076658a6efd59f9c8e115a84a83ebdd
https://github.com/ckan/ckan/commit/e7cae2c43076658a6efd59f9c8e115a84a83ebdd
Author: kindly <kindly at gmail.com>
Date: 2014-01-24 (Fri, 24 Jan 2014)
Changed paths:
M ckanext/datapusher/logic/action.py
Log Message:
-----------
[#1451] add back in rstrip
Commit: f9f39eb71fafbc6fd84cd4d0aea0117c88028188
https://github.com/ckan/ckan/commit/f9f39eb71fafbc6fd84cd4d0aea0117c88028188
Author: kindly <kindly at gmail.com>
Date: 2014-01-26 (Sun, 26 Jan 2014)
Changed paths:
M ckan/controllers/group.py
M ckan/logic/action/delete.py
M ckan/logic/auth/delete.py
M ckan/public/base/javascript/modules/autocomplete.js
Log Message:
-----------
[#1454] make ie7 fallback to normal dropdown, add logic functions, make sure editor is in member dropdown
Commit: 515d3c56e18171e76bd988087917ada60aecdd84
https://github.com/ckan/ckan/commit/515d3c56e18171e76bd988087917ada60aecdd84
Author: kindly <kindly at gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
Changed paths:
M ckan/controllers/group.py
M ckan/templates/organization/bulk_process.html
Log Message:
-----------
[#1455] fix bulk editing
Commit: 82c554fa8f0191a3667696cd31bdcf3c9deb9e03
https://github.com/ckan/ckan/commit/82c554fa8f0191a3667696cd31bdcf3c9deb9e03
Author: amercader <amercadero at gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
Changed paths:
M ckanext/textpreview/tests/test_preview.py
Log Message:
-----------
[#1452] Fix PEP8
Commit: 6254fe51c114c1a3bbff132606eb421679b71242
https://github.com/ckan/ckan/commit/6254fe51c114c1a3bbff132606eb421679b71242
Author: kindly <kindly at gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
Changed paths:
M ckanext/textpreview/tests/test_preview.py
Log Message:
-----------
Merge pull request #1458 from okfn/1452-textpreview-tests
[#1452] Text Preview fails - Fix PEP8
Commit: bb70fc5b29fe550c56d1d9e58fd9b897a009321c
https://github.com/ckan/ckan/commit/bb70fc5b29fe550c56d1d9e58fd9b897a009321c
Author: amercader <amercadero at gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
Changed paths:
M ckanext/datapusher/logic/action.py
Log Message:
-----------
Merge branch '1451-use-site-url-for-datastore-callback'
Commit: da20b2c4fefdf3ce06571ac24da6c25fabf345fb
https://github.com/ckan/ckan/commit/da20b2c4fefdf3ce06571ac24da6c25fabf345fb
Author: amercader <amercadero at gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
Changed paths:
M ckan/lib/helpers.py
M ckan/logic/validators.py
R ckan/public/base/vendor/jquery.ui.widget.min.js
M ckan/templates/package/snippets/package_basic_fields.html
M ckanext/datapusher/logic/action.py
M ckanext/textpreview/tests/test_preview.py
Log Message:
-----------
Merge branch 'master' into 1449-cant-delete-extra
Commit: 9fdb6957e54313e30c47cfb4a87482770b556c33
https://github.com/ckan/ckan/commit/9fdb6957e54313e30c47cfb4a87482770b556c33
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#1461] remove repeated sort code in package_search
Commit: da90ffafbbd53c93064ea3020cd3dc362e642df0
https://github.com/ckan/ckan/commit/da90ffafbbd53c93064ea3020cd3dc362e642df0
Author: kindly <kindly at gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
Changed paths:
M ckan/controllers/package.py
M ckan/templates/group/snippets/group_item.html
Log Message:
-----------
[#1460] Change button to input so that ie7 works. Also needed to change way params are got as value needs to be the thing shown on the input
Commit: 1cae36c1e627749168627e2ef7da6f03248404b3
https://github.com/ckan/ckan/commit/1cae36c1e627749168627e2ef7da6f03248404b3
Author: amercader <amercadero at gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
Changed paths:
M ckan/controllers/group.py
M ckan/logic/action/delete.py
M ckan/logic/auth/delete.py
M ckan/public/base/javascript/modules/autocomplete.js
Log Message:
-----------
Merge branch '1454-member-editing-fixes'
Commit: afb6ee330544aa0fd0c72892e10848656b7b35a0
https://github.com/ckan/ckan/commit/afb6ee330544aa0fd0c72892e10848656b7b35a0
Author: amercader <amercadero at gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
Changed paths:
M ckan/controllers/group.py
M ckan/templates/organization/bulk_process.html
Log Message:
-----------
Merge branch '1455-fix-bulk-editing'
Commit: cda53dfe155ffd252e83daf6df5d2b0e2a2e8811
https://github.com/ckan/ckan/commit/cda53dfe155ffd252e83daf6df5d2b0e2a2e8811
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
Changed paths:
M doc/conf.py
Log Message:
-----------
Remove 'Comprehensive...' from docs
CKAN stands for CKAN
Commit: 9c0737265d067f60aea024c8d7f6434820a56e00
https://github.com/ckan/ckan/commit/9c0737265d067f60aea024c8d7f6434820a56e00
Author: amercader <amercadero at gmail.com>
Date: 2014-01-27 (Mon, 27 Jan 2014)
Changed paths:
M ckan/controllers/package.py
M ckan/templates/group/snippets/group_item.html
Log Message:
-----------
Merge branch '1460-fix-group-remove-ie7'
Commit: dfb107e37da91f735c4af4c65b1d1b5a3da3c429
https://github.com/ckan/ckan/commit/dfb107e37da91f735c4af4c65b1d1b5a3da3c429
Author: amercader <amercadero at gmail.com>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Merge branch '1461-repeated-code-in-package_search'
Commit: ed063f144b915cb539fcc4ed8b14ec4cca7eb7aa
https://github.com/ckan/ckan/commit/ed063f144b915cb539fcc4ed8b14ec4cca7eb7aa
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
Merge pull request #1429 from okfn/1429-language-reset-after-register
UI language reset after account creation
Commit: 687491d637cd747ab9e158a3062814802c82f3e4
https://github.com/ckan/ckan/commit/687491d637cd747ab9e158a3062814802c82f3e4
Author: kindly <kindly at gmail.com>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M ckan/public/base/javascript/modules/custom-fields.js
M ckan/public/base/test/spec/modules/custom-fields.spec.js
Log Message:
-----------
Merge pull request #1449 from okfn/1449-cant-delete-extra
Can't delete extra
Commit: ff2bb1db74a7e247de17f67deb08edba31b338cd
https://github.com/ckan/ckan/commit/ff2bb1db74a7e247de17f67deb08edba31b338cd
Author: Ian Ward <ian at excess.org>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
Merge remote-tracking branch 'origin/1433-fix-context'
Commit: 254fca2d43ccacbe674df2da42aba83897dcdb96
https://github.com/ckan/ckan/commit/254fca2d43ccacbe674df2da42aba83897dcdb96
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M CHANGELOG.rst
M ckan/logic/__init__.py
M ckan/plugins/interfaces.py
R doc/api.rst
A doc/api/index.rst
A doc/api/legacy-api.rst
R doc/appendices/index.rst
R doc/appendices/solr-multicore.rst
R doc/apps-ideas.rst
R doc/authorization.rst
R doc/background-tasks.rst
R doc/configuration.rst
M doc/contents.rst
M doc/contributing/architecture.rst
M doc/contributing/documentation.rst
M doc/contributing/index.rst
M doc/contributing/release-process.rst
A doc/contributing/test.rst
M doc/contributing/upgrading-dependencies.rst
R doc/data-viewer.rst
R doc/datastore.rst
R doc/deployment.rst
R doc/email-notifications.rst
M doc/extensions/index.rst
M doc/extensions/testing-extensions.rst
M doc/extensions/tutorial.rst
R doc/features.rst
R doc/filestore.rst
R doc/form-integration.rst
R doc/getting-started.rst
M doc/index.rst
R doc/install-from-package.rst
R doc/install-from-source.rst
R doc/installing.rst
R doc/legacy-api.rst
R doc/linked-data-and-rdf.rst
A doc/maintaining/apps-ideas.rst
A doc/maintaining/authorization.rst
A doc/maintaining/background-tasks.rst
A doc/maintaining/configuration.rst
A doc/maintaining/data-viewer.rst
A doc/maintaining/datastore.rst
A doc/maintaining/email-notifications.rst
A doc/maintaining/filestore.rst
A doc/maintaining/form-integration.rst
A doc/maintaining/getting-started.rst
A doc/maintaining/index.rst
A doc/maintaining/installing/deployment.rst
A doc/maintaining/installing/index.rst
A doc/maintaining/installing/install-from-package.rst
A doc/maintaining/installing/install-from-source.rst
A doc/maintaining/linked-data-and-rdf.rst
A doc/maintaining/multilingual.rst
A doc/maintaining/paster.rst
A doc/maintaining/solr-multicore.rst
A doc/maintaining/stats.rst
A doc/maintaining/tag-vocabularies.rst
A doc/maintaining/tracking.rst
A doc/maintaining/upgrading/index.rst
A doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
A doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
A doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
A doc/maintaining/upgrading/upgrade-source.rst
R doc/multilingual.rst
R doc/paster.rst
R doc/stats.rst
M doc/sysadmin-guide.rst
R doc/tag-vocabularies.rst
R doc/test.rst
M doc/theming/index.rst
M doc/theming/templates.rst
R doc/tracking.rst
R doc/upgrade-package-ckan-1-to-2.rst
R doc/upgrade-package-to-minor-release.rst
R doc/upgrade-package-to-patch-release.rst
R doc/upgrade-source.rst
R doc/upgrading.rst
M doc/user-guide.rst
Log Message:
-----------
Big docs reorganization
This is not as big a change as it looks like, because it's taking the way the
docs were already organized by audience and making it explicit by creating
top-level dirs for each audience and moving all the docs into them.
Also cleans up a couple of loose ends where particular files didn't fit into
the organization-based scheme, fit them in. It then has to touch a lot of files
in doc/ to update Sphinx cross-references.
Create 8 top-level directories, one for each different audience:
User guide, sysadmin guide, maintainer's guide, API guide, extending guide,
theming guide, contributing guide and changelog.
(User guide, sysadmin guide and changelog are actually just files, not
directories, because they only need one file each.)
- New overview on docs front page explains the high-level structure
- Added a section to the documentation guidelines explaining the new structure
- Lots of feature pages moved into new maintaining/ dir
- Configuration.rst moved into maintaining/
- getting-started.rst moved into maintaining/
- Move Solr multicore appendix page into maintaining/,
remove the appendix section itself as no longer needed
- Remove the "Features" index page, no longer needed as the pages just go into
the "Maintainer's guide" now
- Create doc/maintaining/installing/ subdir and move the installing and
deployment docs into it
- Create doc/maintaining/upgrading/ subdir and move the upgrading docs into
it
- Move api.rst and legacy-api.rst into new api/ dir
- Move test.rst into contributing/
- Fix Sphinx references all over the place to point to the new file locations
Commit: fd1ec8f8bd800571538f0d7b14ad5fdb8a394b83
https://github.com/ckan/ckan/commit/fd1ec8f8bd800571538f0d7b14ad5fdb8a394b83
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M doc/datastore.rst
M doc/filestore.rst
Log Message:
-----------
Fix a Sphinx error (broken links)
@kindly
Commit: be87f112112d67f1736657408e36a5a260a22f2f
https://github.com/ckan/ckan/commit/be87f112112d67f1736657408e36a5a260a22f2f
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/logic/action/get.py
M ckan/public/base/javascript/modules/custom-fields.js
M ckan/public/base/test/spec/modules/custom-fields.spec.js
M ckan/templates/group/snippets/group_item.html
M doc/maintaining/datastore.rst
M doc/maintaining/filestore.rst
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into docs-reorg
Commit: 77d23b0084bdf20c2f10765b6c63a87d7493bc2b
https://github.com/ckan/ckan/commit/77d23b0084bdf20c2f10765b6c63a87d7493bc2b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2014-01-28 (Tue, 28 Jan 2014)
Changed paths:
M doc/index.rst
Log Message:
-----------
Docs front page text tweaks
Commit: 41d639f098f07393f1e0613ac35ae5669ff0edf4
https://github.com/ckan/ckan/commit/41d639f098f07393f1e0613ac35ae5669ff0edf4
Author: Nigel Babu <nigel.babu at okfn.org>
Date: 2014-01-29 (Wed, 29 Jan 2014)
Changed paths:
M CHANGELOG.rst
M README.rst
M doc/_templates/footer.html
M doc/background-tasks.rst
M doc/conf.py
M doc/contributing/documentation.rst
M doc/contributing/index.rst
M doc/contributing/issues.rst
M doc/data-viewer.rst
M doc/extensions/index.rst
M doc/features.rst
M doc/install-from-source.rst
M doc/stats.rst
M doc/theming/templates.rst
M doc/tracking.rst
Log Message:
-----------
Correct links to ckan repo
Commit: 625b51cdb0f1697add59c7e3faf723a48c8e04fd
https://github.com/ckan/ckan/commit/625b51cdb0f1697add59c7e3faf723a48c8e04fd
Author: amercader <amercadero at gmail.com>
Date: 2014-01-29 (Wed, 29 Jan 2014)
Changed paths:
M CHANGELOG.rst
M README.rst
M doc/_templates/footer.html
M doc/background-tasks.rst
M doc/conf.py
M doc/contributing/documentation.rst
M doc/contributing/index.rst
M doc/contributing/issues.rst
M doc/data-viewer.rst
M doc/extensions/index.rst
M doc/features.rst
M doc/install-from-source.rst
M doc/stats.rst
M doc/theming/templates.rst
M doc/tracking.rst
Log Message:
-----------
Merge branch 'repo-change'
Commit: 944d7286e72a1711c77001ca75dc534784a24622
https://github.com/ckan/ckan/commit/944d7286e72a1711c77001ca75dc534784a24622
Author: Nigel Babu <nigel.babu at okfn.org>
Date: 2014-01-29 (Wed, 29 Jan 2014)
Changed paths:
M CHANGELOG.rst
M README.rst
Log Message:
-----------
Change travis image. Remove coveralls for now
Commit: e73b580203851436e25bf6cd3c8ef4bd1f75d398
https://github.com/ckan/ckan/commit/e73b580203851436e25bf6cd3c8ef4bd1f75d398
Author: kindly <kindly at gmail.com>
Date: 2014-01-29 (Wed, 29 Jan 2014)
Changed paths:
M CHANGELOG.rst
M README.rst
Log Message:
-----------
Merge pull request #1469 from ckan/travis-image-change
Change travis image. Remove coveralls for now
Commit: d0c7356095b3b710f0164c072a42e5e97953f21d
https://github.com/ckan/ckan/commit/d0c7356095b3b710f0164c072a42e5e97953f21d
Author: kindly <kindly at gmail.com>
Date: 2014-01-29 (Wed, 29 Jan 2014)
Changed paths:
M ckan/logic/auth/delete.py
M ckan/tests/test_coding_standards.py
Log Message:
-----------
[#1470] fix member auth import as breaks auto auth pickup in tests
Commit: 1353f0b8f7f3606206c9d7983cc0ba2c9ad8652b
https://github.com/ckan/ckan/commit/1353f0b8f7f3606206c9d7983cc0ba2c9ad8652b
Author: amercader <amercadero at gmail.com>
Date: 2014-01-29 (Wed, 29 Jan 2014)
Changed paths:
M ckan/logic/auth/delete.py
M ckan/tests/test_coding_standards.py
Log Message:
-----------
Merge branch '1470-member-auth-test-fail'
Commit: a8417e970498e02be56f9b54acaa5d3615960c65
https://github.com/ckan/ckan/commit/a8417e970498e02be56f9b54acaa5d3615960c65
Author: kindly <kindly at gmail.com>
Date: 2014-01-29 (Wed, 29 Jan 2014)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[#1473] allow empty string in owner org when there is no previous package or owner org
Commit: 49cc5a96bb00ac0a03445c2ac7b5ad796f32dbad
https://github.com/ckan/ckan/commit/49cc5a96bb00ac0a03445c2ac7b5ad796f32dbad
Author: amercader <amercadero at gmail.com>
Date: 2014-01-29 (Wed, 29 Jan 2014)
Changed paths:
M ckan/logic/auth/delete.py
Log Message:
-----------
[#1471] Fix dataset deletion authorization for unowned datasets
We are basically deferring the whole package_delete auth function to
package_update, because deletions are basically changing the state field
of a dataset from 'active' to 'deleted'.
Commit: 2f2dba872933ce1be2f6d59f54d8dcd29f11cdd6
https://github.com/ckan/ckan/commit/2f2dba872933ce1be2f6d59f54d8dcd29f11cdd6
Author: amercader <amercadero at gmail.com>
Date: 2014-01-29 (Wed, 29 Jan 2014)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
Merge branch '1473-create-unowned-dataset-when-org-member'
Commit: 677d80a63fc93bfdab50698ed061e14b45f51a10
https://github.com/ckan/ckan/commit/677d80a63fc93bfdab50698ed061e14b45f51a10
Author: amercader <amercadero at gmail.com>
Date: 2014-01-29 (Wed, 29 Jan 2014)
Changed paths:
M ckan/logic/auth/delete.py
Log Message:
-----------
[#1471] Call proper function on package_delete
Commit: 866b0b620e24ba36f3a4316d33fd93f60b25ccac
https://github.com/ckan/ckan/commit/866b0b620e24ba36f3a4316d33fd93f60b25ccac
Author: Nigel Babu <nigel.babu at okfn.org>
Date: 2014-01-30 (Thu, 30 Jan 2014)
Changed paths:
M ckan/lib/mailer.py
Log Message:
-----------
Merge remote-tracking branch 'origin/1409-reset-password-email-i18n-bug'
Commit: af52ce4740d86d92603d695be8998e93526d22a4
https://github.com/ckan/ckan/commit/af52ce4740d86d92603d695be8998e93526d22a4
Author: amercader <amercadero at gmail.com>
Date: 2014-01-30 (Thu, 30 Jan 2014)
Changed paths:
M ckan/tests/functional/test_package.py
Log Message:
-----------
[#1471] Fix old test
Since organizations were implemented, any unowned dataset can be edited
(and thus deleted) by any user.
We will probably improve this in th future using the creator_user_id
Commit: b7cd0c5db240d428585f696b0780af77dd1d14a1
https://github.com/ckan/ckan/commit/b7cd0c5db240d428585f696b0780af77dd1d14a1
Author: kindly <kindly at gmail.com>
Date: 2014-01-31 (Fri, 31 Jan 2014)
Changed paths:
M ckan/lib/mailer.py
M ckan/logic/validators.py
Log Message:
-----------
Merge branch 'master' into 1471-delete-unowned-datasets
Commit: 614c1c8761e9ab83b240a70a2725ce8222a76538
https://github.com/ckan/ckan/commit/614c1c8761e9ab83b240a70a2725ce8222a76538
Author: kindly <kindly at gmail.com>
Date: 2014-01-31 (Fri, 31 Jan 2014)
Changed paths:
M ckan/logic/auth/delete.py
M ckan/tests/functional/test_package.py
Log Message:
-----------
Merge branch '1471-delete-unowned-datasets'
Commit: 16075d74454dd495e17284124f65e5ccce987c2e
https://github.com/ckan/ckan/commit/16075d74454dd495e17284124f65e5ccce987c2e
Author: Nigel Babu <nigel.babu at okfn.org>
Date: 2014-02-03 (Mon, 03 Feb 2014)
Changed paths:
M CHANGELOG.rst
M ckan/logic/__init__.py
M ckan/plugins/interfaces.py
R doc/api.rst
A doc/api/index.rst
A doc/api/legacy-api.rst
R doc/appendices/index.rst
R doc/appendices/solr-multicore.rst
R doc/apps-ideas.rst
R doc/authorization.rst
R doc/background-tasks.rst
R doc/configuration.rst
M doc/contents.rst
M doc/contributing/architecture.rst
M doc/contributing/documentation.rst
M doc/contributing/index.rst
M doc/contributing/release-process.rst
A doc/contributing/test.rst
M doc/contributing/upgrading-dependencies.rst
R doc/data-viewer.rst
R doc/datastore.rst
R doc/deployment.rst
R doc/email-notifications.rst
M doc/extensions/index.rst
M doc/extensions/testing-extensions.rst
M doc/extensions/tutorial.rst
R doc/features.rst
R doc/filestore.rst
R doc/form-integration.rst
R doc/getting-started.rst
M doc/index.rst
R doc/install-from-package.rst
R doc/install-from-source.rst
R doc/installing.rst
R doc/legacy-api.rst
R doc/linked-data-and-rdf.rst
A doc/maintaining/apps-ideas.rst
A doc/maintaining/authorization.rst
A doc/maintaining/background-tasks.rst
A doc/maintaining/configuration.rst
A doc/maintaining/data-viewer.rst
A doc/maintaining/datastore.rst
A doc/maintaining/email-notifications.rst
A doc/maintaining/filestore.rst
A doc/maintaining/form-integration.rst
A doc/maintaining/getting-started.rst
A doc/maintaining/index.rst
A doc/maintaining/installing/deployment.rst
A doc/maintaining/installing/index.rst
A doc/maintaining/installing/install-from-package.rst
A doc/maintaining/installing/install-from-source.rst
A doc/maintaining/linked-data-and-rdf.rst
A doc/maintaining/multilingual.rst
A doc/maintaining/paster.rst
A doc/maintaining/solr-multicore.rst
A doc/maintaining/stats.rst
A doc/maintaining/tag-vocabularies.rst
A doc/maintaining/tracking.rst
A doc/maintaining/upgrading/index.rst
A doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
A doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
A doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
A doc/maintaining/upgrading/upgrade-source.rst
R doc/multilingual.rst
R doc/paster.rst
R doc/stats.rst
M doc/sysadmin-guide.rst
R doc/tag-vocabularies.rst
R doc/test.rst
M doc/theming/index.rst
M doc/theming/templates.rst
R doc/tracking.rst
R doc/upgrade-package-ckan-1-to-2.rst
R doc/upgrade-package-to-minor-release.rst
R doc/upgrade-package-to-patch-release.rst
R doc/upgrade-source.rst
R doc/upgrading.rst
M doc/user-guide.rst
Log Message:
-----------
Merge branch 'docs-reorg'
Conflicts:
doc/extensions/index.rst
doc/features.rst
[ci skip]
Commit: 606430afd677ae27d59d369187adf2933f28bdfc
https://github.com/ckan/ckan/commit/606430afd677ae27d59d369187adf2933f28bdfc
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2014-02-03 (Mon, 03 Feb 2014)
Changed paths:
M CHANGELOG.rst
M README.rst
M ckan/config/deployment.ini_tmpl
M ckan/controllers/feed.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/mailer.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/auth/delete.py
M ckan/logic/validators.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/main.css
M ckan/public/base/javascript/modules/autocomplete.js
M ckan/public/base/javascript/modules/custom-fields.js
M ckan/public/base/less/dataset.less
M ckan/public/base/test/spec/modules/custom-fields.spec.js
R ckan/public/base/vendor/jquery.ui.widget.min.js
M ckan/templates/group/read.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/group/snippets/group_item.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/read.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/tests/functional/test_package.py
M ckan/tests/test_coding_standards.py
M ckanext/datapusher/logic/action.py
M ckanext/datapusher/plugin.py
M ckanext/datastore/db.py
M ckanext/textpreview/tests/test_preview.py
M doc/_templates/footer.html
R doc/api.rst
A doc/api/index.rst
A doc/api/legacy-api.rst
R doc/appendices/index.rst
R doc/appendices/solr-multicore.rst
R doc/apps-ideas.rst
R doc/authorization.rst
R doc/background-tasks.rst
M doc/conf.py
R doc/configuration.rst
M doc/contents.rst
M doc/contributing/architecture.rst
M doc/contributing/documentation.rst
M doc/contributing/index.rst
M doc/contributing/issues.rst
M doc/contributing/release-process.rst
A doc/contributing/test.rst
M doc/contributing/upgrading-dependencies.rst
R doc/data-viewer.rst
R doc/datastore.rst
R doc/deployment.rst
R doc/email-notifications.rst
M doc/extensions/index.rst
M doc/extensions/testing-extensions.rst
M doc/extensions/tutorial.rst
R doc/features.rst
R doc/filestore.rst
R doc/form-integration.rst
R doc/getting-started.rst
M doc/index.rst
R doc/install-from-package.rst
R doc/install-from-source.rst
R doc/installing.rst
R doc/legacy-api.rst
R doc/linked-data-and-rdf.rst
A doc/maintaining/apps-ideas.rst
A doc/maintaining/authorization.rst
A doc/maintaining/background-tasks.rst
A doc/maintaining/configuration.rst
A doc/maintaining/data-viewer.rst
A doc/maintaining/datastore.rst
A doc/maintaining/email-notifications.rst
A doc/maintaining/filestore.rst
A doc/maintaining/form-integration.rst
A doc/maintaining/getting-started.rst
A doc/maintaining/index.rst
A doc/maintaining/installing/deployment.rst
A doc/maintaining/installing/index.rst
A doc/maintaining/installing/install-from-package.rst
A doc/maintaining/installing/install-from-source.rst
A doc/maintaining/linked-data-and-rdf.rst
A doc/maintaining/multilingual.rst
A doc/maintaining/paster.rst
A doc/maintaining/solr-multicore.rst
A doc/maintaining/stats.rst
A doc/maintaining/tag-vocabularies.rst
A doc/maintaining/tracking.rst
A doc/maintaining/upgrading/index.rst
A doc/maintaining/upgrading/upgrade-package-ckan-1-to-2.rst
A doc/maintaining/upgrading/upgrade-package-to-minor-release.rst
A doc/maintaining/upgrading/upgrade-package-to-patch-release.rst
A doc/maintaining/upgrading/upgrade-source.rst
R doc/multilingual.rst
R doc/paster.rst
R doc/stats.rst
M doc/sysadmin-guide.rst
R doc/tag-vocabularies.rst
R doc/test.rst
M doc/theming/index.rst
M doc/theming/templates.rst
R doc/tracking.rst
R doc/upgrade-package-ckan-1-to-2.rst
R doc/upgrade-package-to-minor-release.rst
R doc/upgrade-package-to-patch-release.rst
R doc/upgrade-source.rst
R doc/upgrading.rst
M doc/user-guide.rst
Log Message:
-----------
Merge branch 'master' of github.com:ckan/ckan into remove-ckan-abbreviation-explanations
Conflicts:
doc/conf.py
Compare: https://github.com/ckan/ckan/compare/edcd180af35a...606430afd677
More information about the ckan-changes
mailing list