[ckan-changes] [ckan/ckan] 44a553: [#1659] remove new_package_form.html block overrid...
GitHub
noreply at github.com
Mon Jun 30 18:55:43 UTC 2014
Branch: refs/heads/1764-solr-rubbish
Home: https://github.com/ckan/ckan
Commit: 44a5537efa41c4e64ae6a821d1ecb19e2e2cebb6
https://github.com/ckan/ckan/commit/44a5537efa41c4e64ae6a821d1ecb19e2e2cebb6
Author: Ian Ward <ian at excess.org>
Date: 2014-04-22 (Tue, 22 Apr 2014)
Changed paths:
M ckan/templates/package/new_package_form.html
Log Message:
-----------
[#1659] remove new_package_form.html block overrides
Commit: cef5fdfe533b39f32e3e826c4e6b06f1bd486c23
https://github.com/ckan/ckan/commit/cef5fdfe533b39f32e3e826c4e6b06f1bd486c23
Author: Ian Ward <ian at excess.org>
Date: 2014-04-30 (Wed, 30 Apr 2014)
Changed paths:
M ckan/public/base/less/forms.less
M ckan/templates/package/snippets/stages.html
Log Message:
-----------
[#1659] two-stage package/snippets/stages.html
Commit: beef24f7e0956ee5a5a00db0237da37ea8a52aa4
https://github.com/ckan/ckan/commit/beef24f7e0956ee5a5a00db0237da37ea8a52aa4
Author: Ian Ward <ian at excess.org>
Date: 2014-04-30 (Wed, 30 Apr 2014)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
[#1659] two-stage create package controller
Commit: 91d22ffc247db27692f1c52846f6c6fea68f40ef
https://github.com/ckan/ckan/commit/91d22ffc247db27692f1c52846f6c6fea68f40ef
Author: Ian Ward <ian at excess.org>
Date: 2014-05-01 (Thu, 01 May 2014)
Changed paths:
R ckan/templates/package/new_package_metadata.html
R ckan/templates/package/snippets/package_metadata_form.html
Log Message:
-----------
[#1659] remove package create step 3 templates
Commit: 4a2f8dc02e7777d4c830a957e8e4e6905b6921bc
https://github.com/ckan/ckan/commit/4a2f8dc02e7777d4c830a957e8e4e6905b6921bc
Author: Ian Ward <ian at excess.org>
Date: 2014-05-01 (Thu, 01 May 2014)
Changed paths:
M ckan/templates/package/snippets/resource_form.html
Log Message:
-----------
[#1659] move Finish button to resource form
Commit: 773d198102d70f7a0367bf4bb40931aaeac19069
https://github.com/ckan/ckan/commit/773d198102d70f7a0367bf4bb40931aaeac19069
Author: Ian Ward <ian at excess.org>
Date: 2014-06-05 (Thu, 05 Jun 2014)
Changed paths:
M ckan/new_tests/controllers/__init__.py
M ckan/new_tests/controllers/test_util.py
Log Message:
-----------
[#1659] move WsgiAppCase to new_tests/controllers/__init__.py
Commit: 22e24767fcca240b36e1f366772e3af4ab9bd7cd
https://github.com/ckan/ckan/commit/22e24767fcca240b36e1f366772e3af4ab9bd7cd
Author: Ian Ward <ian at excess.org>
Date: 2014-06-05 (Thu, 05 Jun 2014)
Changed paths:
M ckan/new_tests/factories.py
Log Message:
-----------
[#1659] test factory: create sysadmins with different names
Commit: 6bbc9a8a8e3acad70df00a5e9489dc041ff29f85
https://github.com/ckan/ckan/commit/6bbc9a8a8e3acad70df00a5e9489dc041ff29f85
Author: Ian Ward <ian at excess.org>
Date: 2014-06-05 (Thu, 05 Jun 2014)
Changed paths:
A ckan/new_tests/controllers/test_package.py
Log Message:
-----------
[#1659] start of new package controller tests
Commit: 529e2d98610520bf2f67bc177d6001e84e1baca8
https://github.com/ckan/ckan/commit/529e2d98610520bf2f67bc177d6001e84e1baca8
Author: Ian Ward <ian at excess.org>
Date: 2014-06-05 (Thu, 05 Jun 2014)
Changed paths:
M ckan/new_tests/controllers/__init__.py
M ckan/new_tests/controllers/test_package.py
Log Message:
-----------
[#1659] pep8
Commit: 4565b258f0c6d3312462b83c54dda6739ea4c61b
https://github.com/ckan/ckan/commit/4565b258f0c6d3312462b83c54dda6739ea4c61b
Author: Ian Ward <ian at excess.org>
Date: 2014-06-05 (Thu, 05 Jun 2014)
Changed paths:
M ckan/new_tests/controllers/test_package.py
M ckan/new_tests/controllers/test_util.py
Log Message:
-----------
[#1659] import coding standards
Commit: d5f3f714ff9747a2856dfd5e7992723d1b757304
https://github.com/ckan/ckan/commit/d5f3f714ff9747a2856dfd5e7992723d1b757304
Author: Ian Ward <ian at excess.org>
Date: 2014-06-05 (Thu, 05 Jun 2014)
Changed paths:
M ckan/new_tests/controllers/__init__.py
M ckan/new_tests/controllers/test_package.py
M ckan/new_tests/controllers/test_util.py
M ckan/new_tests/helpers.py
M ckan/templates/package/snippets/package_form.html
Log Message:
-----------
[#1659] FunctionalTestBaseClass from datapackager, use new templates
Commit: d563a35648d03d1a2e4a660affb4a84e751072be
https://github.com/ckan/ckan/commit/d563a35648d03d1a2e4a660affb4a84e751072be
Author: Ian Ward <ian at excess.org>
Date: 2014-06-05 (Thu, 05 Jun 2014)
Changed paths:
M ckan/new_tests/controllers/test_package.py
M ckan/templates/package/snippets/resource_form.html
Log Message:
-----------
[#1659] test that we can get to the resource page
Commit: 126a85cbfc3d76fe1ee4f118cb6aba93afd7cc74
https://github.com/ckan/ckan/commit/126a85cbfc3d76fe1ee4f118cb6aba93afd7cc74
Author: Ian Ward <ian at excess.org>
Date: 2014-06-05 (Thu, 05 Jun 2014)
Changed paths:
M ckan/new_tests/controllers/test_util.py
Log Message:
-----------
[#1659] fix test_util.py
Commit: 1fe73385d4cf819a7566be4671641ac7ffb56061
https://github.com/ckan/ckan/commit/1fe73385d4cf819a7566be4671641ac7ffb56061
Author: Ian Ward <ian at excess.org>
Date: 2014-06-09 (Mon, 09 Jun 2014)
Changed paths:
M ckan/new_tests/helpers.py
Log Message:
-----------
[#1659] backport version of webtest.Form.submit that works
Commit: 96e600e89e7a2e1ea7f43aa2fa7fd052d679f714
https://github.com/ckan/ckan/commit/96e600e89e7a2e1ea7f43aa2fa7fd052d679f714
Author: Ian Ward <ian at excess.org>
Date: 2014-06-09 (Mon, 09 Jun 2014)
Changed paths:
M ckan/new_tests/controllers/test_package.py
Log Message:
-----------
[#1659] test package previous button
Commit: ac4b34a607eaeccaeb1916d22bc2af0f57ac2147
https://github.com/ckan/ckan/commit/ac4b34a607eaeccaeb1916d22bc2af0f57ac2147
Author: Ian Ward <ian at excess.org>
Date: 2014-06-11 (Wed, 11 Jun 2014)
Changed paths:
M .coveragerc
M CHANGELOG.rst
M README.rst
M bin/travis-run-tests
M ckan/config/deployment.ini_tmpl
M ckan/config/middleware.py
M ckan/controllers/related.py
M ckan/controllers/user.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/get.py
M ckan/logic/converters.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/new_authz.py
M ckan/new_tests/factories.py
M ckan/new_tests/helpers.py
A ckan/new_tests/lib/test_helpers.py
A ckan/new_tests/logic/action/test_create.py
M ckan/new_tests/logic/action/test_update.py
A ckan/new_tests/logic/auth/test_create.py
M ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_converters.py
M ckan/new_tests/logic/test_validators.py
A ckan/new_tests/test_factories.py
M ckan/plugins/interfaces.py
M ckan/public/base/javascript/modules/custom-fields.js
M ckan/public/base/javascript/modules/image-upload.js
M ckan/public/base/less/forms.less
M ckan/public/base/less/layout.less
M ckan/public/base/less/media.less
M ckan/public/base/less/mixins.less
M ckan/public/base/vendor/jquery.min.js
A ckan/public/base/vendor/select2/.gitignore
A ckan/public/base/vendor/select2/LICENSE
M ckan/public/base/vendor/select2/README.md
A ckan/public/base/vendor/select2/bower.json
A ckan/public/base/vendor/select2/component.json
A ckan/public/base/vendor/select2/composer.json
A ckan/public/base/vendor/select2/package.json
A ckan/public/base/vendor/select2/release.sh
A ckan/public/base/vendor/select2/select2-bootstrap.css
M ckan/public/base/vendor/select2/select2.css
A ckan/public/base/vendor/select2/select2.jquery.json
M ckan/public/base/vendor/select2/select2.js
M ckan/public/base/vendor/select2/select2.min.js
A ckan/public/base/vendor/select2/select2_locale_ar.js
A ckan/public/base/vendor/select2/select2_locale_bg.js
A ckan/public/base/vendor/select2/select2_locale_ca.js
A ckan/public/base/vendor/select2/select2_locale_cs.js
A ckan/public/base/vendor/select2/select2_locale_da.js
A ckan/public/base/vendor/select2/select2_locale_de.js
A ckan/public/base/vendor/select2/select2_locale_el.js
A ckan/public/base/vendor/select2/select2_locale_en.js.template
A ckan/public/base/vendor/select2/select2_locale_es.js
A ckan/public/base/vendor/select2/select2_locale_et.js
A ckan/public/base/vendor/select2/select2_locale_eu.js
A ckan/public/base/vendor/select2/select2_locale_fa.js
A ckan/public/base/vendor/select2/select2_locale_fi.js
A ckan/public/base/vendor/select2/select2_locale_fr.js
A ckan/public/base/vendor/select2/select2_locale_gl.js
A ckan/public/base/vendor/select2/select2_locale_he.js
A ckan/public/base/vendor/select2/select2_locale_hr.js
A ckan/public/base/vendor/select2/select2_locale_hu.js
A ckan/public/base/vendor/select2/select2_locale_id.js
A ckan/public/base/vendor/select2/select2_locale_is.js
A ckan/public/base/vendor/select2/select2_locale_it.js
A ckan/public/base/vendor/select2/select2_locale_ja.js
A ckan/public/base/vendor/select2/select2_locale_ka.js
A ckan/public/base/vendor/select2/select2_locale_ko.js
A ckan/public/base/vendor/select2/select2_locale_lt.js
A ckan/public/base/vendor/select2/select2_locale_lv.js
A ckan/public/base/vendor/select2/select2_locale_mk.js
A ckan/public/base/vendor/select2/select2_locale_ms.js
A ckan/public/base/vendor/select2/select2_locale_nl.js
A ckan/public/base/vendor/select2/select2_locale_no.js
A ckan/public/base/vendor/select2/select2_locale_pl.js
A ckan/public/base/vendor/select2/select2_locale_pt-BR.js
A ckan/public/base/vendor/select2/select2_locale_pt-PT.js
A ckan/public/base/vendor/select2/select2_locale_ro.js
A ckan/public/base/vendor/select2/select2_locale_rs.js
A ckan/public/base/vendor/select2/select2_locale_ru.js
A ckan/public/base/vendor/select2/select2_locale_sk.js
A ckan/public/base/vendor/select2/select2_locale_sv.js
A ckan/public/base/vendor/select2/select2_locale_th.js
A ckan/public/base/vendor/select2/select2_locale_tr.js
A ckan/public/base/vendor/select2/select2_locale_uk.js
A ckan/public/base/vendor/select2/select2_locale_vi.js
A ckan/public/base/vendor/select2/select2_locale_zh-CN.js
A ckan/public/base/vendor/select2/select2_locale_zh-TW.js
M ckan/templates/footer.html
M ckan/templates/group/snippets/group_item.html
M ckan/templates/header.html
M ckan/templates/home/snippets/search.html
M ckan/templates/macros/form.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/snippets/package_form.html
M ckan/templates/page.html
M ckan/templates/snippets/facet_list.html
M ckan/templates/snippets/license.html
M ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/recaptcha.html
M ckan/templates_legacy/layout_base.html
M ckan/templates_legacy/snippets/data-viewer-embed-branded-link.html
M ckan/tests/functional/test_tracking.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_auth.py
M ckan/tests/test_coding_standards.py
M ckanext/datapusher/plugin.py
M ckanext/datastore/bin/datastore_setup.py
M ckanext/datastore/commands.py
M ckanext/example_idatasetform/plugin.py
A ckanext/example_idatasetform/plugin_v1.py
A ckanext/example_idatasetform/plugin_v2.py
A ckanext/example_idatasetform/plugin_v3.py
A ckanext/example_idatasetform/plugin_v4.py
A ckanext/example_idatasetform/templates/package/search.html
A ckanext/example_idatasetform/templates/package/snippets/additional_info.html
A ckanext/example_idatasetform/templates/package/snippets/resource_form.html
A ckanext/example_idatasetform/tests/__init__.py
A ckanext/example_idatasetform/tests/test_example_idatasetform.py
M ckanext/resourceproxy/controller.py
M ckanext/resourceproxy/tests/test_proxy.py
M ckanext/stats/__init__.py
M dev-requirements.txt
A doc/_themes/sphinx-theme-okfn
A doc/api.rst
M doc/contributing/architecture.rst
M doc/contributing/documentation.rst
M doc/contributing/frontend/index.rst
M doc/contributing/html.rst
M doc/contributing/i18n.rst
M doc/contributing/index.rst
M doc/contributing/javascript.rst
M doc/contributing/pull-requests.rst
M doc/contributing/python.rst
M doc/contributing/release-process.rst
A doc/contributing/simple-code-contributions.rst
A doc/contributing/string-i18n.rst
M doc/contributing/test.rst
M doc/contributing/testing.rst
A doc/extensions/adding-custom-fields.rst
M doc/extensions/best-practices.rst
M doc/extensions/index.rst
M doc/images/add_dataset_3.jpg
M doc/maintaining/configuration.rst
M doc/maintaining/datastore.rst
M doc/maintaining/installing/deployment.rst
M doc/theming/best-practices.rst
M doc/theming/javascript.rst
M doc/theming/static-files.rst
M doc/theming/templates.rst
M doc/user-guide.rst
M setup.py
M test-core.ini
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into two-stage-dataset-create
Conflicts:
ckan/new_tests/factories.py
ckan/new_tests/helpers.py
Commit: f9be9d27f5e2ab49fe99d98e3a1ea613cf91154e
https://github.com/ckan/ckan/commit/f9be9d27f5e2ab49fe99d98e3a1ea613cf91154e
Author: Ian Ward <ian at excess.org>
Date: 2014-06-11 (Wed, 11 Jun 2014)
Changed paths:
M ckan/new_tests/controllers/test_package.py
M ckan/new_tests/helpers.py
Log Message:
-----------
[#1659] pep8
Commit: d11b09ab6d8d2d39677e4745b632dedb78706ade
https://github.com/ckan/ckan/commit/d11b09ab6d8d2d39677e4745b632dedb78706ade
Author: Ian Ward <ian at excess.org>
Date: 2014-06-11 (Wed, 11 Jun 2014)
Changed paths:
M ckan/new_tests/factories.py
Log Message:
-----------
[#1659] merge fix
Commit: 94f2f7608b83fcf47ddfde9dbed68d258322156b
https://github.com/ckan/ckan/commit/94f2f7608b83fcf47ddfde9dbed68d258322156b
Author: Ian Ward <ian at excess.org>
Date: 2014-06-11 (Wed, 11 Jun 2014)
Changed paths:
M ckan/new_tests/helpers.py
Log Message:
-----------
[#1659] FunctionalTestBaseClass._original_config instead of .original_config
Commit: f597c8f2f2d4bf46b69a1e61d40b2375d8ad5e89
https://github.com/ckan/ckan/commit/f597c8f2f2d4bf46b69a1e61d40b2375d8ad5e89
Author: Ian Ward <ian at excess.org>
Date: 2014-06-11 (Wed, 11 Jun 2014)
Changed paths:
M ckan/new_tests/helpers.py
Log Message:
-----------
[#1659] dict() > .copy()
Commit: ec91d18aa479cd64057082ddf59acaf8b6164da0
https://github.com/ckan/ckan/commit/ec91d18aa479cd64057082ddf59acaf8b6164da0
Author: Ian Ward <ian at excess.org>
Date: 2014-06-11 (Wed, 11 Jun 2014)
Changed paths:
M ckan/new_tests/controllers/test_package.py
M ckan/new_tests/controllers/test_util.py
M ckan/new_tests/helpers.py
Log Message:
-----------
[#1659] rename FunctionalTestBaseClass to FunctionalTestBase
Commit: 44c9a506baaff982a2423c8acc36fc8ef74dae16
https://github.com/ckan/ckan/commit/44c9a506baaff982a2423c8acc36fc8ef74dae16
Author: Ian Ward <ian at excess.org>
Date: 2014-06-11 (Wed, 11 Jun 2014)
Changed paths:
M ckan/new_tests/controllers/test_package.py
Log Message:
-----------
[#1659] TestPackageControllerNew and remove create_form from method names
Commit: e07500a8512d890a3dbfe59049c9c30422581ddf
https://github.com/ckan/ckan/commit/e07500a8512d890a3dbfe59049c9c30422581ddf
Author: Ian Ward <ian at excess.org>
Date: 2014-06-11 (Wed, 11 Jun 2014)
Changed paths:
M ckan/new_tests/controllers/test_package.py
M ckan/new_tests/helpers.py
Log Message:
-----------
[#1659] FunctionalTestBase._submit_and_follow
Commit: c9fa32f8586c90296270374cee9e877882d0e85d
https://github.com/ckan/ckan/commit/c9fa32f8586c90296270374cee9e877882d0e85d
Author: Ian Ward <ian at excess.org>
Date: 2014-06-13 (Fri, 13 Jun 2014)
Changed paths:
M ckan/new_tests/helpers.py
Log Message:
-----------
[#1659] fix FunctionalTestBase._submit_and_follow
Commit: f80c6ee09d8d8de657a1fa32fd1afe2ebced9e78
https://github.com/ckan/ckan/commit/f80c6ee09d8d8de657a1fa32fd1afe2ebced9e78
Author: Ian Ward <ian at excess.org>
Date: 2014-06-13 (Fri, 13 Jun 2014)
Changed paths:
M ckan/new_tests/controllers/test_package.py
M ckan/new_tests/helpers.py
Log Message:
-----------
[#1659] title is not required (copied from name)
Commit: 03f66507972e7b9e1b2719ec01e13f8c6666150a
https://github.com/ckan/ckan/commit/03f66507972e7b9e1b2719ec01e13f8c6666150a
Author: Ian Ward <ian at excess.org>
Date: 2014-06-13 (Fri, 13 Jun 2014)
Changed paths:
M ckan/new_tests/controllers/test_package.py
Log Message:
-----------
[#1659] test_first_page_creates_draft_package
Commit: 224b9fb0450dc71f659fd459ed4ca0dd386eead6
https://github.com/ckan/ckan/commit/224b9fb0450dc71f659fd459ed4ca0dd386eead6
Author: Ian Ward <ian at excess.org>
Date: 2014-06-13 (Fri, 13 Jun 2014)
Changed paths:
M ckan/new_tests/controllers/test_package.py
Log Message:
-----------
[#1659] test_previous_next_maintains_draft_state known issue #1598
Commit: d8db8a4d171c9fc2627352b44b36abcee8323e25
https://github.com/ckan/ckan/commit/d8db8a4d171c9fc2627352b44b36abcee8323e25
Author: Ian Ward <ian at excess.org>
Date: 2014-06-13 (Fri, 13 Jun 2014)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
[#1598] don't change dataset state when returning to creation step 1
Commit: fc03233a9ded6ebae61a4fd03b92d945d52c9e48
https://github.com/ckan/ckan/commit/fc03233a9ded6ebae61a4fd03b92d945d52c9e48
Author: Ian Ward <ian at excess.org>
Date: 2014-06-16 (Mon, 16 Jun 2014)
Changed paths:
M ckan/new_tests/controllers/test_package.py
Log Message:
-----------
[#1659] factor out common startup code
Commit: a49f485c3bc3adb39324c8e215b043440c3ea8c1
https://github.com/ckan/ckan/commit/a49f485c3bc3adb39324c8e215b043440c3ea8c1
Author: Ian Ward <ian at excess.org>
Date: 2014-06-16 (Mon, 16 Jun 2014)
Changed paths:
M ckan/new_tests/controllers/test_package.py
Log Message:
-----------
[#1659] three more package new form tests
Commit: 527e14fce9f009dfd38f147201b4d32c7ea0f7c5
https://github.com/ckan/ckan/commit/527e14fce9f009dfd38f147201b4d32c7ea0f7c5
Author: Ian Ward <ian at excess.org>
Date: 2014-06-16 (Mon, 16 Jun 2014)
Changed paths:
M ckan/new_tests/controllers/test_package.py
Log Message:
-----------
[#1659] TestPackageControllerNew: use reset_db
Commit: 6a05b2111186db8b16c0beecbb977623ff82de17
https://github.com/ckan/ckan/commit/6a05b2111186db8b16c0beecbb977623ff82de17
Author: Ian Ward <ian at excess.org>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M ckan/new_tests/controllers/test_package.py
M ckan/new_tests/helpers.py
Log Message:
-----------
[#1659] FunctionalTestBase: use reset_db
Commit: d5c50d080cab20bafd9d95e6afae389253053cde
https://github.com/ckan/ckan/commit/d5c50d080cab20bafd9d95e6afae389253053cde
Author: Ian Ward <ian at excess.org>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M ckan/new_tests/controllers/test_package.py
M ckan/new_tests/helpers.py
Log Message:
-----------
[#1659] make submit_and_follow a simple function
Commit: 90d2d519cdfa85fe645d23952cd9e0b1a47498d0
https://github.com/ckan/ckan/commit/90d2d519cdfa85fe645d23952cd9e0b1a47498d0
Author: Ian Ward <ian at excess.org>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M ckan/new_tests/controllers/test_package.py
Log Message:
-----------
[#1659] make _get_package_new_page_as_sysadmin a simple function
Commit: 4c5423337ce437221b3f28e088a1b8700780dea4
https://github.com/ckan/ckan/commit/4c5423337ce437221b3f28e088a1b8700780dea4
Author: Ian Ward <ian at excess.org>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M ckan/new_tests/controllers/test_package.py
M ckan/new_tests/controllers/test_util.py
M ckan/new_tests/helpers.py
Log Message:
-----------
[#1659] call get_test_app in each test
Commit: 65fcef540a6bc0ee993cfbe4b830c9b1e76f88eb
https://github.com/ckan/ckan/commit/65fcef540a6bc0ee993cfbe4b830c9b1e76f88eb
Author: Ian Ward <ian at excess.org>
Date: 2014-06-23 (Mon, 23 Jun 2014)
Changed paths:
M ckan/new_tests/controllers/test_package.py
Log Message:
-----------
[#1659] pep8
Commit: a25f6f50a703449e3c880b556d105f2be8c0f7b4
https://github.com/ckan/ckan/commit/a25f6f50a703449e3c880b556d105f2be8c0f7b4
Author: Ian Ward <ian at excess.org>
Date: 2014-06-26 (Thu, 26 Jun 2014)
Changed paths:
M bin/travis-install-dependencies
M ckan/config/routing.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/cli.py
M ckan/lib/helpers.py
M ckan/logic/auth/create.py
M ckan/logic/auth/update.py
M ckan/new_tests/helpers.py
M ckan/new_tests/logic/auth/test_create.py
M ckan/templates/admin/base.html
A ckan/templates/admin/trash.html
M ckan/templates/footer.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates_legacy/layout_base.html
M ckan/templates_legacy/package/search.html
M ckan/tests/test_coding_standards.py
M ckanext/datapusher/plugin.py
R ckanext/datastore/bin/__init__.py
R ckanext/datastore/bin/datastore_setup.py
R ckanext/datastore/bin/set_permissions.sql
M ckanext/datastore/commands.py
M ckanext/datastore/logic/auth.py
A ckanext/datastore/set_permissions.sql
M ckanext/datastore/tests/test_create.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/snippets/package_item.html
M ckanext/example_theme/v21_custom_jquery_plugin/templates/snippets/package_item.html
M doc/contributing/python.rst
A doc/images/ckan_importing_diagram.graphml
A doc/images/ckan_importing_diagram.png
M doc/maintaining/datastore.rst
M doc/theming/best-practices.rst
M doc/theming/css.rst
M doc/theming/fanstatic.rst
M doc/theming/javascript.rst
M doc/theming/static-files.rst
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into two-stage-dataset-create
Conflicts:
ckan/new_tests/helpers.py
Commit: e43db8bd9897f2986694379ca08cf468cc7f3772
https://github.com/ckan/ckan/commit/e43db8bd9897f2986694379ca08cf468cc7f3772
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2014-06-30 (Mon, 30 Jun 2014)
Changed paths:
M ckan/controllers/package.py
A ckan/new_tests/controllers/test_package.py
M ckan/new_tests/controllers/test_util.py
M ckan/new_tests/factories.py
M ckan/new_tests/helpers.py
M ckan/public/base/less/forms.less
M ckan/templates/package/new_package_form.html
R ckan/templates/package/new_package_metadata.html
M ckan/templates/package/snippets/package_form.html
R ckan/templates/package/snippets/package_metadata_form.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/stages.html
Log Message:
-----------
Merge pull request #1659 from wardi/two-stage-dataset-create
Two-stage dataset create + introduce some functional tests for new_tests
Commit: cdf8dfd9e7b26f5b6c17b3c9086d92f0d2f608bc
https://github.com/ckan/ckan/commit/cdf8dfd9e7b26f5b6c17b3c9086d92f0d2f608bc
Author: Ian Ward <ian at excess.org>
Date: 2014-06-30 (Mon, 30 Jun 2014)
Changed paths:
M ckan/controllers/package.py
A ckan/new_tests/controllers/test_package.py
M ckan/new_tests/controllers/test_util.py
M ckan/new_tests/factories.py
M ckan/new_tests/helpers.py
M ckan/public/base/less/forms.less
M ckan/templates/package/new_package_form.html
R ckan/templates/package/new_package_metadata.html
M ckan/templates/package/snippets/package_form.html
R ckan/templates/package/snippets/package_metadata_form.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/stages.html
Log Message:
-----------
Merge branch 'master' into 1764-solr-rubbish
Conflicts:
ckan/new_tests/helpers.py
Compare: https://github.com/ckan/ckan/compare/852d3752352f...cdf8dfd9e7b2
More information about the ckan-changes
mailing list