[ckan-changes] [okfn/ckan] 569987: [#1235] Add image block to be able to replace only...

GitHub noreply at github.com
Tue Oct 1 10:19:37 UTC 2013 

  Branch: refs/heads/1117-start-new-test-suite
  Home:   https://github.com/okfn/ckan
  Commit: 569987d68ef1d4c63d71e48eb12a798cac57a59f
      https://github.com/okfn/ckan/commit/569987d68ef1d4c63d71e48eb12a798cac57a59f
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-09-10 (Tue, 10 Sep 2013)

  Changed paths:
    M ckan/templates/snippets/organization.html

  Log Message:
  -----------
  [#1235] Add image block to be able to replace only the image easily


  Commit: 50acd34cb95d73adb7213d2c6be54fe4ff71e2a0
      https://github.com/okfn/ckan/commit/50acd34cb95d73adb7213d2c6be54fe4ff71e2a0
  Author: Dominik Moritz <domoritz at gmail.com>
  Date:   2013-09-10 (Tue, 10 Sep 2013)

  Changed paths:
    M ckan/templates/header.html

  Log Message:
  -----------
  [#1235] Add block for content of container to allow people to add something to the left of the account block


  Commit: cab8f8008edb6781a6d053df4095a8e23ef8550a
      https://github.com/okfn/ckan/commit/cab8f8008edb6781a6d053df4095a8e23ef8550a
  Author: John Martin <me at johnmart.in>
  Date:   2013-09-12 (Thu, 12 Sep 2013)

  Changed paths:
    M ckan/templates/organization/member_new.html

  Log Message:
  -----------
  [#1214] Removed unecessary closed div as it was breaking the templates


  Commit: fea743c9289371ecbbb9c2d013d8f176ed8f4b27
      https://github.com/okfn/ckan/commit/fea743c9289371ecbbb9c2d013d8f176ed8f4b27
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-09-12 (Thu, 12 Sep 2013)

  Changed paths:
    M ckan/logic/action/create.py

  Log Message:
  -----------
  Fix bug in (group|organization)_member_create

According to the documentation, the "username" parameter accepts either name or
id, but the code only accepted name. I've fixed it to accept both.


  Commit: 690bbaeea6b058a078da5212751d98cd790dc1dd
      https://github.com/okfn/ckan/commit/690bbaeea6b058a078da5212751d98cd790dc1dd
  Author: John Martin <me at johnmart.in>
  Date:   2013-09-19 (Thu, 19 Sep 2013)

  Changed paths:
    M ckan/templates/user/login.html

  Log Message:
  -----------
  [#1236] Changes header on sidebar to be more relevant to content


  Commit: 3d592d3e12b306d0585f8734c098363653e3fba9
      https://github.com/okfn/ckan/commit/3d592d3e12b306d0585f8734c098363653e3fba9
  Author: John Glover <j at johnglover.net>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M ckan/templates/organization/member_new.html

  Log Message:
  -----------
  Merge pull request #1214 from okfn/1214-add_member_page

Sidebar displaced on Add members page


  Commit: a145047b6f95d24552afe18af97c4b4858e95430
      https://github.com/okfn/ckan/commit/a145047b6f95d24552afe18af97c4b4858e95430
  Author: Joe Tsoi <joe.yeung.tsoi at gmail.com>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M ckan/templates/user/login.html

  Log Message:
  -----------
  Merge pull request #1236 from okfn/1236-forgotten-password-string-change

Forgotten details or password?


  Commit: 21c21df965609e9dbfd1a20d1e01dc5d44807f34
      https://github.com/okfn/ckan/commit/21c21df965609e9dbfd1a20d1e01dc5d44807f34
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  [#1243] Add tests to group_member_create.


  Commit: 6948349af6452a879a53f5fdb0e2f3614386fdaf
      https://github.com/okfn/ckan/commit/6948349af6452a879a53f5fdb0e2f3614386fdaf
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M ckan/controllers/admin.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.py
    M ckan/logic/action/delete.py
    M ckan/logic/action/get.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/dataviewer/base.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/footer.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/confirm_delete.html
    M ckan/templates/organization/confirm_delete_member.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/edit_form.html
    M ckan/templates/revision/read.html
    M ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/context/dataset.html
    M ckan/templates/snippets/context/group.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/private.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/followers.html
    A ckan/tests/functional/test_tracking.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M doc/configuration.rst
    M test-core.ini

  Log Message:
  -----------
  Merge branch 'master' into 1243

Conflicts:
	ckan/tests/logic/test_action.py


  Commit: ecc89adfaeeccfd907585369485420a9fbf04d47
      https://github.com/okfn/ckan/commit/ecc89adfaeeccfd907585369485420a9fbf04d47
  Author: Nigel Babu <nigelbabu at gmail.com>
  Date:   2013-09-24 (Tue, 24 Sep 2013)

  Changed paths:
    M ckan/logic/action/create.py
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge pull request #1243 from okfn/1243

(group|organization)_member_create only accepts username (and not id)


  Commit: 2d46b36aa53cb96ca37c4040b514935e9abe5ced
      https://github.com/okfn/ckan/commit/2d46b36aa53cb96ca37c4040b514935e9abe5ced
  Author: Vitor Baptista <vitor at vitorbaptista.com>
  Date:   2013-09-25 (Wed, 25 Sep 2013)

  Changed paths:
    M CHANGELOG.rst

  Log Message:
  -----------
  Correct typo in CHANGELOG, forntend -> frontend.


  Commit: 1c40d4b9b2c33b3f380b66f13ff3cfc52c5eafcd
      https://github.com/okfn/ckan/commit/1c40d4b9b2c33b3f380b66f13ff3cfc52c5eafcd
  Author: John Martin <me at johnmart.in>
  Date:   2013-09-26 (Thu, 26 Sep 2013)

  Changed paths:
    M CHANGELOG.rst
    M ckan/controllers/admin.py
    M ckan/controllers/api.py
    M ckan/controllers/feed.py
    M ckan/controllers/home.py
    M ckan/controllers/package.py
    M ckan/controllers/related.py
    M ckan/controllers/revision.py
    M ckan/controllers/storage.py
    M ckan/controllers/tag.py
    M ckan/controllers/user.py
    M ckan/lib/cli.py
    M ckan/lib/dictization/model_dictize.py
    M ckan/lib/helpers.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/action/update.py
    M ckan/logic/auth/create.py
    M ckan/logic/auth/update.py
    M ckan/logic/validators.py
    M ckan/model/package.py
    M ckan/model/resource.py
    M ckan/new_authz.py
    M ckan/plugins/interfaces.py
    M ckan/plugins/toolkit.py
    M ckan/public/base/vendor/select2/README.md
    A ckan/public/base/vendor/select2/select2-spinner.gif
    M ckan/public/base/vendor/select2/select2.css
    M ckan/public/base/vendor/select2/select2.js
    R ckan/public/base/vendor/select2/select2.min.css
    M ckan/public/base/vendor/select2/select2.min.js
    M ckan/public/base/vendor/select2/select2.png
    A ckan/public/base/vendor/select2/select2x2.png
    R ckan/public/base/vendor/select2/spinner.gif
    M ckan/templates/activity_streams/activity_stream_items.html
    M ckan/templates/admin/base.html
    M ckan/templates/admin/config.html
    M ckan/templates/dataviewer/base.html
    M ckan/templates/dataviewer/snippets/data_preview.html
    M ckan/templates/footer.html
    M ckan/templates/group/admins.html
    M ckan/templates/group/base_form_page.html
    M ckan/templates/group/confirm_delete.html
    M ckan/templates/group/confirm_delete_member.html
    M ckan/templates/group/followers.html
    M ckan/templates/group/history.html
    M ckan/templates/group/index.html
    M ckan/templates/group/member_new.html
    M ckan/templates/group/new.html
    M ckan/templates/group/read.html
    M ckan/templates/header.html
    M ckan/templates/home/index.html
    M ckan/templates/macros/autoform.html
    M ckan/templates/organization/about.html
    M ckan/templates/organization/activity_stream.html
    M ckan/templates/organization/admins.html
    M ckan/templates/organization/base_form_page.html
    M ckan/templates/organization/bulk_process.html
    M ckan/templates/organization/confirm_delete.html
    M ckan/templates/organization/confirm_delete_member.html
    M ckan/templates/organization/index.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/organization/members.html
    M ckan/templates/organization/read.html
    M ckan/templates/organization/read_base.html
    M ckan/templates/package/activity.html
    M ckan/templates/package/activity_stream.html
    M ckan/templates/package/base.html
    M ckan/templates/package/confirm_delete.html
    M ckan/templates/package/confirm_delete_resource.html
    M ckan/templates/package/followers.html
    M ckan/templates/package/history.html
    M ckan/templates/package/new_resource.html
    M ckan/templates/package/read.html
    M ckan/templates/package/read_base.html
    M ckan/templates/package/related_list.html
    M ckan/templates/package/search.html
    M ckan/templates/package/snippets/additional_info.html
    M ckan/templates/package/snippets/info.html
    M ckan/templates/package/snippets/package_basic_fields.html
    M ckan/templates/package/snippets/package_metadata_fields.html
    M ckan/templates/package/snippets/resource_form.html
    M ckan/templates/package/snippets/resources_list.html
    M ckan/templates/package/snippets/revisions_table.html
    M ckan/templates/page.html
    M ckan/templates/related/base_form_page.html
    M ckan/templates/related/confirm_delete.html
    M ckan/templates/related/edit_form.html
    M ckan/templates/revision/read.html
    M ckan/templates/revision/snippets/revisions_list.html
    M ckan/templates/snippets/activity_item.html
    M ckan/templates/snippets/context/dataset.html
    M ckan/templates/snippets/context/group.html
    M ckan/templates/snippets/context/user.html
    M ckan/templates/snippets/disqus_trackback.html
    M ckan/templates/snippets/follow_button.html
    M ckan/templates/snippets/license.html
    M ckan/templates/snippets/private.html
    M ckan/templates/tag/index.html
    M ckan/templates/user/activity_stream.html
    M ckan/templates/user/dashboard.html
    M ckan/templates/user/edit.html
    M ckan/templates/user/followers.html
    M ckan/templates/user/list.html
    M ckan/templates/user/login.html
    M ckan/templates/user/logout_first.html
    M ckan/templates/user/read_base.html
    M ckan/templates/user/snippets/followee_dropdown.html
    M ckan/templates/user/snippets/followers.html
    A ckan/tests/functional/test_tracking.py
    M ckan/tests/lib/test_dictization.py
    M ckan/tests/lib/test_dictization_schema.py
    M ckan/tests/lib/test_resource_search.py
    M ckan/tests/logic/test_action.py
    M ckan/tests/logic/test_init.py
    M ckanext/datastore/logic/auth.py
    M ckanext/example_iauthfunctions/plugin.py
    M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
    M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
    A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
    A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
    R ckanext/textpreview/theme/public/highlight.pack.js
    M ckanext/textpreview/theme/public/resource.config
    A ckanext/textpreview/theme/public/vendor/highlight.pack.js
    M doc/configuration.rst
    M test-core.ini

  Log Message:
  -----------
  Merged master


  Commit: 8ba03bbb3e278e6f4d6902f90f337652bfb5470c
      https://github.com/okfn/ckan/commit/8ba03bbb3e278e6f4d6902f90f337652bfb5470c
  Author: John Martin <me at johnmart.in>
  Date:   2013-09-26 (Thu, 26 Sep 2013)

  Changed paths:
    M ckan/templates/header.html
    M ckan/templates/snippets/organization.html

  Log Message:
  -----------
  Merge pull request #1235 from okfn/1235-new-template-blocks

Additional template blocks needed


  Commit: 708da6f5979e4973113f904ad98900aeea4acbc6
      https://github.com/okfn/ckan/commit/708da6f5979e4973113f904ad98900aeea4acbc6
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-01 (Tue, 01 Oct 2013)

  Changed paths:
    M CHANGELOG.rst
    M ckan/logic/action/create.py
    M ckan/templates/header.html
    M ckan/templates/organization/member_new.html
    M ckan/templates/snippets/organization.html
    M ckan/templates/user/login.html
    M ckan/tests/logic/test_action.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into 1117-start-new-test-suite


  Commit: 9147540ab8e381a41ab849239b919c19a2641a35
      https://github.com/okfn/ckan/commit/9147540ab8e381a41ab849239b919c19a2641a35
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-01 (Tue, 01 Oct 2013)

  Changed paths:
    M ckan/new_tests/controllers/__init__.py
    M ckan/new_tests/logic/action/__init__.py
    M ckan/new_tests/logic/action/test_update.py
    M doc/testing-coding-standards.rst

  Log Message:
  -----------
  [#1117] Discourage overuse of mocking

Tweak the testing guidelines to discourage overuse of mocking.


  Commit: 098ac5de1ece4a5851a2ee4cd4290847f3472aeb
      https://github.com/okfn/ckan/commit/098ac5de1ece4a5851a2ee4cd4290847f3472aeb
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-01 (Tue, 01 Oct 2013)

  Changed paths:
    M doc/testing-coding-standards.rst

  Log Message:
  -----------
  [#1117] Add another example to testing guidelines


  Commit: af2ed73934b49cece0920266d0dba3b025ac114e
      https://github.com/okfn/ckan/commit/af2ed73934b49cece0920266d0dba3b025ac114e
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2013-10-01 (Tue, 01 Oct 2013)

  Changed paths:
    M ckan/new_tests/helpers.py
    M doc/testing-coding-standards.rst

  Log Message:
  -----------
  [#1117] Testing guidelines small tweaks


Compare: https://github.com/okfn/ckan/compare/5ca99eee04da...af2ed73934b4

More information about the ckan-changes mailing list