[ckan-changes] [okfn/ckan] b28ae6: Merge branch 'master' of github.com:okfn/ckan into...
GitHub
noreply at github.com
Fri Mar 16 16:02:40 UTC 2012
Branch: refs/heads/feature-1698-tag-taxonomies
Home: https://github.com/okfn/ckan
Commit: b28ae660bd5150207c02d63a2253ef4e14de6507
https://github.com/okfn/ckan/commit/b28ae660bd5150207c02d63a2253ef4e14de6507
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-03-03 (Sat, 03 Mar 2012)
Changed paths:
A .gitmodules
M .tx/config
M CHANGELOG.txt
M README.rst
A bin/webstore_test.py
M ckan/config/deployment.ini_tmpl
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/controllers/api.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/revision.py
M ckan/controllers/user.py
A ckan/controllers/webstore.py
M ckan/forms/common.py
M ckan/i18n/bg/LC_MESSAGES/ckan.mo
M ckan/i18n/bg/LC_MESSAGES/ckan.po
M ckan/i18n/ca/LC_MESSAGES/ckan.mo
M ckan/i18n/ca/LC_MESSAGES/ckan.po
M ckan/i18n/ckan.pot
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
M ckan/i18n/de/LC_MESSAGES/ckan.mo
M ckan/i18n/de/LC_MESSAGES/ckan.po
M ckan/i18n/el/LC_MESSAGES/ckan.mo
M ckan/i18n/el/LC_MESSAGES/ckan.po
M ckan/i18n/es/LC_MESSAGES/ckan.mo
M ckan/i18n/es/LC_MESSAGES/ckan.po
M ckan/i18n/fi/LC_MESSAGES/ckan.mo
M ckan/i18n/fi/LC_MESSAGES/ckan.po
M ckan/i18n/fr/LC_MESSAGES/ckan.mo
M ckan/i18n/fr/LC_MESSAGES/ckan.po
M ckan/i18n/hu/LC_MESSAGES/ckan.mo
M ckan/i18n/hu/LC_MESSAGES/ckan.po
M ckan/i18n/it/LC_MESSAGES/ckan.mo
M ckan/i18n/it/LC_MESSAGES/ckan.po
M ckan/i18n/lt/LC_MESSAGES/ckan.mo
M ckan/i18n/lt/LC_MESSAGES/ckan.po
M ckan/i18n/nl/LC_MESSAGES/ckan.mo
M ckan/i18n/nl/LC_MESSAGES/ckan.po
M ckan/i18n/no/LC_MESSAGES/ckan.mo
M ckan/i18n/no/LC_MESSAGES/ckan.po
M ckan/i18n/pl/LC_MESSAGES/ckan.mo
M ckan/i18n/pl/LC_MESSAGES/ckan.po
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
M ckan/i18n/ro/LC_MESSAGES/ckan.mo
M ckan/i18n/ro/LC_MESSAGES/ckan.po
M ckan/i18n/ru/LC_MESSAGES/ckan.mo
M ckan/i18n/ru/LC_MESSAGES/ckan.po
M ckan/i18n/sl/LC_MESSAGES/ckan.mo
M ckan/i18n/sl/LC_MESSAGES/ckan.po
M ckan/i18n/sq/LC_MESSAGES/ckan.mo
M ckan/i18n/sq/LC_MESSAGES/ckan.po
M ckan/i18n/sr/LC_MESSAGES/ckan.mo
M ckan/i18n/sr/LC_MESSAGES/ckan.po
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
M ckan/i18n/sv/LC_MESSAGES/ckan.mo
M ckan/i18n/sv/LC_MESSAGES/ckan.po
M ckan/lib/activity.py
M ckan/lib/base.py
M ckan/lib/captcha.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/hash.py
M ckan/lib/helpers.py
M ckan/lib/i18n.py
A ckan/lib/plugins.py
M ckan/lib/search/query.py
M ckan/logic/__init__.py
M ckan/logic/action/__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/__init__.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/plugins/interfaces.py
A ckan/public/css/bootstrap.css
R ckan/public/css/pretty_buttons.css
M ckan/public/css/style.css
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
M ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js
A ckan/public/scripts/vendor/html5shiv/html5.js
M ckan/public/scripts/vendor/recline/css/data-explorer.css
A ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
M ckan/public/scripts/vendor/recline/recline.js
M ckan/templates/_util.html
M ckan/templates/group/history.html
M ckan/templates/group/new_group_form.html
M ckan/templates/group/read.html
M ckan/templates/home/about.html
M ckan/templates/home/index.html
M ckan/templates/js_strings.html
M ckan/templates/layout_base.html
M ckan/templates/package/edit.html
M ckan/templates/package/history.html
M ckan/templates/package/layout.html
M ckan/templates/package/new.html
M ckan/templates/package/new_package_form.html
M ckan/templates/package/read.html
M ckan/templates/package/read_core.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/user/edit_user_form.html
M ckan/templates/user/layout.html
M ckan/templates/user/list.html
M ckan/templates/user/login.html
A ckan/templates/user/logout_first.html
M ckan/templates/user/read.html
M ckan/tests/__init__.py
M ckan/tests/functional/api/base.py
M ckan/tests/functional/api/model/test_revisions.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_authorization_group.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/functional/api/test_util.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_home.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_search.py
M ckan/tests/functional/test_tag.py
M ckan/tests/functional/test_tag_vocab.py
M ckan/tests/functional/test_user.py
A ckan/tests/functional/test_webstore.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_i18n.py
M ckan/tests/lib/test_solr_package_search.py
M ckanext/stats/__init__.py
A ckanext/stats/public/__init__.py
A ckanext/stats/public/ckanext/__init__.py
A ckanext/stats/public/ckanext/stats/__init__.py
A ckanext/stats/templates/__init__.py
A ckanext/stats/templates/ckanext/__init__.py
A ckanext/stats/templates/ckanext/stats/__init__.py
M ckanext/stats/templates/ckanext/stats/index.html
M ckanext/stats/templates/ckanext/stats/leaderboard.html
A ckanext/test_tag_vocab_plugin.py
A doc/_templates/footer.html
R doc/_templates/layout.html
A doc/_themes/sphinx-theme-okfn
M doc/about.rst
M doc/api.rst
M doc/common-error-messages.rst
M doc/conf.py
M doc/extensions.rst
M doc/index.rst
M doc/install-from-package.rst
M doc/install-from-source.rst
M doc/paster.rst
M doc/solr-setup.rst
M doc/theming.rst
A doc/webstore.rst
M doc/writing-extensions.rst
M setup.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into feature-1807-recently-changed-datasets
Conflicts:
ckan/controllers/home.py
Commit: 8368024fbdf3cc07fcfe3ea30d5bcef8367781f5
https://github.com/okfn/ckan/commit/8368024fbdf3cc07fcfe3ea30d5bcef8367781f5
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-03-03 (Sat, 03 Mar 2012)
Changed paths:
M ckan/controllers/home.py
M ckan/logic/action/get.py
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
Merge branch 'feature-1807-recently-changed-datasets'
Commit: 8749c3643dfe55afbb02cd4bd6b4073a2e3f8782
https://github.com/okfn/ckan/commit/8749c3643dfe55afbb02cd4bd6b4073a2e3f8782
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-03-04 (Sun, 04 Mar 2012)
Changed paths:
M doc/conf.py
A doc/datastore.rst
M doc/index.rst
R doc/webstore.rst
Log Message:
-----------
[#1797,master,doc][s]: webstore -> datastore rename plus extensive reworking and improvement of datastore docs.
Commit: 432f135a35efb7f7d7c056498090c55896cb7901
https://github.com/okfn/ckan/commit/432f135a35efb7f7d7c056498090c55896cb7901
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-03-04 (Sun, 04 Mar 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
A ckan/controllers/datastore.py
R ckan/controllers/webstore.py
A ckan/tests/functional/test_datastore.py
R ckan/tests/functional/test_webstore.py
M doc/datastore.rst
M test-core.ini
Log Message:
-----------
[#1797,refactor][s]: rename webstore -> datastore throughout.
Commit: bc31e278cd4072d4872e803510aa2f3f236274cd
https://github.com/okfn/ckan/commit/bc31e278cd4072d4872e803510aa2f3f236274cd
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-03-04 (Sun, 04 Mar 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
A ckan/controllers/datastore.py
R ckan/controllers/webstore.py
A ckan/tests/functional/test_datastore.py
R ckan/tests/functional/test_webstore.py
M doc/datastore.rst
M test-core.ini
Log Message:
-----------
Merge branch 'feature-1797-webstore-v2'
Commit: fe07d6f7947084441461c035f713be90a02e8005
https://github.com/okfn/ckan/commit/fe07d6f7947084441461c035f713be90a02e8005
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-05 (Mon, 05 Mar 2012)
Changed paths:
A .gitmodules
M README.rst
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
M ckan/controllers/api.py
A ckan/controllers/datastore.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
R ckan/controllers/webstore.py
M ckan/lib/helpers.py
M ckan/lib/plugins.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/public/scripts/application.js
M ckan/public/scripts/vendor/recline/css/data-explorer.css
M ckan/public/scripts/vendor/recline/recline.js
M ckan/templates/_util.html
M ckan/templates/layout_base.html
M ckan/templates/package/resource_read.html
M ckan/templates/user/layout.html
M ckan/tests/functional/api/test_activity.py
A ckan/tests/functional/test_datastore.py
R ckan/tests/functional/test_webstore.py
A doc/_templates/footer.html
R doc/_templates/layout.html
A doc/_themes/sphinx-theme-okfn
M doc/about.rst
M doc/api.rst
M doc/conf.py
A doc/datastore.rst
M doc/index.rst
M doc/theming.rst
R doc/webstore.rst
M test-core.ini
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 5723d492a34245969e90ad8520d821fde48bc23e
https://github.com/okfn/ckan/commit/5723d492a34245969e90ad8520d821fde48bc23e
Author: Toby <toby.junk at gmail.com>
Date: 2012-03-05 (Mon, 05 Mar 2012)
Changed paths:
M ckan/templates/layout_base.html
Log Message:
-----------
[xs][bugfix] no need to decode CKAN_CURRENT_URL
Commit: d723c4d929c6b10feb9c0b5ebb9e6fc5566a2da7
https://github.com/okfn/ckan/commit/d723c4d929c6b10feb9c0b5ebb9e6fc5566a2da7
Author: Toby <toby.junk at gmail.com>
Date: 2012-03-05 (Mon, 05 Mar 2012)
Changed paths:
M ckan/config/middleware.py
Log Message:
-----------
[xs][bugfix] url encodings now fixed in I18nMiddleware
Commit: 6a2577f88a93dd95499f60b770e2d1ae5926386b
https://github.com/okfn/ckan/commit/6a2577f88a93dd95499f60b770e2d1ae5926386b
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-06 (Tue, 06 Mar 2012)
Changed paths:
M ckan/templates/group/layout.html
Log Message:
-----------
[xs] Mislabelled link says Publisher instead of Group
Commit: 5bb1b181e553bfc96a064a8ecafd16cf71c839d1
https://github.com/okfn/ckan/commit/5bb1b181e553bfc96a064a8ecafd16cf71c839d1
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-06 (Tue, 06 Mar 2012)
Changed paths:
M ckan/config/middleware.py
M ckan/templates/layout_base.html
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 8c19d9588183d011910953b18c72e401c1e8e079
https://github.com/okfn/ckan/commit/8c19d9588183d011910953b18c72e401c1e8e079
Author: Toby <toby.junk at gmail.com>
Date: 2012-03-06 (Tue, 06 Mar 2012)
Changed paths:
M ckan/lib/i18n.py
Log Message:
-----------
[xs] make lang cookie a session one
Commit: 0db27b134823c495a92356857b8d2e48d32ce423
https://github.com/okfn/ckan/commit/0db27b134823c495a92356857b8d2e48d32ce423
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-06 (Tue, 06 Mar 2012)
Changed paths:
M ckan/logic/auth/publisher/create.py
M ckanext/publisher_form/forms.py
M ckanext/publisher_form/templates/publisher_form.html
Log Message:
-----------
Add proper support for chosing a parent group and also for adding users to publishers
Commit: 6ef3618e92452ea9c4946955a781280ff9ff8386
https://github.com/okfn/ckan/commit/6ef3618e92452ea9c4946955a781280ff9ff8386
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-06 (Tue, 06 Mar 2012)
Changed paths:
M ckanext/publisher_form/forms.py
M ckanext/publisher_form/templates/dataset_form.html
Log Message:
-----------
[2211] Fixing publisher_dataset_form to show viable groups on the edit form
Commit: 3c7c875e99f82bbb445453285b3a1975bd577c62
https://github.com/okfn/ckan/commit/3c7c875e99f82bbb445453285b3a1975bd577c62
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-03-06 (Tue, 06 Mar 2012)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[#1607][validators] Added a group validator that checks for existence of a group by id or name
Commit: 1627d6cd4650c19574dbf0bca1fbcb4c012284a6
https://github.com/okfn/ckan/commit/1627d6cd4650c19574dbf0bca1fbcb4c012284a6
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-06 (Tue, 06 Mar 2012)
Changed paths:
M ckanext/publisher_form/forms.py
M ckanext/publisher_form/templates/dataset_form.html
Log Message:
-----------
[2211] Added groups to schema so that it gets saved
Commit: d49d7bd03736cf4e9943bfd8733acf3780fdea22
https://github.com/okfn/ckan/commit/d49d7bd03736cf4e9943bfd8733acf3780fdea22
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-07 (Wed, 07 Mar 2012)
Changed paths:
M ckan/config/routing.py
M ckan/lib/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/logic/action/create.py
M ckan/logic/auth/create.py
M ckan/new_authz.py
M ckan/templates/_util.html
M ckan/templates/group/layout.html
M ckan/templates/layout_base.html
M ckanext/publisher_form/forms.py
Log Message:
-----------
[2211] Removed unnecessary (and non-working) auth reset which was intended to allow testing to switch auth funcs and..
- Implemented config option to allow for overriding of /group/* urls to use the named routes.
- Fixed some templates to use named group routes
- Added helper function to get the default group name.
Commit: a6aca286ce0e65b46a6beed19a7c4cc977c3c623
https://github.com/okfn/ckan/commit/a6aca286ce0e65b46a6beed19a7c4cc977c3c623
Author: John Glover <j at johnglover.net>
Date: 2012-03-07 (Wed, 07 Mar 2012)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[xs] tidy up: remove unnecessary code
Commit: d2cb952ef0e6954cdc8024c791d17963bf7edce3
https://github.com/okfn/ckan/commit/d2cb952ef0e6954cdc8024c791d17963bf7edce3
Author: David Read <david.read at okfn.org>
Date: 2012-03-07 (Wed, 07 Mar 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/logic/auth/publisher/get.py
M ckan/model/group.py
M ckan/public/scripts/application.js
Log Message:
-----------
Merge branch 'feature-1607-dgu-maintentance-refactor' of ssh://github.com/okfn/ckan into feature-1607-dgu-maintentance-refactor
Commit: e41ae7893653af888a1f2c8ca71bc8f14cde147b
https://github.com/okfn/ckan/commit/e41ae7893653af888a1f2c8ca71bc8f14cde147b
Author: David Read <david.read at okfn.org>
Date: 2012-03-07 (Wed, 07 Mar 2012)
Changed paths:
M ckan/logic/__init__.py
Log Message:
-----------
[logic]: Now when you print exceptions, the error message(s) show. This was hiding a problem with the DGU form api.
Commit: c28df8d694f78a512ec311e4884edb3c1047d359
https://github.com/okfn/ckan/commit/c28df8d694f78a512ec311e4884edb3c1047d359
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-03-07 (Wed, 07 Mar 2012)
Changed paths:
M ckan/lib/helpers.py
M ckan/tests/lib/test_helpers.py
Log Message:
-----------
[#1711][helpers] Added function to parse rfc 2822 date strings
Commit: 81e5fe717a070db41a2f3660e6ff499c053843e2
https://github.com/okfn/ckan/commit/81e5fe717a070db41a2f3660e6ff499c053843e2
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-03-07 (Wed, 07 Mar 2012)
Changed paths:
M ckan/public/css/forms.css
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
Log Message:
-----------
[#1711] Integrate resource validation into application.js
Commit: 234b746df285a474062d9d2453a6e2ff5499811b
https://github.com/okfn/ckan/commit/234b746df285a474062d9d2453a6e2ff5499811b
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-03-07 (Wed, 07 Mar 2012)
Changed paths:
M ckan/lib/helpers.py
M ckan/public/css/forms.css
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
M ckan/tests/lib/test_helpers.py
Log Message:
-----------
Merge branch 'feature-1711-resource-validation' into feature-1607-dgu-maintentance-refactor
Commit: d4f46a18e8239ae6da95044c590199e9ac48e4a4
https://github.com/okfn/ckan/commit/d4f46a18e8239ae6da95044c590199e9ac48e4a4
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-07 (Wed, 07 Mar 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/templates/_util.html
M ckan/tests/functional/test_group.py
Log Message:
-----------
[2211] First pass at logic functions for interacting with members
Commit: 26513fa097b06bd482038623e08f4b1472ad4496
https://github.com/okfn/ckan/commit/26513fa097b06bd482038623e08f4b1472ad4496
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-07 (Wed, 07 Mar 2012)
Changed paths:
M ckan/lib/helpers.py
M ckan/logic/__init__.py
M ckan/logic/auth/publisher/get.py
M ckan/model/group.py
M ckan/public/css/forms.css
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
M ckan/templates/user/edit_user_form.html
M ckan/tests/lib/test_helpers.py
M test-core.ini
Log Message:
-----------
Merge branch 'feature-1607-dgu-maintentance-refactor' of https://github.com/okfn/ckan into feature-1607-dgu-maintentance-refactor
Commit: eb173a33d364d00d2885f8d6cc5e3fec06581314
https://github.com/okfn/ckan/commit/eb173a33d364d00d2885f8d6cc5e3fec06581314
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-07 (Wed, 07 Mar 2012)
Changed paths:
M ckan/logic/schema.py
M ckan/tests/functional/api/model/test_group.py
M ckan/tests/functional/test_group.py
M ckan/tests/lib/test_dictization_schema.py
Log Message:
-----------
[1607] Fixing the schema so that tests work again
Commit: 0efe8a7a5a2d74e74ce19ca7c2f626d919485714
https://github.com/okfn/ckan/commit/0efe8a7a5a2d74e74ce19ca7c2f626d919485714
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-08 (Thu, 08 Mar 2012)
Changed paths:
M ckan/lib/create_test_data.py
M ckan/logic/schema.py
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_group.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M test-core.ini
Log Message:
-----------
[1607] Fixes to tests that were failing because of schema changes
Commit: 0632a8b0756890c91ab69838f98f5bbe7fd3604e
https://github.com/okfn/ckan/commit/0632a8b0756890c91ab69838f98f5bbe7fd3604e
Author: David Read <david.read at okfn.org>
Date: 2012-03-08 (Thu, 08 Mar 2012)
Changed paths:
M ckan/tests/__init__.py
M ckan/tests/functional/api/model/test_package.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
[tests]: Fix assert_in and assert_not_in imports - they needs Python 2.7, so have a fallback for Python 2.5 and 2.6.
Commit: d1ba07ffb1ed7d9d4e5f57a1f88e4298578ddb72
https://github.com/okfn/ckan/commit/d1ba07ffb1ed7d9d4e5f57a1f88e4298578ddb72
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-03-08 (Thu, 08 Mar 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/alphabet_paginate.py
M ckan/lib/authenticator.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/lib/plugins.py
M ckan/lib/search/index.py
M ckan/logic/__init__.py
M ckan/logic/action/get.py
M ckan/logic/auth/publisher/get.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/group.py
M ckan/model/user.py
M ckan/public/css/forms.css
M ckan/public/css/style.css
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
M ckan/templates/facets.html
M ckan/templates/package/edit.html
M ckan/tests/functional/api/model/test_group.py
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_group.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_helpers.py
M ckanext/publisher_form/forms.py
M setup.py
M test-core.ini
Log Message:
-----------
Merge branch 'feature-1607-dgu-maintentance-refactor'
Conflicts:
ckan/controllers/group.py
ckan/controllers/package.py
ckan/controllers/user.py
ckan/lib/alphabet_paginate.py
ckan/lib/create_test_data.py
ckan/lib/dictization/model_dictize.py
ckan/lib/dictization/model_save.py
ckan/templates/package/edit.html
ckan/tests/functional/test_group.py
ckan/tests/lib/test_dictization.py
The source of much conflict was the moving of much code from the
controllers/{package, group}.py modules into lib/plugins.py. It
turns out there wasn't too much to do there, but it required a
fair bit of checking.
Commit: c5514945495f366cfd1eca3618f25c4da74f07f4
https://github.com/okfn/ckan/commit/c5514945495f366cfd1eca3618f25c4da74f07f4
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-09 (Fri, 09 Mar 2012)
Changed paths:
M ckan/lib/i18n.py
M ckan/logic/validators.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 2f6ef03c5bc24d55aac0121b0babcf4aa51f674e
https://github.com/okfn/ckan/commit/2f6ef03c5bc24d55aac0121b0babcf4aa51f674e
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-09 (Fri, 09 Mar 2012)
Changed paths:
M doc/authorization.rst
M doc/configuration.rst
A doc/publisher_auth_profile.rst
Log Message:
-----------
Merge branch 'feature-1670-publisher-profile-docs'
Commit: c3f57681bf3c86c8f9a95afe8c6abd82827053e8
https://github.com/okfn/ckan/commit/c3f57681bf3c86c8f9a95afe8c6abd82827053e8
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-09 (Fri, 09 Mar 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
A ckan/tests/logic/test_member.py
Log Message:
-----------
[2211] Logic layer functions for member and associated tests
Commit: 62cb81c02caf0c6f411b3f9830857f1d9d303581
https://github.com/okfn/ckan/commit/62cb81c02caf0c6f411b3f9830857f1d9d303581
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-09 (Fri, 09 Mar 2012)
Changed paths:
M README.rst
Log Message:
-----------
[xs] Fixing minor flaw with RST that was affecting rendering on github
Commit: 8de3723539d4cd06c8782f03346dd1b16106075e
https://github.com/okfn/ckan/commit/8de3723539d4cd06c8782f03346dd1b16106075e
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-03-09 (Fri, 09 Mar 2012)
Changed paths:
M README.rst
M doc/authorization.rst
M doc/configuration.rst
A doc/publisher_auth_profile.rst
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: 25b90e6e52d2d84f4258ca111ff998271b757d8a
https://github.com/okfn/ckan/commit/25b90e6e52d2d84f4258ca111ff998271b757d8a
Author: Tom Rees <zephod at gmail.com>
Date: 2012-03-09 (Fri, 09 Mar 2012)
Changed paths:
M ckan/tests/functional/api/test_resource.py
M ckan/tests/functional/test_package.py
Log Message:
-----------
[tests]: Small test fixes to keep pace with WUI updates.
Commit: f28e054a43fb72454108547807ddfa5267e456bd
https://github.com/okfn/ckan/commit/f28e054a43fb72454108547807ddfa5267e456bd
Author: Tom Rees <zephod at gmail.com>
Date: 2012-03-09 (Fri, 09 Mar 2012)
Changed paths:
M ckanext/test_tag_vocab_plugin.py
Log Message:
-----------
[nosetests]: Another fix.
Commit: cd373300cc31a451b25f4b6c651c350c71431ff1
https://github.com/okfn/ckan/commit/cd373300cc31a451b25f4b6c651c350c71431ff1
Author: David Read <david.read at okfn.org>
Date: 2012-03-09 (Fri, 09 Mar 2012)
Changed paths:
M ckan/tests/functional/api/model/test_package.py
Log Message:
-----------
[test]: I did not mean to commit this new test in the last commit.
Commit: 6ebb538d9e69e8f330ba67fdb00fd84c5bc723b6
https://github.com/okfn/ckan/commit/6ebb538d9e69e8f330ba67fdb00fd84c5bc723b6
Author: Tom Rees <zephod at gmail.com>
Date: 2012-03-09 (Fri, 09 Mar 2012)
Changed paths:
M README.rst
M ckan/config/deployment.ini_tmpl
M ckan/config/middleware.py
M ckan/config/routing.py
A ckan/controllers/datastore.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/user.py
R ckan/controllers/webstore.py
M ckan/lib/alphabet_paginate.py
M ckan/lib/authenticator.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/lib/i18n.py
M ckan/lib/plugins.py
M ckan/lib/search/index.py
M ckan/logic/__init__.py
M ckan/logic/action/get.py
M ckan/logic/auth/publisher/get.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/group.py
M ckan/model/user.py
M ckan/public/css/forms.css
M ckan/public/css/style.css
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
M ckan/templates/facets.html
M ckan/templates/group/layout.html
M ckan/templates/layout_base.html
M ckan/templates/package/edit.html
M ckan/tests/functional/api/model/test_group.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_authz.py
A ckan/tests/functional/test_datastore.py
M ckan/tests/functional/test_group.py
R ckan/tests/functional/test_webstore.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_helpers.py
M ckanext/publisher_form/forms.py
M doc/authorization.rst
M doc/conf.py
M doc/configuration.rst
A doc/datastore.rst
M doc/index.rst
A doc/publisher_auth_profile.rst
R doc/webstore.rst
M setup.py
M test-core.ini
Log Message:
-----------
[merge conflicts]: DGU refactor touched a lot of frontend code. Hopefully this preserved it.
Commit: c34d095d9f3ebba156684260ce12288d44269d74
https://github.com/okfn/ckan/commit/c34d095d9f3ebba156684260ce12288d44269d74
Author: Tom Rees <zephod at gmail.com>
Date: 2012-03-09 (Fri, 09 Mar 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/api.py
M ckan/controllers/package.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/public/css/style.css
A ckan/public/images/chevron-down.png
A ckan/public/images/chevron-up.png
A ckan/public/images/icons/package_add.png
A ckan/public/images/icons/page_white.png
A ckan/public/images/icons/page_white_add.png
A ckan/public/images/icons/page_white_code.png
A ckan/public/images/icons/page_white_compressed.png
A ckan/public/images/icons/page_white_cup.png
A ckan/public/images/icons/page_white_database.png
A ckan/public/images/icons/page_white_error.png
A ckan/public/images/icons/page_white_excel.png
A ckan/public/images/icons/page_white_gear.png
A ckan/public/images/icons/page_white_link.png
A ckan/public/images/icons/page_white_text.png
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
M ckan/templates/_util.html
M ckan/templates/facets.html
M ckan/templates/group/new_group_form.html
M ckan/templates/group/read.html
M ckan/templates/js_strings.html
M ckan/templates/layout_base.html
M ckan/templates/package/edit.html
A ckan/templates/package/editresources.html
M ckan/templates/package/layout.html
M ckan/templates/package/new.html
M ckan/templates/package/new_package_form.html
M ckan/templates/package/read_core.html
M ckan/templates/package/resource_read.html
M ckan/tests/functional/api/test_resource.py
M ckan/tests/functional/test_package.py
M ckanext/test_tag_vocab_plugin.py
Log Message:
-----------
Merge branch 'feature-1506-ux-superticket'
Commit: 2d469c8be720f955c2f569a4eaa464792a5fa7da
https://github.com/okfn/ckan/commit/2d469c8be720f955c2f569a4eaa464792a5fa7da
Author: David Read <david.read at okfn.org>
Date: 2012-03-09 (Fri, 09 Mar 2012)
Changed paths:
M ckan/tests/__init__.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
Merge branch 'feature-1607-dgu-maintentance-refactor'
Commit: a38b0f352d7071b39211ba3790a23641099e3fc6
https://github.com/okfn/ckan/commit/a38b0f352d7071b39211ba3790a23641099e3fc6
Author: Tom Rees <zephod at gmail.com>
Date: 2012-03-09 (Fri, 09 Mar 2012)
Changed paths:
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
M ckan/templates/package/edit.html
Log Message:
-----------
[1506/merging][s]: Merge tidied & tested. Looks good to me.
Commit: 45fdc9db7d54b9bb99208082e3107e0134deed03
https://github.com/okfn/ckan/commit/45fdc9db7d54b9bb99208082e3107e0134deed03
Author: Tom Rees <zephod at gmail.com>
Date: 2012-03-09 (Fri, 09 Mar 2012)
Changed paths:
M ckan/tests/__init__.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: f8cf90c10e54e7bddce5098d29548d6fb5d740ec
https://github.com/okfn/ckan/commit/f8cf90c10e54e7bddce5098d29548d6fb5d740ec
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-03-10 (Sat, 10 Mar 2012)
Changed paths:
M ckan/public/scripts/application.js
Log Message:
-----------
[#1506,js,bugfix][xs]: remove minor piece of JS that is no longer needed due to @zephod's changes and is causing JS exception.
* @zephod accidentally merged this back in while doing his merge -- see 6ebb538d9e69e8f330ba67fdb00fd84c5bc723b6. In fact, this code was obsolete as form_errors got removed from resource edit page as part of zephod's refactor.
Commit: c3014224a69a6b3f76befb4558d84bd6acf3d6fb
https://github.com/okfn/ckan/commit/c3014224a69a6b3f76befb4558d84bd6acf3d6fb
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-03-10 (Sat, 10 Mar 2012)
Changed paths:
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#1797,resource][s]: minor tweaks to layout of resource read (not related to #1797 really).
Commit: 96d978d8556aa4c8469e2cc5a991fd2a029899c4
https://github.com/okfn/ckan/commit/96d978d8556aa4c8469e2cc5a991fd2a029899c4
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-03-10 (Sat, 10 Mar 2012)
Changed paths:
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#1797,resource/view][s]: small tweaks to existing download button and new Data API button.
Commit: 0d1f8a68d7a040e9363c37b4fc16f13db8fe8787
https://github.com/okfn/ckan/commit/0d1f8a68d7a040e9363c37b4fc16f13db8fe8787
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-03-10 (Sat, 10 Mar 2012)
Changed paths:
R ckan/public/scripts/vendor/jquery/1.6.2/jquery.js
A ckan/public/scripts/vendor/jquery/1.7.1/jquery.js
M ckan/templates/layout_base.html
Log Message:
-----------
[vendor/jquery][xs]: upgrade to v1.7.1 of jquery in preparation for using bootstrap.
Commit: ff7e102eb823981c4ac720486419a3cc69264916
https://github.com/okfn/ckan/commit/ff7e102eb823981c4ac720486419a3cc69264916
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-03-10 (Sat, 10 Mar 2012)
Changed paths:
M ckan/public/css/bootstrap.css
M ckan/public/css/style.css
M ckan/templates/layout_base.html
Log Message:
-----------
[#1797,#2223,css][m]: introduce full bootstrap v2.0.
* As far as I can tell most stuff still just works with some very minor tweaking (though I have put boostrap before blueprint)
* This is needed for use of bootstrap js for modals etc
* TODO: remove blueprint
Commit: 0dc337098a3a07cb40a0613bf57a9bb061a0f80d
https://github.com/okfn/ckan/commit/0dc337098a3a07cb40a0613bf57a9bb061a0f80d
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-03-10 (Sat, 10 Mar 2012)
Changed paths:
A ckan/public/scripts/vendor/bootstrap/2.0.0/bootstrap.js
M ckan/templates/layout_base.html
Log Message:
-----------
[vendor/bootstrap][s]: add bootstrap.js.
Commit: 1d8e464f8542d4c33286bb93f4de50060665799f
https://github.com/okfn/ckan/commit/1d8e464f8542d4c33286bb93f4de50060665799f
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-03-10 (Sat, 10 Mar 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/public/scripts/application.js
A ckan/templates/_snippet/data-api-help.html
M ckan/templates/package/resource_read.html
Log Message:
-----------
[#1797,resource/view][m]: data API help in modal dialog on resource view page.
Commit: 77eeee7f018d8d497fc3222d7e74a321af8b944a
https://github.com/okfn/ckan/commit/77eeee7f018d8d497fc3222d7e74a321af8b944a
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-03-10 (Sat, 10 Mar 2012)
Changed paths:
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
Log Message:
-----------
[#1797,js][xs]: add visualization to resource type list and add placeholder to format field (not really part of #1797).
Commit: 3f1320cd92ae0e775fde1b5eada156260c55e0a6
https://github.com/okfn/ckan/commit/3f1320cd92ae0e775fde1b5eada156260c55e0a6
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-03-10 (Sat, 10 Mar 2012)
Changed paths:
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
M ckan/templates/js_strings.html
Log Message:
-----------
[#1797,resource/edit][s]: checkbox for datastore enabled in resource form (uses webstore_url field).
Commit: a8129fe570dba88df0a00a9aaf8cb95ccf1eb910
https://github.com/okfn/ckan/commit/a8129fe570dba88df0a00a9aaf8cb95ccf1eb910
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-03-10 (Sat, 10 Mar 2012)
Changed paths:
M ckan/controllers/datastore.py
M ckan/tests/functional/test_datastore.py
Log Message:
-----------
[#1797,datastore/api][s]: check whether datastore is enabled for a given resource (whether webstore_url is set) and if not return error json.
Commit: d533064faabdac9c39247752960ea933de9c4a84
https://github.com/okfn/ckan/commit/d533064faabdac9c39247752960ea933de9c4a84
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-03-10 (Sat, 10 Mar 2012)
Changed paths:
M doc/datastore.rst
Log Message:
-----------
[#1797,doc/datastore][xs]: correct link for ckanext-datastorer.
Commit: 476a5bd32a3fac5d2dd85614f5d86c79f4ff6547
https://github.com/okfn/ckan/commit/476a5bd32a3fac5d2dd85614f5d86c79f4ff6547
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-03-10 (Sat, 10 Mar 2012)
Changed paths:
M ckan/controllers/datastore.py
M ckan/controllers/package.py
M ckan/public/css/bootstrap.css
M ckan/public/css/style.css
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
A ckan/public/scripts/vendor/bootstrap/2.0.0/bootstrap.js
R ckan/public/scripts/vendor/jquery/1.6.2/jquery.js
A ckan/public/scripts/vendor/jquery/1.7.1/jquery.js
A ckan/templates/_snippet/data-api-help.html
M ckan/templates/js_strings.html
M ckan/templates/layout_base.html
M ckan/templates/package/resource_read.html
M ckan/tests/functional/test_datastore.py
M doc/datastore.rst
Log Message:
-----------
[#1797,merge][m]: Merge branch 'feature-1797-webstore-v2' thereby fixes #1797.
Commit: 227326b063d221b54e137c1b9666c43dcd3d73e1
https://github.com/okfn/ckan/commit/227326b063d221b54e137c1b9666c43dcd3d73e1
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M ckan/controllers/storage.py
M ckan/tests/functional/test_storage.py
Log Message:
-----------
[2211] Added a check to test_storage to create pairtree marker if necessary until we can replace it in ofs
Commit: 4ff47f98bd0e6686da506e15ed6622ae5b0428d7
https://github.com/okfn/ckan/commit/4ff47f98bd0e6686da506e15ed6622ae5b0428d7
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M README.rst
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
M ckan/controllers/api.py
M ckan/controllers/datastore.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/alphabet_paginate.py
M ckan/lib/authenticator.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/lib/plugins.py
M ckan/lib/search/index.py
M ckan/logic/__init__.py
M ckan/logic/action/get.py
M ckan/logic/auth/publisher/get.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/group.py
M ckan/model/user.py
M ckan/public/css/bootstrap.css
M ckan/public/css/forms.css
M ckan/public/css/style.css
A ckan/public/images/chevron-down.png
A ckan/public/images/chevron-up.png
A ckan/public/images/icons/package_add.png
A ckan/public/images/icons/page_white.png
A ckan/public/images/icons/page_white_add.png
A ckan/public/images/icons/page_white_code.png
A ckan/public/images/icons/page_white_compressed.png
A ckan/public/images/icons/page_white_cup.png
A ckan/public/images/icons/page_white_database.png
A ckan/public/images/icons/page_white_error.png
A ckan/public/images/icons/page_white_excel.png
A ckan/public/images/icons/page_white_gear.png
A ckan/public/images/icons/page_white_link.png
A ckan/public/images/icons/page_white_text.png
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
A ckan/public/scripts/vendor/bootstrap/2.0.0/bootstrap.js
R ckan/public/scripts/vendor/jquery/1.6.2/jquery.js
A ckan/public/scripts/vendor/jquery/1.7.1/jquery.js
A ckan/templates/_snippet/data-api-help.html
M ckan/templates/_util.html
M ckan/templates/facets.html
M ckan/templates/group/new_group_form.html
M ckan/templates/group/read.html
M ckan/templates/js_strings.html
M ckan/templates/layout_base.html
M ckan/templates/package/edit.html
A ckan/templates/package/editresources.html
M ckan/templates/package/layout.html
M ckan/templates/package/new.html
M ckan/templates/package/new_package_form.html
M ckan/templates/package/read_core.html
M ckan/templates/package/resource_read.html
M ckan/tests/__init__.py
M ckan/tests/functional/api/model/test_group.py
M ckan/tests/functional/api/test_resource.py
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_datastore.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_helpers.py
M ckanext/publisher_form/forms.py
M ckanext/test_tag_vocab_plugin.py
M doc/datastore.rst
M setup.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 83e0eddca6cdd8f84e0adb87335a9c18df93229b
https://github.com/okfn/ckan/commit/83e0eddca6cdd8f84e0adb87335a9c18df93229b
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/storage.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/auth/create.py
M ckan/logic/auth/publisher/create.py
M ckan/new_authz.py
M ckan/templates/_util.html
M ckan/templates/group/layout.html
M ckan/templates/layout_base.html
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_storage.py
A ckan/tests/logic/test_member.py
M ckanext/publisher_form/forms.py
M ckanext/publisher_form/templates/dataset_form.html
M ckanext/publisher_form/templates/publisher_form.html
Log Message:
-----------
[2211] Merge of feature-2211-publisher includes publisher form and dataset form for publisher
Commit: 1ea3b59e4d2d1369547ad7b99066c7de081f86e7
https://github.com/okfn/ckan/commit/1ea3b59e4d2d1369547ad7b99066c7de081f86e7
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M ckan/controllers/api.py
M ckan/logic/validators.py
Log Message:
-----------
[1742] fix route clashes by disallowing some names
Commit: 9489df1b5d681b19c3f2c0d8e692b97b70c739c6
https://github.com/okfn/ckan/commit/9489df1b5d681b19c3f2c0d8e692b97b70c739c6
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M ckan/tests/functional/api/test_util.py
Log Message:
-----------
[1742] Tests to check that the response returned is correct for clashing routes
Commit: 257bb13c4ee47088e6561ace3b540c82fde228a1
https://github.com/okfn/ckan/commit/257bb13c4ee47088e6561ace3b540c82fde228a1
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M ckan/controllers/api.py
M ckan/logic/validators.py
M ckan/tests/functional/api/test_util.py
Log Message:
-----------
Merge branch 'feature-1742-route-clashes'
Commit: 1eeda1199ddc3f5d234e1c8d9625cf058ac92913
https://github.com/okfn/ckan/commit/1eeda1199ddc3f5d234e1c8d9625cf058ac92913
Author: Toby <toby.junk at gmail.com>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M ckan/i18n/bg/LC_MESSAGES/ckan.po
Log Message:
-----------
fix bulgarian translation
Commit: bff6c3e5f7dde9925ab5e7c58bfff8105bc418bc
https://github.com/okfn/ckan/commit/bff6c3e5f7dde9925ab5e7c58bfff8105bc418bc
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M ckan/controllers/storage.py
M ckan/tests/functional/test_storage.py
Log Message:
-----------
[2221] Fix where the pairtree marker is missing for some users
Commit: 96cf32284d933353ba3f0b0c255f80efb527b607
https://github.com/okfn/ckan/commit/96cf32284d933353ba3f0b0c255f80efb527b607
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M ckan/i18n/bg/LC_MESSAGES/ckan.po
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: ad2358acf5735d165619cf4d58ab0cfbe67e148c
https://github.com/okfn/ckan/commit/ad2358acf5735d165619cf4d58ab0cfbe67e148c
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M ckan/controllers/storage.py
M ckan/tests/functional/test_storage.py
Log Message:
-----------
Merge branch 'defect-2221-pairtree'
Commit: beb53af60d8d70408343d318b9e5a9b6c963ada4
https://github.com/okfn/ckan/commit/beb53af60d8d70408343d318b9e5a9b6c963ada4
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
[master][model_dictize] Fixed small bug in the case where resource['format'] is None
Commit: 0f8ddee9a955e8bd198f52bd3aa71efa22e04f6d
https://github.com/okfn/ckan/commit/0f8ddee9a955e8bd198f52bd3aa71efa22e04f6d
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/api.py
M ckan/controllers/storage.py
M ckan/i18n/bg/LC_MESSAGES/ckan.po
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/auth/create.py
M ckan/logic/auth/publisher/create.py
M ckan/logic/validators.py
M ckan/new_authz.py
M ckan/templates/_util.html
M ckan/templates/group/layout.html
M ckan/templates/layout_base.html
M ckan/tests/functional/api/test_util.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_storage.py
A ckan/tests/logic/test_member.py
M ckanext/publisher_form/forms.py
M ckanext/publisher_form/templates/dataset_form.html
M ckanext/publisher_form/templates/publisher_form.html
Log Message:
-----------
Merge remote-tracking branch 'origin/master'
Commit: f2cd0511f3b47fc77abf7267c129baaea934c977
https://github.com/okfn/ckan/commit/f2cd0511f3b47fc77abf7267c129baaea934c977
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M ckan/plugins/interfaces.py
Log Message:
-----------
[master][interfaces] Docstring correction
Commit: 1f6c72d706d261578cd5c37a50e72c19bf3dae34
https://github.com/okfn/ckan/commit/1f6c72d706d261578cd5c37a50e72c19bf3dae34
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-03-12 (Mon, 12 Mar 2012)
Changed paths:
M ckan/public/scripts/application.js
Log Message:
-----------
[master][js] Re-instated the client-side resource-validation integration.
- Lost in the large merge of UX changes.
- Original integration: 81e5fe717a070db41a2f3660e6ff499c053843e2
- Haven't re-integrated the highlighting of url errors though; just the auto-population of some resource fields.
Commit: 0be6d0d6e06c21db0543dd9b0157ffed741090bd
https://github.com/okfn/ckan/commit/0be6d0d6e06c21db0543dd9b0157ffed741090bd
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-13 (Tue, 13 Mar 2012)
Changed paths:
M ckanext/publisher_form/forms.py
Log Message:
-----------
[xs] Removed missed merge markers
Commit: 80d576ec22e3dd24dffd4b99445972ba11dee9d2
https://github.com/okfn/ckan/commit/80d576ec22e3dd24dffd4b99445972ba11dee9d2
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-13 (Tue, 13 Mar 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/plugins/interfaces.py
M ckan/public/scripts/application.js
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 7ac2b6759b3b417e0a173d17de8923ba576e5c19
https://github.com/okfn/ckan/commit/7ac2b6759b3b417e0a173d17de8923ba576e5c19
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-13 (Tue, 13 Mar 2012)
Changed paths:
M ckan/lib/plugins.py
M ckanext/publisher_form/forms.py
M setup.py
Log Message:
-----------
[2211] Merge changes from publisher_dataset_form into main dataset form
Commit: b3a500ad1d80350a54311f5fbea6d7fc331e6da7
https://github.com/okfn/ckan/commit/b3a500ad1d80350a54311f5fbea6d7fc331e6da7
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-13 (Tue, 13 Mar 2012)
Changed paths:
M ckan/lib/plugins.py
M ckanext/publisher_form/forms.py
M setup.py
Log Message:
-----------
Merge branch 'defect-2211-publisher-changes'
Commit: e0b4b1676cce51ec3451aeaa5e47e61652b42984
https://github.com/okfn/ckan/commit/e0b4b1676cce51ec3451aeaa5e47e61652b42984
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-13 (Tue, 13 Mar 2012)
Changed paths:
M ckan/tests/functional/test_group.py
Log Message:
-----------
[xs] Test fix for main menu tests
Commit: 8ced6f6c1348e3d7dffd70bd258021a0e10f8ee1
https://github.com/okfn/ckan/commit/8ced6f6c1348e3d7dffd70bd258021a0e10f8ee1
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-03-13 (Tue, 13 Mar 2012)
Changed paths:
M ckan/templates/group/layout.html
Log Message:
-----------
[xs] Minor change to naming on group index page until we have a cleaner approach to naming
Commit: 897f01282f92e05f0a03a33f716e41928096a91f
https://github.com/okfn/ckan/commit/897f01282f92e05f0a03a33f716e41928096a91f
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-03-13 (Tue, 13 Mar 2012)
Changed paths:
M ckan/templates/package/resource_read.html
Log Message:
-----------
[master,resource/read][xs]: put open data button after license again as o/w css is wrong.
Commit: caf8a5d2d4793b72e0d33e7c3effe778e6b5d9a4
https://github.com/okfn/ckan/commit/caf8a5d2d4793b72e0d33e7c3effe778e6b5d9a4
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-03-13 (Tue, 13 Mar 2012)
Changed paths:
A .gitmodules
M README.rst
M ckan/config/deployment.ini_tmpl
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/controllers/api.py
A ckan/controllers/datastore.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/storage.py
M ckan/controllers/user.py
R ckan/controllers/webstore.py
M ckan/i18n/bg/LC_MESSAGES/ckan.po
M ckan/lib/alphabet_paginate.py
M ckan/lib/authenticator.py
M ckan/lib/create_test_data.py
M ckan/lib/dictization/__init__.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/lib/i18n.py
M ckan/lib/plugins.py
M ckan/lib/search/index.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/publisher/create.py
M ckan/logic/auth/publisher/get.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/group.py
M ckan/model/user.py
M ckan/new_authz.py
M ckan/plugins/interfaces.py
A ckan/public/css/bootstrap.css
M ckan/public/css/forms.css
R ckan/public/css/pretty_buttons.css
M ckan/public/css/style.css
A ckan/public/images/chevron-down.png
A ckan/public/images/chevron-up.png
A ckan/public/images/icons/package_add.png
A ckan/public/images/icons/page_white.png
A ckan/public/images/icons/page_white_add.png
A ckan/public/images/icons/page_white_code.png
A ckan/public/images/icons/page_white_compressed.png
A ckan/public/images/icons/page_white_cup.png
A ckan/public/images/icons/page_white_database.png
A ckan/public/images/icons/page_white_error.png
A ckan/public/images/icons/page_white_excel.png
A ckan/public/images/icons/page_white_gear.png
A ckan/public/images/icons/page_white_link.png
A ckan/public/images/icons/page_white_text.png
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
A ckan/public/scripts/vendor/bootstrap/2.0.0/bootstrap.js
M ckan/public/scripts/vendor/ckanjs/1.0.0/ckanjs.js
R ckan/public/scripts/vendor/jquery/1.6.2/jquery.js
A ckan/public/scripts/vendor/jquery/1.7.1/jquery.js
M ckan/public/scripts/vendor/recline/css/data-explorer.css
A ckan/public/scripts/vendor/recline/css/images/small-spinner.gif
M ckan/public/scripts/vendor/recline/recline.js
A ckan/templates/_snippet/data-api-help.html
M ckan/templates/_util.html
M ckan/templates/facets.html
M ckan/templates/group/layout.html
M ckan/templates/group/new_group_form.html
M ckan/templates/group/read.html
M ckan/templates/js_strings.html
M ckan/templates/layout_base.html
M ckan/templates/package/edit.html
A ckan/templates/package/editresources.html
M ckan/templates/package/layout.html
M ckan/templates/package/new.html
M ckan/templates/package/new_package_form.html
M ckan/templates/package/read_core.html
M ckan/templates/package/resource_read.html
M ckan/templates/user/layout.html
M ckan/templates/user/login.html
M ckan/tests/__init__.py
M ckan/tests/functional/api/model/test_group.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_resource.py
M ckan/tests/functional/api/test_util.py
M ckan/tests/functional/test_authz.py
A ckan/tests/functional/test_datastore.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_storage.py
M ckan/tests/functional/test_user.py
R ckan/tests/functional/test_webstore.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_helpers.py
A ckan/tests/logic/test_member.py
M ckanext/publisher_form/forms.py
M ckanext/publisher_form/templates/dataset_form.html
M ckanext/publisher_form/templates/publisher_form.html
M ckanext/test_tag_vocab_plugin.py
A doc/_templates/footer.html
R doc/_templates/layout.html
A doc/_themes/sphinx-theme-okfn
M doc/about.rst
M doc/api.rst
M doc/authorization.rst
M doc/conf.py
M doc/configuration.rst
A doc/datastore.rst
M doc/index.rst
A doc/publisher_auth_profile.rst
M doc/theming.rst
R doc/webstore.rst
M setup.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into feature-1698-tag-taxonomies
Commit: d56b76a7f22f98363ba8489908bf693668bd2e34
https://github.com/okfn/ckan/commit/d56b76a7f22f98363ba8489908bf693668bd2e34
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-03-14 (Wed, 14 Mar 2012)
Changed paths:
M README.rst
Log Message:
-----------
[master,README][xs]: tiny tweak to rst formatting.
Commit: b9755e98187c537e829746de1f125fbb66ee31cd
https://github.com/okfn/ckan/commit/b9755e98187c537e829746de1f125fbb66ee31cd
Author: Rufus Pollock <rufus.pollock at okfn.org>
Date: 2012-03-14 (Wed, 14 Mar 2012)
Changed paths:
M README.rst
M doc/install-from-source.rst
R pip-requirements-prerelease.txt
M requires/lucid_present.txt
Log Message:
-----------
[master,doc][s]: remove dependency on python-sphinx in core requirements as only needed for docs and updated README with correct sphinx version (>= 1.1).
Commit: 76f5530858f30761df1cbcf9bb320c5ee45770dc
https://github.com/okfn/ckan/commit/76f5530858f30761df1cbcf9bb320c5ee45770dc
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-03-14 (Wed, 14 Mar 2012)
Changed paths:
M README.rst
M doc/install-from-source.rst
R pip-requirements-prerelease.txt
M requires/lucid_present.txt
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into feature-1698-tag-taxonomies
Compare: https://github.com/okfn/ckan/compare/a75a230...76f5530
More information about the ckan-changes
mailing list