[ckan-changes] [ckan/ckan] f0a1b7: Solr BugFix
GitHub
noreply at github.com
Wed Jan 25 14:27:21 UTC 2017
Branch: refs/heads/3196-i18n
Home: https://github.com/ckan/ckan
Commit: f0a1b7de0930b31f226c6ef7890646573d1793c0
https://github.com/ckan/ckan/commit/f0a1b7de0930b31f226c6ef7890646573d1793c0
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2016-12-04 (Sun, 04 Dec 2016)
Changed paths:
M contrib/docker/solr/Dockerfile
Log Message:
-----------
Solr BugFix
Solr requires the same schema of ckan
Commit: c2094e644387d23f38d6b26da7f192ff7bd717fe
https://github.com/ckan/ckan/commit/c2094e644387d23f38d6b26da7f192ff7bd717fe
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2016-12-04 (Sun, 04 Dec 2016)
Changed paths:
A contrib/docker/ckan-entrypoint.sh
Log Message:
-----------
EntryPoint
Commit: 59e04d6aaa3ec258968b1b0f89615ead487549b1
https://github.com/ckan/ckan/commit/59e04d6aaa3ec258968b1b0f89615ead487549b1
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2016-12-04 (Sun, 04 Dec 2016)
Changed paths:
M Dockerfile
Log Message:
-----------
Docker File Working as expected
Commit: 43f90c315e79aba56b87ff5e4ca39b6947380036
https://github.com/ckan/ckan/commit/43f90c315e79aba56b87ff5e4ca39b6947380036
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2016-12-04 (Sun, 04 Dec 2016)
Changed paths:
M contrib/docker/docker-cloud.yml
M contrib/docker/docker-compose.yml
Log Message:
-----------
Docker-Compose and Docker-Cloud Changed
Commit: 2a949a45795a26113fa503d3ef7988fff962a68e
https://github.com/ckan/ckan/commit/2a949a45795a26113fa503d3ef7988fff962a68e
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2016-12-04 (Sun, 04 Dec 2016)
Changed paths:
M contrib/docker/docker-compose.yml
Log Message:
-----------
Compose Up
Commit: 2c22fd303866c5798f4c318f32058c35e676706a
https://github.com/ckan/ckan/commit/2c22fd303866c5798f4c318f32058c35e676706a
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2016-12-04 (Sun, 04 Dec 2016)
Changed paths:
M Dockerfile
Log Message:
-----------
EntryPoint In /
Commit: 6adc42a53d7517bba7d6c08a70d3402c1ee747b8
https://github.com/ckan/ckan/commit/6adc42a53d7517bba7d6c08a70d3402c1ee747b8
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2016-12-04 (Sun, 04 Dec 2016)
Changed paths:
M Dockerfile
M contrib/docker/docker-compose.yml
Log Message:
-----------
chmod +x
Commit: 9fecc9634e4e8df359838841af97e47d40045c5b
https://github.com/ckan/ckan/commit/9fecc9634e4e8df359838841af97e47d40045c5b
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2016-12-04 (Sun, 04 Dec 2016)
Changed paths:
M contrib/docker/docker-compose.yml
Log Message:
-----------
DockerCompose
Commit: 56e7beb5b3721a9c34a4a535419ed6bd9459401f
https://github.com/ckan/ckan/commit/56e7beb5b3721a9c34a4a535419ed6bd9459401f
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2016-12-04 (Sun, 04 Dec 2016)
Changed paths:
M circle.yml
Log Message:
-----------
CircleCI Test Docker
Commit: a2dd96d1e7d5299e1dafdd572353165cf35e4434
https://github.com/ckan/ckan/commit/a2dd96d1e7d5299e1dafdd572353165cf35e4434
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2016-12-04 (Sun, 04 Dec 2016)
Changed paths:
M circle.yml
Log Message:
-----------
Save Redis and set name ok
Commit: 196b3f5e9322507f8539629cfbe52807070dac3f
https://github.com/ckan/ckan/commit/196b3f5e9322507f8539629cfbe52807070dac3f
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2016-12-04 (Sun, 04 Dec 2016)
Changed paths:
M circle.yml
Log Message:
-----------
BugFix on CircleCI
Commit: f9dcda02b21124c2f3bc22964cc826c444761d29
https://github.com/ckan/ckan/commit/f9dcda02b21124c2f3bc22964cc826c444761d29
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2016-12-04 (Sun, 04 Dec 2016)
Changed paths:
M circle.yml
Log Message:
-----------
Changed Exposed Port to don't collide with background tests
Commit: 0466e5e4a6b3d2bd3ff3c0970c06622623882171
https://github.com/ckan/ckan/commit/0466e5e4a6b3d2bd3ff3c0970c06622623882171
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2016-12-05 (Mon, 05 Dec 2016)
Changed paths:
M circle.yml
Log Message:
-----------
Sleep outside run
Commit: d802264ac38ce17fa3d89029dacf3684eb464adc
https://github.com/ckan/ckan/commit/d802264ac38ce17fa3d89029dacf3684eb464adc
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2016-12-20 (Tue, 20 Dec 2016)
Changed paths:
M Dockerfile
M contrib/docker/ckan-entrypoint.sh
Log Message:
-----------
Added ENV for Storage and URL
Commit: f9a152c57d850b8e113a3394fc4ed94f7cc1e1c0
https://github.com/ckan/ckan/commit/f9a152c57d850b8e113a3394fc4ed94f7cc1e1c0
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2016-12-20 (Tue, 20 Dec 2016)
Changed paths:
A .travis.yml
Log Message:
-----------
Travis YML Added
Commit: bb7dc7afdb4cf9f84e005304b8a5b69e7ca55718
https://github.com/ckan/ckan/commit/bb7dc7afdb4cf9f84e005304b8a5b69e7ca55718
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2016-12-22 (Thu, 22 Dec 2016)
Changed paths:
M .travis.yml
Log Message:
-----------
Redis Cached
Commit: 794fa5c7bbcce2946023b08a5b8e84f67980edc0
https://github.com/ckan/ckan/commit/794fa5c7bbcce2946023b08a5b8e84f67980edc0
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2016-12-22 (Thu, 22 Dec 2016)
Changed paths:
M circle.yml
Log Message:
-----------
CircleCI - No Docker
Commit: 794b687d6ccfae426c5a1f8d10e15b976afd5500
https://github.com/ckan/ckan/commit/794b687d6ccfae426c5a1f8d10e15b976afd5500
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2016-12-22 (Thu, 22 Dec 2016)
Changed paths:
M .travis.yml
Log Message:
-----------
Docker Show Info at end
Commit: 8ba3375eea3f936cb8085e98fa537d7e3890c280
https://github.com/ckan/ckan/commit/8ba3375eea3f936cb8085e98fa537d7e3890c280
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2016-12-22 (Thu, 22 Dec 2016)
Changed paths:
M .travis.yml
Log Message:
-----------
Port 5000
Commit: 01f564ef469fdd51c42786eb00824bad15f0a306
https://github.com/ckan/ckan/commit/01f564ef469fdd51c42786eb00824bad15f0a306
Author: Ian Ward <ian at excess.org>
Date: 2017-01-03 (Tue, 03 Jan 2017)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/get.py
M ckan/logic/schema.py
Log Message:
-----------
[#3385] add include_dataset_count param to group/org show actions
Commit: 01e44e7034fa1783a4d7f13ff56b397dd1f8c58d
https://github.com/ckan/ckan/commit/01e44e7034fa1783a4d7f13ff56b397dd1f8c58d
Author: Ian Ward <ian at excess.org>
Date: 2017-01-03 (Tue, 03 Jan 2017)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#3385] organization_list_for_user: remove package_count
Commit: 17f6ba0c890434f4084ea97334f030c2954acd11
https://github.com/ckan/ckan/commit/17f6ba0c890434f4084ea97334f030c2954acd11
Author: Ian Ward <ian at excess.org>
Date: 2017-01-03 (Tue, 03 Jan 2017)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#3385] document include_dataset_count param for group/org list
Commit: 1a5c77acffd48bab595f87dfcd6833122be49760
https://github.com/ckan/ckan/commit/1a5c77acffd48bab595f87dfcd6833122be49760
Author: David Read <david.read at hackneyworkshop.com>
Date: 2017-01-05 (Thu, 05 Jan 2017)
Changed paths:
M ckan/logic/action/delete.py
M ckan/tests/logic/action/test_delete.py
Log Message:
-----------
Fix for exception when deleting a user that doesnt exist.
Commit: cccfbfd4ad2b46ad773a22addb5d6d3caeab7483
https://github.com/ckan/ckan/commit/cccfbfd4ad2b46ad773a22addb5d6d3caeab7483
Author: Tyler Kennedy <tk at tkte.ch>
Date: 2017-01-05 (Thu, 05 Jan 2017)
Changed paths:
M ckan/logic/action/delete.py
M ckan/tests/logic/action/test_delete.py
Log Message:
-----------
Merge pull request #3387 from ckan/user_delete_not_found
Fix for exception when deleting a user that doesnt exist.
Commit: c7415692acb780fc49c63efd02656adc1d3263b9
https://github.com/ckan/ckan/commit/c7415692acb780fc49c63efd02656adc1d3263b9
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2017-01-06 (Fri, 06 Jan 2017)
Changed paths:
M ckan/controllers/group.py
M ckan/lib/cli.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/logic/auth/create.py
M ckan/model/__init__.py
M ckan/model/system_info.py
M ckan/public/base/javascript/main.js
M ckan/templates/organization/member_new.html
M ckan/tests/legacy/functional/api/test_activity.py
M ckan/tests/lib/test_helpers.py
M ckan/tests/lib/test_jobs.py
M ckan/tests/logic/action/test_get.py
M ckanext/datastore/controller.py
M ckanext/datastore/logic/action.py
M doc/extensions/tutorial.rst
M doc/maintaining/configuration.rst
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/ckan/master' into docker-update
Commit: b05c43a7301dbd660dc6895219c9fc4f3eddb154
https://github.com/ckan/ckan/commit/b05c43a7301dbd660dc6895219c9fc4f3eddb154
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2017-01-06 (Fri, 06 Jan 2017)
Changed paths:
M Dockerfile
M contrib/docker/ckan-entrypoint.sh
Log Message:
-----------
Using new ENV-VAR names
Commit: 8b427fe3e3db14f9c9a654ae9d830f96226a5467
https://github.com/ckan/ckan/commit/8b427fe3e3db14f9c9a654ae9d830f96226a5467
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2017-01-06 (Fri, 06 Jan 2017)
Changed paths:
M ckan/authz.py
M ckan/common.py
M ckan/config/deployment.ini_tmpl
M ckan/config/middleware/flask_app.py
M ckan/config/routing.py
M ckan/controllers/api.py
M ckan/controllers/error.py
M ckan/controllers/feed.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/base.py
M ckan/lib/helpers.py
M ckan/lib/i18n.py
M ckan/lib/maintain.py
M ckan/lib/plugins.py
M ckan/logic/__init__.py
M ckan/logic/action/delete.py
M ckan/logic/action/update.py
M ckan/model/dashboard.py
M ckan/plugins/interfaces.py
M ckan/public/base/images/background-tag-ie7.png
M ckan/public/base/images/background-tag.png
M ckan/public/base/images/background-tile.png
M ckan/public/base/images/bg.png
M ckan/public/base/images/breadcrumb-slash-ie7.png
M ckan/public/base/images/ckan-logo-footer.png
M ckan/public/base/images/ckan-logo.png
M ckan/public/base/images/dashboard-followee-related.png
M ckan/public/base/images/dotted.png
M ckan/public/base/images/editing.png
M ckan/public/base/images/full-width-nav-right.png
M ckan/public/base/images/icon-search-27x26.png
M ckan/public/base/images/nav-active.png
M ckan/public/base/images/nav.png
M ckan/public/base/images/od_80x15_blue.png
M ckan/public/base/images/placeholder-200x125.png
M ckan/public/base/images/placeholder-420x220.png
M ckan/public/base/images/placeholder-680x400.png
M ckan/public/base/images/placeholder-application.png
M ckan/public/base/images/placeholder-group.png
M ckan/public/base/images/placeholder-image.png
M ckan/public/base/images/placeholder-organization.png
M ckan/public/base/images/sprite-ckan-icons.png
M ckan/public/base/images/sprite-resource-icons.png
M ckan/public/base/images/table-seperator.png
M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
M ckan/public/base/vendor/select2/select2.png
M ckan/public/base/vendor/select2/select2x2.png
M ckan/tests/config/test_middleware.py
M ckan/tests/controllers/test_package.py
M ckan/tests/helpers.py
M ckan/tests/lib/_i18n_build_js_translations/de/LC_MESSAGES/ckanext-test_js_translations.po
M ckan/tests/lib/test_base.py
M ckan/tests/logic/action/test_delete.py
M ckan/tests/test_common.py
A ckan/views/__init__.py
A ckan/views/api.py
A ckanext/example_flask_iblueprint/__init__.py
A ckanext/example_flask_iblueprint/plugin.py
A ckanext/example_flask_iblueprint/templates/about.html
A ckanext/example_flask_iblueprint/templates/about_base.html
A ckanext/example_flask_iblueprint/tests/__init__.py
A ckanext/example_flask_iblueprint/tests/test_routes.py
M ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg
M ckanext/imageview/plugin.py
M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_222222_256x240.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_2e83ff_256x240.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_454545_256x240.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_888888_256x240.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_cd0a0a_256x240.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_redo.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_peppermint.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_spearmint.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_undo.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_blue.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_star.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/drag-handle.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/help.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-asc.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-desc.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/stripes.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tag_red.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tick.png
M ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
M ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
M ckanext/test_tag_vocab_plugin.py
M dev-requirements.txt
M doc/_static/ckanlogo.png
M doc/images/9.png
M doc/images/add_dataset_1.jpg
M doc/images/add_dataset_2.jpg
M doc/images/add_dataset_3.jpg
M doc/images/architecture.png
M doc/images/ckan_importing_diagram.png
M doc/images/create_organization.jpg
M doc/images/custom-css.png
M doc/images/custom_config_fields.png
M doc/images/customize_look_and_feel.jpg
M doc/images/debug-footer.png
M doc/images/edit_dataset.jpg
M doc/images/example_theme_javascript_popover.png
M doc/images/example_theme_overlapping_popovers.png
M doc/images/exploring_datasets.jpg
M doc/images/extra-public-dir.png
M doc/images/html_and_css.png
M doc/images/image_view.png
M doc/images/manage_news_feed.jpg
M doc/images/manage_organization.jpg
M doc/images/manage_user_profile.jpg
M doc/images/manage_users.jpg
M doc/images/manage_views.png
M doc/images/more-custom-css.png
M doc/images/most-popular-groups-custom-snippet.png
M doc/images/most-popular-groups-snippet.png
M doc/images/most-popular-groups.png
M doc/images/move_dataset_between_organizations.jpg
M doc/images/popular-dataset.png
M doc/images/popular-resource.png
M doc/images/recently-changed-packages-activity-stream.png
M doc/images/recline_graph_view.png
M doc/images/recline_grid_view.png
M doc/images/recline_map_view.png
M doc/images/recline_view.png
M doc/images/register_account.jpg
M doc/images/search_the_site.jpg
M doc/images/sort-datasets-by-popularity.png
M doc/images/text_view.png
M doc/images/views_overview.png
M doc/images/webpage_view.png
M doc/maintaining/configuration.rst
M doc/maintaining/data-viewer.rst
M setup.py
M test-core.ini
Log Message:
-----------
Merge remote-tracking branch 'refs/remotes/ckan/master' into docker-update
Commit: 01a2526f8000c6bfa5b54f35ad0ae52e23a0cad2
https://github.com/ckan/ckan/commit/01a2526f8000c6bfa5b54f35ad0ae52e23a0cad2
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2017-01-06 (Fri, 06 Jan 2017)
Changed paths:
M Dockerfile
Log Message:
-----------
TMP-BUGFIX
Commit: 3fea23eda64930d01867c7f3deb763afab9e2d7b
https://github.com/ckan/ckan/commit/3fea23eda64930d01867c7f3deb763afab9e2d7b
Author: Raul Hidalgo Caballero <raul.hidalgo.sopa at gmail.com>
Date: 2017-01-06 (Fri, 06 Jan 2017)
Changed paths:
M contrib/docker/ckan-entrypoint.sh
Log Message:
-----------
Using ENV-VAR
Commit: 1d0cee39f4d99425005de543dd466b2a09f8570f
https://github.com/ckan/ckan/commit/1d0cee39f4d99425005de543dd466b2a09f8570f
Author: Ian Ward <ian at excess.org>
Date: 2017-01-06 (Fri, 06 Jan 2017)
Changed paths:
A .travis.yml
M Dockerfile
A contrib/docker/ckan-entrypoint.sh
M contrib/docker/docker-cloud.yml
M contrib/docker/docker-compose.yml
M contrib/docker/solr/Dockerfile
Log Message:
-----------
Merge pull request #3346 from deinok/docker-update
Docker BugFix
Commit: 49817beb30a3cf244f3e8d7c7ed6e56b5ec69572
https://github.com/ckan/ckan/commit/49817beb30a3cf244f3e8d7c7ed6e56b5ec69572
Author: Ian Ward <ian at excess.org>
Date: 2017-01-06 (Fri, 06 Jan 2017)
Changed paths:
M ckanext/datastore/controller.py
M ckanext/datastore/plugin.py
M doc/maintaining/datastore.rst
Log Message:
-----------
[#3390] datastore: dump CSV for Excel with &bom=true
Commit: 417f1ea363baa334b260a84c0ca12b3779f02cf8
https://github.com/ckan/ckan/commit/417f1ea363baa334b260a84c0ca12b3779f02cf8
Author: Ian Ward <ian at excess.org>
Date: 2017-01-06 (Fri, 06 Jan 2017)
Changed paths:
M ckanext/datastore/controller.py
M ckanext/datastore/plugin.py
M doc/maintaining/datastore.rst
Log Message:
-----------
[#3390] datastore: dump TSV with format=tsv
Commit: da3b9571fe0ed4536a9ea34398c15dfc7c4faf3d
https://github.com/ckan/ckan/commit/da3b9571fe0ed4536a9ea34398c15dfc7c4faf3d
Author: Ian Ward <ian at excess.org>
Date: 2017-01-06 (Fri, 06 Jan 2017)
Changed paths:
M ckanext/datastore/controller.py
A ckanext/datastore/writer.py
Log Message:
-----------
[#3390] factor out csv/tsv writing into context managers
Commit: 0815bee4e6d0b67bcf55e977acc53e26eda9d86a
https://github.com/ckan/ckan/commit/0815bee4e6d0b67bcf55e977acc53e26eda9d86a
Author: Ian Ward <ian at excess.org>
Date: 2017-01-06 (Fri, 06 Jan 2017)
Changed paths:
M ckanext/datastore/controller.py
M ckanext/datastore/writer.py
M doc/maintaining/datastore.rst
Log Message:
-----------
[#3390] datastore dump format=json
Commit: 45acad3e1a42476d4bab54e4a268aa6d50f30696
https://github.com/ckan/ckan/commit/45acad3e1a42476d4bab54e4a268aa6d50f30696
Author: Ian Ward <ian at excess.org>
Date: 2017-01-06 (Fri, 06 Jan 2017)
Changed paths:
M ckanext/datastore/writer.py
Log Message:
-----------
[#3390] file encoding, unprefixed strings
Commit: e5605d95096c1f1cee4ec588ba8bebc5515899bf
https://github.com/ckan/ckan/commit/e5605d95096c1f1cee4ec588ba8bebc5515899bf
Author: Ian Ward <ian at excess.org>
Date: 2017-01-06 (Fri, 06 Jan 2017)
Changed paths:
M ckanext/datastore/controller.py
M ckanext/datastore/writer.py
M doc/maintaining/datastore.rst
Log Message:
-----------
[#3390] datastore dump format=xml
Commit: 87eea9b841b136f59a862138f28a2a4dc34c9fed
https://github.com/ckan/ckan/commit/87eea9b841b136f59a862138f28a2a4dc34c9fed
Author: Ian Ward <ian at excess.org>
Date: 2017-01-06 (Fri, 06 Jan 2017)
Changed paths:
M ckanext/datastore/writer.py
Log Message:
-----------
[#3390] docstrings
Commit: a6b595165df398d507bce7fc0a767ba0275103a9
https://github.com/ckan/ckan/commit/a6b595165df398d507bce7fc0a767ba0275103a9
Author: Ian Ward <ian at excess.org>
Date: 2017-01-06 (Fri, 06 Jan 2017)
Changed paths:
M ckanext/datastore/writer.py
Log Message:
-----------
[#3390] datastore dump: more compact json export
Commit: 685496e2ff997c7828ce77dcc01ab0511871e587
https://github.com/ckan/ckan/commit/685496e2ff997c7828ce77dcc01ab0511871e587
Author: Ian Ward <ian at excess.org>
Date: 2017-01-07 (Sat, 07 Jan 2017)
Changed paths:
M ckan/tests/test_coding_standards.py
Log Message:
-----------
[#3391] cause coding standards failure
Commit: b82a9366d6aa3c98472e654d7c9cc63e8d7532e4
https://github.com/ckan/ckan/commit/b82a9366d6aa3c98472e654d7c9cc63e8d7532e4
Author: Ian Ward <ian at excess.org>
Date: 2017-01-07 (Sat, 07 Jan 2017)
Changed paths:
M ckan/ckan_nose_plugin.py
Log Message:
-----------
[#3391] filter functions on --segments
Commit: 09012b3fb4dcd58f05bb1cd99136b1335404040f
https://github.com/ckan/ckan/commit/09012b3fb4dcd58f05bb1cd99136b1335404040f
Author: Ian Ward <ian at excess.org>
Date: 2017-01-07 (Sat, 07 Jan 2017)
Changed paths:
M ckan/ckan_nose_plugin.py
Log Message:
-----------
[#3391] simplify test class filtering
Commit: 7e24a0aaa21ff3d942d40b01586c287c42236d8b
https://github.com/ckan/ckan/commit/7e24a0aaa21ff3d942d40b01586c287c42236d8b
Author: Ian Ward <ian at excess.org>
Date: 2017-01-07 (Sat, 07 Jan 2017)
Changed paths:
M ckan/tests/test_coding_standards.py
Log Message:
-----------
[#3391] revert "cause coding standards failure"
This reverts commit 685496e2ff997c7828ce77dcc01ab0511871e587.
Commit: 40a3bfd4a5aceae7ce8fc74b9f67ae339ce59605
https://github.com/ckan/ckan/commit/40a3bfd4a5aceae7ce8fc74b9f67ae339ce59605
Author: Ian Ward <ian at excess.org>
Date: 2017-01-07 (Sat, 07 Jan 2017)
Changed paths:
M .circleci-matrix.yml
Log Message:
-----------
[#3391] rebalance segments (#2 running +2 minutes over #1)
Commit: e3ab38123461c3b4251084fd5ef3d13a433810b3
https://github.com/ckan/ckan/commit/e3ab38123461c3b4251084fd5ef3d13a433810b3
Author: amercader <amercadero at gmail.com>
Date: 2017-01-07 (Sat, 07 Jan 2017)
Changed paths:
M ckan/i18n/fr/LC_MESSAGES/ckan.mo
M ckan/i18n/fr/LC_MESSAGES/ckan.po
Log Message:
-----------
[#3327] Fix French locale
Commit: 78257ad105525d449d73452093da073aafe0a7da
https://github.com/ckan/ckan/commit/78257ad105525d449d73452093da073aafe0a7da
Author: tino097 <konstantin.sivakov at gmail.com>
Date: 2017-01-09 (Mon, 09 Jan 2017)
Changed paths:
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
M ckan/logic/schema.py
M ckan/templates/macros/autoform.html
Log Message:
-----------
Changes to the way of uploading the CKAN logo image. In the form we will have image upload control.
Commit: e0448feeb63d6892d355e29f5c0b4ae6b6253e1e
https://github.com/ckan/ckan/commit/e0448feeb63d6892d355e29f5c0b4ae6b6253e1e
Author: tino097 <konstantin.sivakov at gmail.com>
Date: 2017-01-10 (Tue, 10 Jan 2017)
Changed paths:
A .travis.yml
M Dockerfile
M ckan/authz.py
M ckan/common.py
M ckan/config/deployment.ini_tmpl
M ckan/config/middleware/flask_app.py
M ckan/config/routing.py
M ckan/controllers/api.py
M ckan/controllers/error.py
M ckan/controllers/feed.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/base.py
M ckan/lib/helpers.py
M ckan/lib/i18n.py
M ckan/lib/maintain.py
M ckan/lib/plugins.py
M ckan/logic/__init__.py
M ckan/logic/action/delete.py
M ckan/logic/action/update.py
M ckan/model/dashboard.py
M ckan/model/system_info.py
M ckan/plugins/interfaces.py
M ckan/public/base/images/background-tag-ie7.png
M ckan/public/base/images/background-tag.png
M ckan/public/base/images/background-tile.png
M ckan/public/base/images/bg.png
M ckan/public/base/images/breadcrumb-slash-ie7.png
M ckan/public/base/images/ckan-logo-footer.png
M ckan/public/base/images/ckan-logo.png
M ckan/public/base/images/dashboard-followee-related.png
M ckan/public/base/images/dotted.png
M ckan/public/base/images/editing.png
M ckan/public/base/images/full-width-nav-right.png
M ckan/public/base/images/icon-search-27x26.png
M ckan/public/base/images/nav-active.png
M ckan/public/base/images/nav.png
M ckan/public/base/images/od_80x15_blue.png
M ckan/public/base/images/placeholder-200x125.png
M ckan/public/base/images/placeholder-420x220.png
M ckan/public/base/images/placeholder-680x400.png
M ckan/public/base/images/placeholder-application.png
M ckan/public/base/images/placeholder-group.png
M ckan/public/base/images/placeholder-image.png
M ckan/public/base/images/placeholder-organization.png
M ckan/public/base/images/sprite-ckan-icons.png
M ckan/public/base/images/sprite-resource-icons.png
M ckan/public/base/images/table-seperator.png
M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
M ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
M ckan/public/base/vendor/select2/select2.png
M ckan/public/base/vendor/select2/select2x2.png
M ckan/tests/config/test_middleware.py
M ckan/tests/controllers/test_package.py
M ckan/tests/helpers.py
M ckan/tests/lib/_i18n_build_js_translations/de/LC_MESSAGES/ckanext-test_js_translations.po
M ckan/tests/lib/test_base.py
M ckan/tests/logic/action/test_delete.py
M ckan/tests/test_common.py
A ckan/views/__init__.py
A ckan/views/api.py
A ckanext/example_flask_iblueprint/__init__.py
A ckanext/example_flask_iblueprint/plugin.py
A ckanext/example_flask_iblueprint/templates/about.html
A ckanext/example_flask_iblueprint/templates/about_base.html
A ckanext/example_flask_iblueprint/tests/__init__.py
A ckanext/example_flask_iblueprint/tests/test_routes.py
M ckanext/example_theme/v12_extra_public_dir/public/promoted-image.jpg
M ckanext/imageview/plugin.py
M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers-2x.png
M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/layers.png
M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-icon-2x.png
M ckanext/reclineview/theme/public/vendor/leaflet/0.7.3/images/marker-shadow.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_222222_256x240.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_2e83ff_256x240.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_454545_256x240.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_888888_256x240.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/css/smoothness/images/ui-icons_cd0a0a_256x240.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_redo.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_peppermint.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_right_spearmint.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/arrow_undo.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_blue.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/bullet_star.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/drag-handle.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/help.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-asc.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/sort-desc.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/stripes.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tag_red.png
M ckanext/reclineview/theme/public/vendor/slickgrid/2.2/images/tick.png
M ckanext/reclineview/theme/public/vendor/timeline/css/timeline.png
M ckanext/reclineview/theme/public/vendor/timeline/css/timeline at 2x.png
M ckanext/test_tag_vocab_plugin.py
A contrib/docker/ckan-entrypoint.sh
M contrib/docker/docker-cloud.yml
M contrib/docker/docker-compose.yml
M contrib/docker/solr/Dockerfile
M dev-requirements.txt
M doc/_static/ckanlogo.png
M doc/images/9.png
M doc/images/add_dataset_1.jpg
M doc/images/add_dataset_2.jpg
M doc/images/add_dataset_3.jpg
M doc/images/architecture.png
M doc/images/ckan_importing_diagram.png
M doc/images/create_organization.jpg
M doc/images/custom-css.png
M doc/images/custom_config_fields.png
M doc/images/customize_look_and_feel.jpg
M doc/images/debug-footer.png
M doc/images/edit_dataset.jpg
M doc/images/example_theme_javascript_popover.png
M doc/images/example_theme_overlapping_popovers.png
M doc/images/exploring_datasets.jpg
M doc/images/extra-public-dir.png
M doc/images/html_and_css.png
M doc/images/image_view.png
M doc/images/manage_news_feed.jpg
M doc/images/manage_organization.jpg
M doc/images/manage_user_profile.jpg
M doc/images/manage_users.jpg
M doc/images/manage_views.png
M doc/images/more-custom-css.png
M doc/images/most-popular-groups-custom-snippet.png
M doc/images/most-popular-groups-snippet.png
M doc/images/most-popular-groups.png
M doc/images/move_dataset_between_organizations.jpg
M doc/images/popular-dataset.png
M doc/images/popular-resource.png
M doc/images/recently-changed-packages-activity-stream.png
M doc/images/recline_graph_view.png
M doc/images/recline_grid_view.png
M doc/images/recline_map_view.png
M doc/images/recline_view.png
M doc/images/register_account.jpg
M doc/images/search_the_site.jpg
M doc/images/sort-datasets-by-popularity.png
M doc/images/text_view.png
M doc/images/views_overview.png
M doc/images/webpage_view.png
M doc/maintaining/configuration.rst
M doc/maintaining/data-viewer.rst
M setup.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' of https://github.com/ckan/ckan into ckan-logo-upload
Commit: 61ba91f9ade7dcf703910734909b023c949ad714
https://github.com/ckan/ckan/commit/61ba91f9ade7dcf703910734909b023c949ad714
Author: Adrià Mercader <amercadero at gmail.com>
Date: 2017-01-10 (Tue, 10 Jan 2017)
Changed paths:
M .circleci-matrix.yml
M ckan/ckan_nose_plugin.py
M ckan/i18n/fr/LC_MESSAGES/ckan.mo
M ckan/i18n/fr/LC_MESSAGES/ckan.po
Log Message:
-----------
Merge pull request #3391 from ckan/3391-circle-perf-fix
some tests running on all circleci containers
Commit: 328190ad6a9901cc573049594dc8767d6afd5ac7
https://github.com/ckan/ckan/commit/328190ad6a9901cc573049594dc8767d6afd5ac7
Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
Date: 2017-01-11 (Wed, 11 Jan 2017)
Changed paths:
A ckan/pastertemplates/template/ckanext/+project_shortname+/i18n/+dot+gitignore
Log Message:
-----------
[#3394] Add `i18n` directory to extension template
Previously the paster extension template was missing the
`ckanext/<name>/i18n` directory, so users had to create it manually.
This commit adds that directory to the template.
Commit: 2998217a865c780a04f636d1292ad2a8617de129
https://github.com/ckan/ckan/commit/2998217a865c780a04f636d1292ad2a8617de129
Author: Adrià Mercader <amercadero at gmail.com>
Date: 2017-01-11 (Wed, 11 Jan 2017)
Changed paths:
A ckan/pastertemplates/template/ckanext/+project_shortname+/i18n/+dot+gitignore
Log Message:
-----------
Merge pull request #3395 from torfsen/3394-add-i18n-dir-to-extension-template
[#3394] Add `i18n` directory to extension template
Commit: 41a586bf7aca29dbc9a32e798024c19d64a0a84f
https://github.com/ckan/ckan/commit/41a586bf7aca29dbc9a32e798024c19d64a0a84f
Author: Ian Ward <ian at excess.org>
Date: 2017-01-12 (Thu, 12 Jan 2017)
Changed paths:
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/templates/user/dashboard_organizations.html
Log Message:
-----------
[#3385] organization_list_for_user: include_dataset_count parameter
Commit: ba050c6c8a715af65688f1fbe511b16513416143
https://github.com/ckan/ckan/commit/ba050c6c8a715af65688f1fbe511b16513416143
Author: Ian Ward <ian at excess.org>
Date: 2017-01-12 (Thu, 12 Jan 2017)
Changed paths:
M CHANGELOG.rst
Log Message:
-----------
[#3385] changelog entry for organization_list_for_user param
Commit: 753359b8b854985e3d5d5a32bd299e876e25df83
https://github.com/ckan/ckan/commit/753359b8b854985e3d5d5a32bd299e876e25df83
Author: Ian Ward <ian at excess.org>
Date: 2017-01-12 (Thu, 12 Jan 2017)
Changed paths:
M ckanext/datastore/controller.py
M ckanext/datastore/writer.py
Log Message:
-----------
[#3390] datastore json dump: use fields, records
Commit: b3b895daeb1c81e7149c5bea3bae73767739a37b
https://github.com/ckan/ckan/commit/b3b895daeb1c81e7149c5bea3bae73767739a37b
Author: Adrià Mercader <amercadero at gmail.com>
Date: 2017-01-13 (Fri, 13 Jan 2017)
Changed paths:
M CHANGELOG.rst
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/logic/schema.py
M ckan/templates/user/dashboard_organizations.html
Log Message:
-----------
Merge pull request #3385 from ckan/3385-dataset-count
group/org show include_dataset_count param
Commit: 0aec57744b20573b07e2d9ec90d35a4e6440f011
https://github.com/ckan/ckan/commit/0aec57744b20573b07e2d9ec90d35a4e6440f011
Author: Adrià Mercader <amercadero at gmail.com>
Date: 2017-01-13 (Fri, 13 Jan 2017)
Changed paths:
M ckanext/datastore/controller.py
A ckanext/datastore/writer.py
M doc/maintaining/datastore.rst
Log Message:
-----------
Merge pull request #3390 from ckan/3390-datastore-dump-formats
datastore: dump more formats
Commit: 56d171b5a4610292b723cdf14c7d3c46c8d2d23b
https://github.com/ckan/ckan/commit/56d171b5a4610292b723cdf14c7d3c46c8d2d23b
Author: tino097 <konstantin.sivakov at gmail.com>
Date: 2017-01-16 (Mon, 16 Jan 2017)
Changed paths:
M .circleci-matrix.yml
M CHANGELOG.rst
M ckan/ckan_nose_plugin.py
M ckan/i18n/fr/LC_MESSAGES/ckan.mo
M ckan/i18n/fr/LC_MESSAGES/ckan.po
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/logic/schema.py
A ckan/pastertemplates/template/ckanext/+project_shortname+/i18n/+dot+gitignore
M ckan/templates/user/dashboard_organizations.html
M ckanext/datastore/controller.py
A ckanext/datastore/writer.py
M doc/maintaining/datastore.rst
Log Message:
-----------
Merge remote-tracking branch 'upstream/master' into ckan-logo-upload
Commit: b27468f42b7a46c138091d70c7e5e7664c9516cc
https://github.com/ckan/ckan/commit/b27468f42b7a46c138091d70c7e5e7664c9516cc
Author: David Read <david.read at hackneyworkshop.com>
Date: 2017-01-16 (Mon, 16 Jan 2017)
Changed paths:
M ckan/logic/action/update.py
M ckan/tests/legacy/logic/test_action.py
M ckan/tests/logic/action/test_create.py
M ckan/tests/logic/action/test_update.py
Log Message:
-----------
Fix for package_update exception when id is missing. Modernize tests for package_create, package_update, resource_create, resource_update where its straightforward.
Commit: 7f62cd293bbf79e4b73072f1a3059ea95b2c940d
https://github.com/ckan/ckan/commit/7f62cd293bbf79e4b73072f1a3059ea95b2c940d
Author: David Read <david.read at hackneyworkshop.com>
Date: 2017-01-16 (Mon, 16 Jan 2017)
Changed paths:
M ckan/tests/logic/action/test_create.py
M ckan/tests/logic/action/test_update.py
Log Message:
-----------
pep8
Commit: c236fede8bcdbfbed7cb9dc70dd5c72d499dcc7b
https://github.com/ckan/ckan/commit/c236fede8bcdbfbed7cb9dc70dd5c72d499dcc7b
Author: tino097 <konstantin.sivakov at gmail.com>
Date: 2017-01-17 (Tue, 17 Jan 2017)
Changed paths:
M ckan/controllers/admin.py
M ckan/logic/action/update.py
M ckan/templates/macros/autoform.html
Log Message:
-----------
added logic for uploading the logo image
Commit: 9975f46788c2c7682583a0d65ccabd281eb7d956
https://github.com/ckan/ckan/commit/9975f46788c2c7682583a0d65ccabd281eb7d956
Author: David Read <david.read at hackneyworkshop.com>
Date: 2017-01-17 (Tue, 17 Jan 2017)
Changed paths:
M ckan/tests/logic/action/test_create.py
M ckan/tests/logic/action/test_update.py
Log Message:
-----------
Tidy tests.
Commit: 07ce1ec4ed368a5258bef1a689ab0c2299da8be8
https://github.com/ckan/ckan/commit/07ce1ec4ed368a5258bef1a689ab0c2299da8be8
Author: Adrià Mercader <amercadero at gmail.com>
Date: 2017-01-17 (Tue, 17 Jan 2017)
Changed paths:
M ckan/logic/action/update.py
M ckan/tests/legacy/logic/test_action.py
M ckan/tests/logic/action/test_create.py
M ckan/tests/logic/action/test_update.py
Log Message:
-----------
Merge pull request #3399 from ckan/package_update_missing_id_exception
Fix for package_update exception when id is missing.
Commit: 2a4cc29b37606e3cce5567a1337a63b9d76e465d
https://github.com/ckan/ckan/commit/2a4cc29b37606e3cce5567a1337a63b9d76e465d
Author: tino097 <konstantin.sivakov at gmail.com>
Date: 2017-01-17 (Tue, 17 Jan 2017)
Changed paths:
M ckan/controllers/admin.py
M ckan/controllers/group.py
M ckan/lib/app_globals.py
M ckan/templates/admin/config.html
M ckan/templates/macros/autoform.html
Log Message:
-----------
Image upload at admin config form enabled
Commit: cba5a9b4dc9763d23a30180e9a48a45449d85ea8
https://github.com/ckan/ckan/commit/cba5a9b4dc9763d23a30180e9a48a45449d85ea8
Author: tino097 <konstantin.sivakov at gmail.com>
Date: 2017-01-17 (Tue, 17 Jan 2017)
Changed paths:
M ckan/controllers/admin.py
Log Message:
-----------
Image upload at admin config form enabled
Commit: 9ed8c525da9a85ba7a878dd2f108a2c39411546a
https://github.com/ckan/ckan/commit/9ed8c525da9a85ba7a878dd2f108a2c39411546a
Author: tino097 <konstantin.sivakov at gmail.com>
Date: 2017-01-17 (Tue, 17 Jan 2017)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
Image upload at admin config form enabled
Commit: 55782c32892147bf127f33866ddc168a430fbfe7
https://github.com/ckan/ckan/commit/55782c32892147bf127f33866ddc168a430fbfe7
Author: tino097 <konstantin.sivakov at gmail.com>
Date: 2017-01-17 (Tue, 17 Jan 2017)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Image upload at admin config form enabled
Commit: 01547b579477e8b85a348e20a647ee8fe5d97921
https://github.com/ckan/ckan/commit/01547b579477e8b85a348e20a647ee8fe5d97921
Author: tino097 <konstantin.sivakov at gmail.com>
Date: 2017-01-18 (Wed, 18 Jan 2017)
Changed paths:
M ckan/tests/controllers/test_admin.py
Log Message:
-----------
Fix in test case, instead of ckan.site_logo is used image_url
Commit: 0a06d22e9f67420c08b84ebb38b7cbacead68774
https://github.com/ckan/ckan/commit/0a06d22e9f67420c08b84ebb38b7cbacead68774
Author: Mark Gregson <mark.gregson at linkdigital.com.au>
Date: 2017-01-19 (Thu, 19 Jan 2017)
Changed paths:
M ckan/lib/email_notifications.py
Log Message:
-----------
Use UTC when selecting activities for notification emails
Activity timestamps are stored in UTC since #3240 and Dashboard.activity_stream_last_viewed stored in UTC since #3374. All dates that can be used as the starting boundary for selecting activities must also be UTC in order to calculate the correct date and time range for the notification being sent.
Commit: 73ba6ff46a8b7b1a3bb9220089b36a439663a65c
https://github.com/ckan/ckan/commit/73ba6ff46a8b7b1a3bb9220089b36a439663a65c
Author: Adrià Mercader <amercadero at gmail.com>
Date: 2017-01-19 (Thu, 19 Jan 2017)
Changed paths:
M ckan/lib/email_notifications.py
Log Message:
-----------
Merge pull request #3410 from DataShades/notification-since-date-fix
Use UTC when selecting activities for notification emails
Commit: a5d3e46318f412bf182d91eda9831ffd43052757
https://github.com/ckan/ckan/commit/a5d3e46318f412bf182d91eda9831ffd43052757
Author: Florian Brucker <florian.brucker at mb.karlsruhe.de>
Date: 2017-01-19 (Thu, 19 Jan 2017)
Changed paths:
M ckan/lib/jobs.py
M ckan/tests/lib/test_jobs.py
Log Message:
-----------
[#3365] Dispose database engine before forking a worker
rq's workers perform their tasks in separate processes. When a worker is
forked, it inherits the global state of the parent, which in our case
included SQLAlchemy's database engine and its associated connections.
The new worker process then initializes its own engine, thereby losing
the reference to its copy of the parent's engine. The latter is now not
referenced anymore and therefore eventually garbage collected, which
includes closing the associated connections. However, these connections
have been copied from the parent and may still be in use there, so
closing them in the worker leads to errors in the main process.
This commit resolves the issue by explicitly disposing the engine and
all its associated connections before the fork. This rolls back all
non-committed changes. The engine automatically re-initializes itself
once it is used again in the parent after the fork (the worker
initializes its own separate engine directly after the fork).
While this solution is clean and deterministic it still implies that you
cannot re-use session instances and ORM instances from before the fork
after the fork. However, since workers are only started in separate
paster processes and in test cases this is not an issue in normal code.
Commit: efd930acde1bbd6049a1cf28fa91d663a91fc09e
https://github.com/ckan/ckan/commit/efd930acde1bbd6049a1cf28fa91d663a91fc09e
Author: Ian Ward <ian at excess.org>
Date: 2017-01-19 (Thu, 19 Jan 2017)
Changed paths:
M ckan/lib/jobs.py
M ckan/tests/lib/test_jobs.py
Log Message:
-----------
Merge pull request #3377 from torfsen/3365-background-job-test-failures
[#3365] Fix intermittent test failures in test_jobs
Commit: 2c3a888012092b7f160bd5ba3ba8c3e9bd1ab357
https://github.com/ckan/ckan/commit/2c3a888012092b7f160bd5ba3ba8c3e9bd1ab357
Author: tino097 <konstantin.sivakov at gmail.com>
Date: 2017-01-24 (Tue, 24 Jan 2017)
Changed paths:
M ckan/controllers/admin.py
M ckan/logic/action/update.py
M ckan/logic/schema.py
M ckan/public/base/javascript/modules/image-upload.js
M ckan/templates/macros/autoform.html
M ckan/tests/controllers/test_admin.py
Log Message:
-----------
Ckan logo uload fixed
Commit: 33a74b49e0fd04593f306ae50afae69de6cd0a9f
https://github.com/ckan/ckan/commit/33a74b49e0fd04593f306ae50afae69de6cd0a9f
Author: amercader <amercadero at gmail.com>
Date: 2017-01-25 (Wed, 25 Jan 2017)
Changed paths:
M ckan/controllers/admin.py
M ckan/logic/action/update.py
M ckan/logic/schema.py
M ckan/public/base/javascript/modules/image-upload.js
M ckan/templates/admin/config.html
M ckan/templates/macros/autoform.html
Log Message:
-----------
Merge branch 'ckan-logo-upload' of https://github.com/tino097/ckan into tino097-ckan-logo-upload
Commit: ea9d5ac1a7c2d26a52cdced5be3385953b4704d1
https://github.com/ckan/ckan/commit/ea9d5ac1a7c2d26a52cdced5be3385953b4704d1
Author: amercader <amercadero at gmail.com>
Date: 2017-01-25 (Wed, 25 Jan 2017)
Changed paths:
M ckan/controllers/admin.py
M ckan/logic/action/update.py
M ckan/logic/schema.py
M ckan/public/base/javascript/modules/image-upload.js
M ckan/templates/admin/config.html
M ckan/templates/macros/autoform.html
Log Message:
-----------
Merge branch 'tino097-ckan-logo-upload'
Commit: 031b4c0bc436a5b1cb11c4678283ce13b6574e38
https://github.com/ckan/ckan/commit/031b4c0bc436a5b1cb11c4678283ce13b6574e38
Author: amercader <amercadero at gmail.com>
Date: 2017-01-25 (Wed, 25 Jan 2017)
Changed paths:
M .circleci-matrix.yml
A .travis.yml
M CHANGELOG.rst
M Dockerfile
M ckan/ckan_nose_plugin.py
M ckan/controllers/admin.py
M ckan/i18n/fr/LC_MESSAGES/ckan.mo
M ckan/i18n/fr/LC_MESSAGES/ckan.po
M ckan/lib/dictization/model_dictize.py
M ckan/lib/email_notifications.py
M ckan/lib/helpers.py
M ckan/lib/jobs.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/schema.py
A ckan/pastertemplates/template/ckanext/+project_shortname+/i18n/+dot+gitignore
M ckan/public/base/javascript/modules/image-upload.js
M ckan/templates/admin/config.html
M ckan/templates/macros/autoform.html
M ckan/templates/user/dashboard_organizations.html
M ckan/tests/legacy/logic/test_action.py
M ckan/tests/lib/test_jobs.py
M ckan/tests/logic/action/test_create.py
M ckan/tests/logic/action/test_delete.py
M ckan/tests/logic/action/test_update.py
M ckanext/datastore/controller.py
A ckanext/datastore/writer.py
A contrib/docker/ckan-entrypoint.sh
M contrib/docker/docker-cloud.yml
M contrib/docker/docker-compose.yml
M contrib/docker/solr/Dockerfile
M doc/maintaining/datastore.rst
Log Message:
-----------
Merge branch 'master' into 3196-i18n
Compare: https://github.com/ckan/ckan/compare/d3426abfb4ca...031b4c0bc436
More information about the ckan-changes
mailing list