[ckan-changes] [ckan/ckan] 6e4c91: [#1409] Fix the e-mail bodies' translation strings

GitHub noreply at github.com
Tue Feb 4 12:14:37 UTC 2014


  Branch: refs/heads/1465-travis-half-jobs
  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: edcd180af35acbea50676db4cd7f44c64db24716
      https://github.com/ckan/ckan/commit/edcd180af35acbea50676db4cd7f44c64db24716
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-01-20 (Mon, 20 Jan 2014)

  Changed paths:
    M ckan/__init__.py
    M doc/conf.py

  Log Message:
  -----------
  Remove mentions to "Comprehensive Knowledge Archive Network"

CKAN stands for CKAN.


  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: 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: 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: 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: 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: 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: 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: 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: e25e86479c0536c3e326e3a7b723455503925d3a
      https://github.com/ckan/ckan/commit/e25e86479c0536c3e326e3a7b723455503925d3a
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M ckan/logic/auth/__init__.py
    M ckan/new_tests/logic/auth/__init__.py

  Log Message:
  -----------
  [#1488] Make get_*_object helper functions more robust

When functions like `get_resource_object` got an empty id (eg because of
a bug higher up in the logic layer) they returned a random object (the
most recent one on the DB), causing rally hard to debug bugs.

The functions now raise a ValidationError if an id is not provided.


  Commit: 91dbd7f287572fcdf00f4dee5fecc88516f4160b
      https://github.com/ckan/ckan/commit/91dbd7f287572fcdf00f4dee5fecc88516f4160b
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M ckan/new_tests/logic/auth/__init__.py

  Log Message:
  -----------
  [#1488] Fix coding standards test


  Commit: 09c80b28b66da4a39bf91324253ab4b89de6b271
      https://github.com/ckan/ckan/commit/09c80b28b66da4a39bf91324253ab4b89de6b271
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test.py

  Log Message:
  -----------
  [#1487] Fix auhtorization in datapusher_hook

We were passing data_dict to the auth function, which didn't contain the
necessary resource_id to perform the auth checks later on. Sadly #1488
was hiding this and the auth check passed or failed randomly


  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


  Commit: c536671dbafef6bc6f5c6f12e84a564932ca381d
      https://github.com/ckan/ckan/commit/c536671dbafef6bc6f5c6f12e84a564932ca381d
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M ckan/__init__.py

  Log Message:
  -----------
  Merge branch 'remove-ckan-abbreviation-explanations'


  Commit: 3e37fc957fb07bab5d5f7390f70b4251044820af
      https://github.com/ckan/ckan/commit/3e37fc957fb07bab5d5f7390f70b4251044820af
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M ckan/new_tests/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_init.py

  Log Message:
  -----------
  [#1488] Move tests where they will actually get run


  Commit: b9c4e4cda5f6d7acfea4c654650ccfc0b175f7c4
      https://github.com/ckan/ckan/commit/b9c4e4cda5f6d7acfea4c654650ccfc0b175f7c4
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M ckan/new_tests/logic/auth/test_init.py

  Log Message:
  -----------
  [#1488] Remove debug junk


  Commit: f49cb0ab8f9736ee556a6a6426b453af4419a8ed
      https://github.com/ckan/ckan/commit/f49cb0ab8f9736ee556a6a6426b453af4419a8ed
  Author: kindly <kindly at gmail.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M ckan/logic/auth/__init__.py
    A ckan/new_tests/logic/auth/test_init.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test.py

  Log Message:
  -----------
  Merge pull request #1488 from ckan/1488-more-robust-get-object-in-auth

Auth helper function `_get_object` is evil [#1487 + #1488]


  Commit: e0a31ed78cf7d73a533af584e92beb4d5314c452
      https://github.com/ckan/ckan/commit/e0a31ed78cf7d73a533af584e92beb4d5314c452
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M ckanext/datapusher/logic/action.py

  Log Message:
  -----------
  [#1490] Fox datapusher_hook callback URL

The old implementation didn't work for deployments that were not located
on a non-root location (eg http://someorg.com/ckan). This fixes it and
also allows the action to be run outside of a web request eg from the command
line


  Commit: 2bd5465be5a24f25c7b625e8bb0593258cc03612
      https://github.com/ckan/ckan/commit/2bd5465be5a24f25c7b625e8bb0593258cc03612
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/resource_edit_base.html

  Log Message:
  -----------
  [#1491] Fix new dataset form and resource pages breadcrumbs


  Commit: 897651c3c5e4564025b399d4642a70bc3e1698f5
      https://github.com/ckan/ckan/commit/897651c3c5e4564025b399d4642a70bc3e1698f5
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Update master changelog


  Commit: f341aaf835b0083111c5cfccd45c783c750b71d2
      https://github.com/ckan/ckan/commit/f341aaf835b0083111c5cfccd45c783c750b71d2
  Author: kindly <kindly at gmail.com>
  Date:   2014-02-03 (Mon, 03 Feb 2014)

  Changed paths:
    M ckanext/datapusher/logic/action.py

  Log Message:
  -----------
  Merge pull request #1490 from ckan/1490-datapusher_hook-callback-url

Wrong datapusher hook callback URL on non-root deployments


  Commit: 60d30a689966df3ce8bea57af9330b8e7a17b768
      https://github.com/ckan/ckan/commit/60d30a689966df3ce8bea57af9330b8e7a17b768
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M CHANGELOG.rst
    M ckanext/datapusher/logic/action.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:ckan/ckan into 1491-wrong-breadcrumbs


  Commit: edb7eaabc0aa42651f841dd32b97ac0e647f0221
      https://github.com/ckan/ckan/commit/edb7eaabc0aa42651f841dd32b97ac0e647f0221
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/resource_edit_base.html

  Log Message:
  -----------
  Merge branch '1491-wrong-breadcrumbs'


  Commit: 963e50c1ddf8f58c00330fdd3610e20696525bb3
      https://github.com/ckan/ckan/commit/963e50c1ddf8f58c00330fdd3610e20696525bb3
  Author: amercader <amercadero at gmail.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M ckan/__init__.py

  Log Message:
  -----------
  Fix version number for master branch


  Commit: 72f55306269a00c5bec72701f0b5978054ed7423
      https://github.com/ckan/ckan/commit/72f55306269a00c5bec72701f0b5978054ed7423
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M ckan/lib/navl/validators.py

  Log Message:
  -----------
  Fix small typo defalult_value -> default_value


  Commit: dfc770bd929934531e08ee32566c7154f774dc7a
      https://github.com/ckan/ckan/commit/dfc770bd929934531e08ee32566c7154f774dc7a
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2014-02-04 (Tue, 04 Feb 2014)

  Changed paths:
    M CHANGELOG.rst
    M README.rst
    M ckan/__init__.py
    M ckan/controllers/group.py
    M ckan/controllers/package.py
    M ckan/controllers/user.py
    M ckan/lib/mailer.py
    M ckan/lib/navl/validators.py
    M ckan/logic/__init__.py
    M ckan/logic/action/get.py
    M ckan/logic/auth/__init__.py
    M ckan/logic/auth/delete.py
    M ckan/logic/validators.py
    A ckan/new_tests/logic/auth/test_init.py
    M ckan/plugins/interfaces.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 ckan/templates/package/edit_base.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/new_resource_not_draft.html
    M ckan/templates/package/resource_edit_base.html
    M ckan/tests/functional/test_package.py
    M ckan/tests/test_coding_standards.py
    M ckanext/datapusher/logic/action.py
    M ckanext/datapusher/tests/test.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' into 1465-travis-half-jobs


Compare: https://github.com/ckan/ckan/compare/fe00e6cf633d...dfc770bd9299


More information about the ckan-changes mailing list