[ckan-changes] [ckan/ckan] 2b7545: [#3414] package_search: return field info
GitHub
noreply at github.com
Tue Mar 28 11:50:35 UTC 2017
Branch: refs/heads/3196-i18n
Home: https://github.com/ckan/ckan
Commit: 2b75455ab392ff4f6dee649f52e3af51db81f3f1
https://github.com/ckan/ckan/commit/2b75455ab392ff4f6dee649f52e3af51db81f3f1
Author: Ian Ward <ian at excess.org>
Date: 2017-01-24 (Tue, 24 Jan 2017)
Changed paths:
M ckanext/datastore/db.py
Log Message:
-----------
[#3414] package_search: return field info
Commit: 685842ea036fa8b4510d304406db6f964ebf2d81
https://github.com/ckan/ckan/commit/685842ea036fa8b4510d304406db6f964ebf2d81
Author: Ian Ward <ian at excess.org>
Date: 2017-01-24 (Tue, 24 Jan 2017)
Changed paths:
M ckanext/datastore/db.py
M ckanext/datastore/logic/schema.py
Log Message:
-----------
[#3414] datastore_create: set/update field info
Commit: 10b60d555df30a4be8240450d031fbc6079084ca
https://github.com/ckan/ckan/commit/10b60d555df30a4be8240450d031fbc6079084ca
Author: Ian Ward <ian at excess.org>
Date: 2017-01-27 (Fri, 27 Jan 2017)
Changed paths:
M ckan/templates/package/resource_edit_base.html
M ckanext/datapusher/plugin.py
A ckanext/datapusher/templates/package/resource_edit_base.html
Log Message:
-----------
[#3414] remove if datapusher in g.plugins from core templates
Commit: 7ebfe61423e0d42477297c71184606bc4f13642d
https://github.com/ckan/ckan/commit/7ebfe61423e0d42477297c71184606bc4f13642d
Author: Ian Ward <ian at excess.org>
Date: 2017-01-27 (Fri, 27 Jan 2017)
Changed paths:
M CHANGELOG.rst
M ckan/config/routing.py
M ckan/controllers/admin.py
M ckan/lib/activity_streams.py
M ckan/lib/helpers.py
M ckan/lib/plugins.py
M ckan/logic/action/update.py
M ckan/logic/schema.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/javascript/client.js
M ckan/public/base/javascript/main.js
M ckan/public/base/javascript/modules/basic-form.js
M ckan/public/base/javascript/modules/custom-fields.js
M ckan/public/base/javascript/modules/follow.js
M ckan/public/base/javascript/modules/image-upload.js
M ckan/public/base/javascript/modules/resource-reorder.js
M ckan/public/base/javascript/modules/resource-view-reorder.js
M ckan/public/base/javascript/modules/slug-preview.js
M ckan/public/base/test/spec/modules/custom-fields.spec.js
M ckan/public/base/vendor/bootstrap/less/tests/css-tests.html
M ckan/public/base/vendor/bootstrap/less/tests/navbar-fixed-top.html
M ckan/public/base/vendor/bootstrap/less/tests/navbar-static-top.html
M ckan/public/base/vendor/bootstrap/less/tests/navbar.html
R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
R ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
M ckan/public/base/vendor/font-awesome/css/font-awesome.css
M ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
R ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
R ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
A ckan/public/base/vendor/font-awesome/fonts/FontAwesome.otf
A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.eot
A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.svg
A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.ttf
A ckan/public/base/vendor/font-awesome/fonts/fontawesome-webfont.woff
R ckan/public/base/vendor/font-awesome/less/bootstrap.less
A ckan/public/base/vendor/font-awesome/less/bordered-pulled.less
M ckan/public/base/vendor/font-awesome/less/core.less
M ckan/public/base/vendor/font-awesome/less/extras.less
A ckan/public/base/vendor/font-awesome/less/fixed-width.less
R ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
M ckan/public/base/vendor/font-awesome/less/font-awesome.less
M ckan/public/base/vendor/font-awesome/less/icons.less
A ckan/public/base/vendor/font-awesome/less/larger.less
A ckan/public/base/vendor/font-awesome/less/list.less
M ckan/public/base/vendor/font-awesome/less/mixins.less
M ckan/public/base/vendor/font-awesome/less/path.less
A ckan/public/base/vendor/font-awesome/less/rotated-flipped.less
A ckan/public/base/vendor/font-awesome/less/spinning.less
A ckan/public/base/vendor/font-awesome/less/stacked.less
M ckan/public/base/vendor/font-awesome/less/variables.less
M ckan/public/base/vendor/resource.config
M ckan/templates/admin/config.html
M ckan/templates/admin/index.html
M ckan/templates/admin/trash.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/dataviewer/snippets/no_preview.html
M ckan/templates/development/primer.html
M ckan/templates/development/snippets/actions.html
M ckan/templates/development/snippets/facet.html
M ckan/templates/development/snippets/list.html
M ckan/templates/development/snippets/module.html
M ckan/templates/development/snippets/nav.html
M ckan/templates/development/snippets/page_header.html
M ckan/templates/development/snippets/simple-input.html
M ckan/templates/group/edit_base.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/members.html
M ckan/templates/group/snippets/helper.html
M ckan/templates/header.html
M ckan/templates/home/snippets/search.html
M ckan/templates/macros/autoform.html
M ckan/templates/macros/form.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/edit_base.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/snippets/help.html
M ckan/templates/organization/snippets/helper.html
M ckan/templates/organization/snippets/info.html
M ckan/templates/package/base_form_page.html
M ckan/templates/package/edit_base.html
M ckan/templates/package/edit_view.html
M ckan/templates/package/new_resource_not_draft.html
M ckan/templates/package/new_view.html
M ckan/templates/package/read.html
M ckan/templates/package/resource_data.html
M ckan/templates/package/resource_edit_base.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/resource_views.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resource_help.html
M ckan/templates/package/snippets/resource_item.html
M ckan/templates/package/snippets/resource_view.html
M ckan/templates/package/snippets/resource_views_list.html
M ckan/templates/package/snippets/resource_views_list_item.html
M ckan/templates/package/snippets/resources.html
M ckan/templates/package/snippets/view_form_filters.html
M ckan/templates/package/snippets/view_help.html
M ckan/templates/package/view_edit_base.html
M ckan/templates/revision/read.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/datapusher_status.html
M ckan/templates/snippets/disqus_trackback.html
M ckan/templates/snippets/facet_list.html
M ckan/templates/snippets/follow_button.html
M ckan/templates/snippets/home_breadcrumb_item.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/package_item.html
M ckan/templates/snippets/search_form.html
M ckan/templates/snippets/simple_search.html
M ckan/templates/snippets/social.html
M ckan/templates/snippets/subscribe.html
M ckan/templates/tag/index.html
M ckan/templates/user/dashboard_datasets.html
M ckan/templates/user/dashboard_groups.html
M ckan/templates/user/dashboard_organizations.html
M ckan/templates/user/edit.html
M ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/user_search.html
M ckanext/datastore/templates/package/snippets/data_api_button.html
M ckanext/example_iconfigurer/plugin.py
M ckanext/example_iconfigurer/tests/test_example_iconfigurer.py
M ckanext/example_theme/v16_initialize_a_javascript_module/templates/snippets/package_item.html
M ckanext/example_theme/v17_popover/templates/snippets/package_item.html
M ckanext/example_theme/v18_snippet_api/templates/ajax_snippets/example_theme_popover.html
M ckanext/example_theme/v18_snippet_api/templates/snippets/package_item.html
M ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
M ckanext/imageview/plugin.py
M ckanext/reclineview/plugin.py
M ckanext/stats/templates/ckanext/stats/index.html
M ckanext/textview/plugin.py
M doc/_templates/footer.html
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into 3414-datastore-info
Commit: f6d0669b3cd19e3d090c255a71a22ee7874d27d1
https://github.com/ckan/ckan/commit/f6d0669b3cd19e3d090c255a71a22ee7874d27d1
Author: Ian Ward <ian at excess.org>
Date: 2017-01-27 (Fri, 27 Jan 2017)
Changed paths:
R ckan/templates/package/resource_data.html
A ckanext/datapusher/templates/package/resource_data.html
Log Message:
-----------
[#3414] resource_data is a datapusher template
Commit: b352b74a1902c16c93755a1765ca765294f012ff
https://github.com/ckan/ckan/commit/b352b74a1902c16c93755a1765ca765294f012ff
Author: Ian Ward <ian at excess.org>
Date: 2017-01-29 (Sun, 29 Jan 2017)
Changed paths:
M ckanext/datapusher/plugin.py
A ckanext/datapusher/templates/datapusher/resource_data.html
R ckanext/datapusher/templates/package/resource_data.html
Log Message:
-----------
[#3414] resource_data is a datapusher template
Commit: c728ea428883390451be346715f611015cda1c7e
https://github.com/ckan/ckan/commit/c728ea428883390451be346715f611015cda1c7e
Author: Ian Ward <ian at excess.org>
Date: 2017-01-29 (Sun, 29 Jan 2017)
Changed paths:
M ckanext/datapusher/templates/package/resource_edit_base.html
M ckanext/datastore/controller.py
M ckanext/datastore/plugin.py
A ckanext/datastore/templates/datastore/dictionary.html
A ckanext/datastore/templates/package/resource_edit_base.html
Log Message:
-----------
[#3414] display Data Dictionary form
Commit: 209204257f4b3c30e388ee632b528c9525cf755e
https://github.com/ckan/ckan/commit/209204257f4b3c30e388ee632b528c9525cf755e
Author: Ian Ward <ian at excess.org>
Date: 2017-01-29 (Sun, 29 Jan 2017)
Changed paths:
M ckanext/datastore/controller.py
M ckanext/datastore/templates/datastore/dictionary.html
Log Message:
-----------
[#3414] working Data Dictionary form
Commit: 28234dc3293a9df91dbe9f45b97166ae2fe412ba
https://github.com/ckan/ckan/commit/28234dc3293a9df91dbe9f45b97166ae2fe412ba
Author: Jinfei Fan <fanjinfei at hotmail.com>
Date: 2017-02-02 (Thu, 02 Feb 2017)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
allow package_search to return id/name only instead of full dataset dictionary
Commit: 8541f225c752ab33de9bc9e0806c1e33c4f360cd
https://github.com/ckan/ckan/commit/8541f225c752ab33de9bc9e0806c1e33c4f360cd
Author: Ian Ward <ian at excess.org>
Date: 2017-02-03 (Fri, 03 Feb 2017)
Changed paths:
M ckanext/datastore/helpers.py
M ckanext/datastore/plugin.py
M ckanext/datastore/templates/package/resource_edit_base.html
M ckanext/datastore/templates/package/resource_read.html
Log Message:
-----------
[#3414] Data Dictionary display on resource page
Commit: 895b7ede841fdccd8165571a2f481beb8d98b16b
https://github.com/ckan/ckan/commit/895b7ede841fdccd8165571a2f481beb8d98b16b
Author: Jinfei Fan <fanjinfei at hotmail.com>
Date: 2017-02-07 (Tue, 07 Feb 2017)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
allow package_search to return specified fields
Commit: 3fdb4c171625ea6e6d32fc5132b43f63b24883e8
https://github.com/ckan/ckan/commit/3fdb4c171625ea6e6d32fc5132b43f63b24883e8
Author: Jinfei Fan <fanjinfei at hotmail.com>
Date: 2017-02-08 (Wed, 08 Feb 2017)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
add 'fl' in default_package_search_schema
Commit: 870aff94e4a058a690f86b6f9524376a304cac46
https://github.com/ckan/ckan/commit/870aff94e4a058a690f86b6f9524376a304cac46
Author: Jinfei Fan <fanjinfei at hotmail.com>
Date: 2017-02-08 (Wed, 08 Feb 2017)
Changed paths:
M ckan/tests/logic/action/test_get.py
Log Message:
-----------
add test case for package_search() 'fl' support
Commit: bd03c7ba992e480c477b0981bb79dc103635f898
https://github.com/ckan/ckan/commit/bd03c7ba992e480c477b0981bb79dc103635f898
Author: Ian Ward <ian at excess.org>
Date: 2017-02-09 (Thu, 09 Feb 2017)
Changed paths:
M ckanext/datapusher/templates/package/resource_edit_base.html
M ckanext/datastore/controller.py
Log Message:
-----------
[#3414] review clean-up
Commit: dc94a5e08f9bde3151795e38cb1164b7d8338ceb
https://github.com/ckan/ckan/commit/dc94a5e08f9bde3151795e38cb1164b7d8338ceb
Author: Jinfei Fan <fanjinfei at hotmail.com>
Date: 2017-02-10 (Fri, 10 Feb 2017)
Changed paths:
M ckan/tests/logic/action/test_get.py
Log Message:
-----------
fix test case
Commit: 90338329bac9c5f10675f9526f69f61e8680c334
https://github.com/ckan/ckan/commit/90338329bac9c5f10675f9526f69f61e8680c334
Author: Gleb <gleb.rudenko at linkdigital.com.au>
Date: 2017-02-21 (Tue, 21 Feb 2017)
Changed paths:
M ckan/logic/action/get.py
M ckan/templates/organization/index.html
Log Message:
-----------
#3259 / Organizations are sorted by title
Commit: 1c2a0571b4ea34c728c0eb5a66545b0d4cf54ba9
https://github.com/ckan/ckan/commit/1c2a0571b4ea34c728c0eb5a66545b0d4cf54ba9
Author: Artem Bazykin <artem.bazykin at linkdigital.com.au>
Date: 2017-02-21 (Tue, 21 Feb 2017)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
[#2651] Fix for delete resource on draft dataset should redirect to new_resource page
Commit: 47b0122379eb8ee7a3659f78f76c7079e5b3629f
https://github.com/ckan/ckan/commit/47b0122379eb8ee7a3659f78f76c7079e5b3629f
Author: Artem Bazykin <artem.bazykin at linkdigital.com.au>
Date: 2017-02-23 (Thu, 23 Feb 2017)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Use None in package_show instead context
Commit: 363619b5aa17ec1b4b9f5a9d0033bc82b1eb23ee
https://github.com/ckan/ckan/commit/363619b5aa17ec1b4b9f5a9d0033bc82b1eb23ee
Author: Artem Bazykin <artem.bazykin at linkdigital.com.au>
Date: 2017-02-24 (Fri, 24 Feb 2017)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
Fix tags on org/group read pages
Commit: e4fabc5ddd49ec07e368a8effcb8a1cef523a720
https://github.com/ckan/ckan/commit/e4fabc5ddd49ec07e368a8effcb8a1cef523a720
Author: Tyler Kennedy <tk at tkte.ch>
Date: 2017-03-02 (Thu, 02 Mar 2017)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Fix an incorrect error message.
Commit: 72eb146bcdc2ee709ca7f2c02ec3f920961166e8
https://github.com/ckan/ckan/commit/72eb146bcdc2ee709ca7f2c02ec3f920961166e8
Author: Tyler Kennedy <tk at tkte.ch>
Date: 2017-03-04 (Sat, 04 Mar 2017)
Changed paths:
M ckan/model/activity.py
Log Message:
-----------
Performance improvements in group_activity_query
Commit: 609d54b2996848eb13e3dba64c189f80c672ddbf
https://github.com/ckan/ckan/commit/609d54b2996848eb13e3dba64c189f80c672ddbf
Author: Ian Ward <ian at excess.org>
Date: 2017-03-05 (Sun, 05 Mar 2017)
Changed paths:
M ckanext/datastore/db.py
M ckanext/datastore/logic/schema.py
M ckanext/datastore/plugin.py
Log Message:
-----------
[#3467] separate total calculation + include_total param
Commit: 060307a42c6efe69d9766884ca9a41028c90ad23
https://github.com/ckan/ckan/commit/060307a42c6efe69d9766884ca9a41028c90ad23
Author: Tyler Kennedy <tk at tkte.ch>
Date: 2017-03-07 (Tue, 07 Mar 2017)
Changed paths:
M ckan/model/activity.py
Log Message:
-----------
Activity queries should return *all* activity events, not just those related to packages.
Commit: 5739eb867301311dec6846d01c3d8e92556ce2f3
https://github.com/ckan/ckan/commit/5739eb867301311dec6846d01c3d8e92556ce2f3
Author: Ian Ward <ian at excess.org>
Date: 2017-03-09 (Thu, 09 Mar 2017)
Changed paths:
M ckan/model/activity.py
Log Message:
-----------
Merge pull request #3466 from ckan/fix_group_activity_performance
Performance improvements in group_activity_query
Commit: 4fb48e52fc2e1fa51f6ba4bebc72e0f86936028d
https://github.com/ckan/ckan/commit/4fb48e52fc2e1fa51f6ba4bebc72e0f86936028d
Author: Jinfei Fan <fanjinfei at hotmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
fix edit resource of draft dataset
Commit: 3efd082210e30c3c5b2d5d9c7d95c315bb42af81
https://github.com/ckan/ckan/commit/3efd082210e30c3c5b2d5d9c7d95c315bb42af81
Author: Adrià Mercader <amercadero at gmail.com>
Date: 2017-03-14 (Tue, 14 Mar 2017)
Changed paths:
M ckan/logic/action/get.py
M ckan/logic/schema.py
M ckan/tests/logic/action/test_get.py
Log Message:
-----------
Merge pull request #3427 from fanjinfei/master
allow package_search to return id/name instead of full dataset dictionary
Commit: 017491fd729c0a96930ad42ed6710f1d866ed5c7
https://github.com/ckan/ckan/commit/017491fd729c0a96930ad42ed6710f1d866ed5c7
Author: Adrià Mercader <amercadero at gmail.com>
Date: 2017-03-14 (Tue, 14 Mar 2017)
Changed paths:
R ckan/templates/package/resource_data.html
M ckan/templates/package/resource_edit_base.html
M ckanext/datapusher/plugin.py
A ckanext/datapusher/templates/datapusher/resource_data.html
A ckanext/datapusher/templates/package/resource_edit_base.html
M ckanext/datastore/controller.py
M ckanext/datastore/db.py
M ckanext/datastore/helpers.py
M ckanext/datastore/logic/schema.py
M ckanext/datastore/plugin.py
A ckanext/datastore/templates/datastore/dictionary.html
A ckanext/datastore/templates/package/resource_edit_base.html
M ckanext/datastore/templates/package/resource_read.html
Log Message:
-----------
Merge pull request #3414 from ckan/3414-datastore-info
datastore Data Dictionary as postgresql comments
Commit: 42406b15de78bff6e486a0e263f98114c644fffc
https://github.com/ckan/ckan/commit/42406b15de78bff6e486a0e263f98114c644fffc
Author: Adrià Mercader <amercadero at gmail.com>
Date: 2017-03-14 (Tue, 14 Mar 2017)
Changed paths:
M ckan/logic/action/get.py
M ckan/templates/organization/index.html
Log Message:
-----------
Merge pull request #3451 from gleb-rudenko/organizations-are-sorted-by-name-instead-of-title
#3259 / Organizations are sorted by title
Commit: 6e7789d5fe7043a60955c25da1b6f5f9b0b65da3
https://github.com/ckan/ckan/commit/6e7789d5fe7043a60955c25da1b6f5f9b0b65da3
Author: Adrià Mercader <amercadero at gmail.com>
Date: 2017-03-14 (Tue, 14 Mar 2017)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
Merge pull request #3460 from wildcatzita/3456-fix-tags-org-group-read-pages
Fix tags on org/group read pages
Commit: 9c67d7ef8d7bcc219008394484fcc03f23293b2d
https://github.com/ckan/ckan/commit/9c67d7ef8d7bcc219008394484fcc03f23293b2d
Author: Adrià Mercader <amercadero at gmail.com>
Date: 2017-03-14 (Tue, 14 Mar 2017)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Merge pull request #3480 from fanjinfei/ckanmaster
fix edit resource of draft dataset
Commit: 81d9e44b71f9ed6ec607cb0eb966265a2c524b90
https://github.com/ckan/ckan/commit/81d9e44b71f9ed6ec607cb0eb966265a2c524b90
Author: Jana Sloukova <jana.techlib at gmail.com>
Date: 2017-03-14 (Tue, 14 Mar 2017)
Changed paths:
M ckanext/datastore/logic/action.py
Log Message:
-----------
Setting of datastore_active flag moved to separate function
Commit: 99cdca143f1b99eece7269fe20d6b478df96d5f7
https://github.com/ckan/ckan/commit/99cdca143f1b99eece7269fe20d6b478df96d5f7
Author: Jari Voutilainen <jari.voutilainen at iki.fi>
Date: 2017-03-15 (Wed, 15 Mar 2017)
Changed paths:
M ckan/lib/mailer.py
Log Message:
-----------
Use h.url_for and qualified=True for reset mails
Commit: 0e35ecf1e267c62faea85d46b6190a281a378557
https://github.com/ckan/ckan/commit/0e35ecf1e267c62faea85d46b6190a281a378557
Author: Ian Ward <ian at excess.org>
Date: 2017-03-16 (Thu, 16 Mar 2017)
Changed paths:
M ckanext/datastore/logic/action.py
Log Message:
-----------
[#3481] comment explaining approach
Commit: a860a9761f3235bb481b0dd9cb7ecbde3bc207fe
https://github.com/ckan/ckan/commit/a860a9761f3235bb481b0dd9cb7ecbde3bc207fe
Author: Ian Ward <ian at excess.org>
Date: 2017-03-16 (Thu, 16 Mar 2017)
Changed paths:
M ckanext/datastore/logic/action.py
Log Message:
-----------
Merge branch 'singularita-corp-master'
Commit: 51d14e84b9c23fd56ef2489388a09173a8ad4ba7
https://github.com/ckan/ckan/commit/51d14e84b9c23fd56ef2489388a09173a8ad4ba7
Author: Ian Ward <ian at excess.org>
Date: 2017-03-17 (Fri, 17 Mar 2017)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Merge pull request #3454 from wildcatzita/2651-fix-delete-resource-redirect-draft-dataset
[#2651] Fix for delete resource on draft dataset should redirect to new_resource page
Commit: b4dc4c73d634ddeebcffa2405bdaa44983642a1d
https://github.com/ckan/ckan/commit/b4dc4c73d634ddeebcffa2405bdaa44983642a1d
Author: Adrià Mercader <amercadero at gmail.com>
Date: 2017-03-21 (Tue, 21 Mar 2017)
Changed paths:
M ckan/lib/mailer.py
Log Message:
-----------
Merge pull request #3486 from Zharktas/master
Use h.url_for and qualified=True for reset mails
Commit: a8792a07e179a2557992f09efd1203fdd13c6db2
https://github.com/ckan/ckan/commit/a8792a07e179a2557992f09efd1203fdd13c6db2
Author: John <mohnjatthews at users.noreply.github.com>
Date: 2017-03-21 (Tue, 21 Mar 2017)
Changed paths:
M doc/maintaining/installing/install-from-source.rst
Log Message:
-----------
Fixed link for Jetty.
Old Jetty link (http://jetty.codehaus.org/jetty/) was non-responsive. Replaced with link to the Eclipse Jetty documentation.
Commit: fe59582134367f1471a86a26127d07c0f1cd1020
https://github.com/ckan/ckan/commit/fe59582134367f1471a86a26127d07c0f1cd1020
Author: Adrià Mercader <amercadero at gmail.com>
Date: 2017-03-21 (Tue, 21 Mar 2017)
Changed paths:
M doc/maintaining/installing/install-from-source.rst
Log Message:
-----------
Merge pull request #3497 from mohnjatthews/patch-1
Fixed link for Jetty.
Commit: 9df0c7b3aa5b7e03b97682223f82d947697d36dc
https://github.com/ckan/ckan/commit/9df0c7b3aa5b7e03b97682223f82d947697d36dc
Author: Ian Ward <ian at excess.org>
Date: 2017-03-24 (Fri, 24 Mar 2017)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/lib/mailer.py
M ckan/logic/action/get.py
M ckan/logic/schema.py
M ckan/model/activity.py
M ckan/templates/organization/index.html
R ckan/templates/package/resource_data.html
M ckan/templates/package/resource_edit_base.html
M ckan/tests/logic/action/test_get.py
M ckanext/datapusher/plugin.py
A ckanext/datapusher/templates/datapusher/resource_data.html
A ckanext/datapusher/templates/package/resource_edit_base.html
M ckanext/datastore/controller.py
M ckanext/datastore/db.py
M ckanext/datastore/helpers.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/schema.py
M ckanext/datastore/plugin.py
A ckanext/datastore/templates/datastore/dictionary.html
A ckanext/datastore/templates/package/resource_edit_base.html
M ckanext/datastore/templates/package/resource_read.html
M doc/maintaining/installing/install-from-source.rst
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into 3467-datastore-total
Commit: af2f061fdd08219d5070415be118d6063d38341f
https://github.com/ckan/ckan/commit/af2f061fdd08219d5070415be118d6063d38341f
Author: Adrià Mercader <amercadero at gmail.com>
Date: 2017-03-24 (Fri, 24 Mar 2017)
Changed paths:
M ckanext/datastore/db.py
M ckanext/datastore/logic/schema.py
M ckanext/datastore/plugin.py
Log Message:
-----------
Merge pull request #3467 from ckan/3467-datastore-total
faster datastore total calculation + make optional
Commit: 711e42609ae62c5ad671ea812e35f983740c21fe
https://github.com/ckan/ckan/commit/711e42609ae62c5ad671ea812e35f983740c21fe
Author: Tyler Kennedy <tk at tkte.ch>
Date: 2017-03-28 (Tue, 28 Mar 2017)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Merge pull request #3464 from ckan/fix_template_error
Fix an incorrect error message.
Commit: 208782cac98d12451568d1f6462826de030ec586
https://github.com/ckan/ckan/commit/208782cac98d12451568d1f6462826de030ec586
Author: amercader <amercadero at gmail.com>
Date: 2017-03-28 (Tue, 28 Mar 2017)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/lib/mailer.py
M ckan/logic/action/get.py
M ckan/logic/schema.py
M ckan/model/activity.py
M ckan/templates/organization/index.html
R ckan/templates/package/resource_data.html
M ckan/templates/package/resource_edit_base.html
M ckan/tests/logic/action/test_get.py
M ckanext/datapusher/plugin.py
A ckanext/datapusher/templates/datapusher/resource_data.html
A ckanext/datapusher/templates/package/resource_edit_base.html
M ckanext/datastore/controller.py
M ckanext/datastore/db.py
M ckanext/datastore/helpers.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/schema.py
M ckanext/datastore/plugin.py
A ckanext/datastore/templates/datastore/dictionary.html
A ckanext/datastore/templates/package/resource_edit_base.html
M ckanext/datastore/templates/package/resource_read.html
M doc/maintaining/installing/install-from-source.rst
Log Message:
-----------
Merge branch 'master' into 3196-i18n
Compare: https://github.com/ckan/ckan/compare/6e11e61df13d...208782cac98d
More information about the ckan-changes
mailing list