[ckan-changes] [ckan/ckan] 80f1ec: Merge pull request #1 from ckan/master
GitHub
noreply at github.com
Tue Feb 24 11:48:35 UTC 2015
Branch: refs/heads/master
Home: https://github.com/ckan/ckan
Commit: 80f1ec090f7f2c5544e93178c87ceb867783bf06
https://github.com/ckan/ckan/commit/80f1ec090f7f2c5544e93178c87ceb867783bf06
Author: Benjamin Laot <blaot35 at gmail.com>
Date: 2015-01-31 (Sat, 31 Jan 2015)
Changed paths:
M MANIFEST.in
M ckan/__init__.py
M ckan/i18n/ar/LC_MESSAGES/ckan.mo
M ckan/i18n/ar/LC_MESSAGES/ckan.po
M ckan/i18n/bg/LC_MESSAGES/ckan.mo
M ckan/i18n/bg/LC_MESSAGES/ckan.po
M ckan/i18n/ca/LC_MESSAGES/ckan.mo
M ckan/i18n/ca/LC_MESSAGES/ckan.po
M ckan/i18n/ckan.pot
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.mo
M ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
M ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
M ckan/i18n/da_DK/LC_MESSAGES/ckan.po
M ckan/i18n/de/LC_MESSAGES/ckan.mo
M ckan/i18n/de/LC_MESSAGES/ckan.po
M ckan/i18n/dv/LC_MESSAGES/ckan.mo
M ckan/i18n/dv/LC_MESSAGES/ckan.po
M ckan/i18n/el/LC_MESSAGES/ckan.mo
M ckan/i18n/el/LC_MESSAGES/ckan.po
M ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
M ckan/i18n/en_AU/LC_MESSAGES/ckan.po
A ckan/i18n/en_CA/LC_MESSAGES/ckan.mo
A ckan/i18n/en_CA/LC_MESSAGES/ckan.po
M ckan/i18n/en_GB/LC_MESSAGES/ckan.mo
M ckan/i18n/en_GB/LC_MESSAGES/ckan.po
M ckan/i18n/es/LC_MESSAGES/ckan.mo
M ckan/i18n/es/LC_MESSAGES/ckan.po
M ckan/i18n/es_AR/LC_MESSAGES/ckan.mo
M ckan/i18n/es_AR/LC_MESSAGES/ckan.po
A ckan/i18n/es_MX/LC_MESSAGES/ckan.mo
A ckan/i18n/es_MX/LC_MESSAGES/ckan.po
A ckan/i18n/eu/LC_MESSAGES/ckan.mo
A ckan/i18n/eu/LC_MESSAGES/ckan.po
M ckan/i18n/fa_IR/LC_MESSAGES/ckan.mo
M ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
M ckan/i18n/fi/LC_MESSAGES/ckan.mo
M ckan/i18n/fi/LC_MESSAGES/ckan.po
M ckan/i18n/fr/LC_MESSAGES/ckan.mo
M ckan/i18n/fr/LC_MESSAGES/ckan.po
M ckan/i18n/he/LC_MESSAGES/ckan.mo
M ckan/i18n/he/LC_MESSAGES/ckan.po
A ckan/i18n/hr/LC_MESSAGES/ckan.mo
A ckan/i18n/hr/LC_MESSAGES/ckan.po
M ckan/i18n/hu/LC_MESSAGES/ckan.mo
M ckan/i18n/hu/LC_MESSAGES/ckan.po
M ckan/i18n/id/LC_MESSAGES/ckan.mo
M ckan/i18n/id/LC_MESSAGES/ckan.po
M ckan/i18n/is/LC_MESSAGES/ckan.mo
M ckan/i18n/is/LC_MESSAGES/ckan.po
M ckan/i18n/it/LC_MESSAGES/ckan.mo
M ckan/i18n/it/LC_MESSAGES/ckan.po
M ckan/i18n/ja/LC_MESSAGES/ckan.mo
M ckan/i18n/ja/LC_MESSAGES/ckan.po
M ckan/i18n/km/LC_MESSAGES/ckan.mo
M ckan/i18n/km/LC_MESSAGES/ckan.po
M ckan/i18n/ko_KR/LC_MESSAGES/ckan.mo
M ckan/i18n/ko_KR/LC_MESSAGES/ckan.po
A ckan/i18n/lo/LC_MESSAGES/ckan.mo
A ckan/i18n/lo/LC_MESSAGES/ckan.po
M ckan/i18n/lt/LC_MESSAGES/ckan.mo
M ckan/i18n/lt/LC_MESSAGES/ckan.po
M ckan/i18n/lv/LC_MESSAGES/ckan.mo
M ckan/i18n/lv/LC_MESSAGES/ckan.po
A ckan/i18n/mn_MN/LC_MESSAGES/ckan.mo
A ckan/i18n/mn_MN/LC_MESSAGES/ckan.po
A ckan/i18n/my/LC_MESSAGES/ckan.mo
A ckan/i18n/my/LC_MESSAGES/ckan.po
M ckan/i18n/my_MM/LC_MESSAGES/ckan.mo
M ckan/i18n/my_MM/LC_MESSAGES/ckan.po
M ckan/i18n/nl/LC_MESSAGES/ckan.mo
M ckan/i18n/nl/LC_MESSAGES/ckan.po
M ckan/i18n/no/LC_MESSAGES/ckan.mo
M ckan/i18n/no/LC_MESSAGES/ckan.po
M ckan/i18n/pl/LC_MESSAGES/ckan.mo
M ckan/i18n/pl/LC_MESSAGES/ckan.po
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.mo
M ckan/i18n/pt_BR/LC_MESSAGES/ckan.po
A ckan/i18n/pt_PT/LC_MESSAGES/ckan.mo
A ckan/i18n/pt_PT/LC_MESSAGES/ckan.po
M ckan/i18n/ro/LC_MESSAGES/ckan.mo
M ckan/i18n/ro/LC_MESSAGES/ckan.po
M ckan/i18n/ru/LC_MESSAGES/ckan.mo
M ckan/i18n/ru/LC_MESSAGES/ckan.po
M ckan/i18n/sk/LC_MESSAGES/ckan.mo
M ckan/i18n/sk/LC_MESSAGES/ckan.po
M ckan/i18n/sl/LC_MESSAGES/ckan.mo
M ckan/i18n/sl/LC_MESSAGES/ckan.po
M ckan/i18n/sq/LC_MESSAGES/ckan.mo
M ckan/i18n/sq/LC_MESSAGES/ckan.po
M ckan/i18n/sr/LC_MESSAGES/ckan.mo
M ckan/i18n/sr/LC_MESSAGES/ckan.po
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.mo
M ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po
M ckan/i18n/sv/LC_MESSAGES/ckan.mo
M ckan/i18n/sv/LC_MESSAGES/ckan.po
A ckan/i18n/sw/LC_MESSAGES/ckan.mo
A ckan/i18n/sw/LC_MESSAGES/ckan.po
A ckan/i18n/th/LC_MESSAGES/ckan.mo
A ckan/i18n/th/LC_MESSAGES/ckan.po
M ckan/i18n/tr/LC_MESSAGES/ckan.mo
M ckan/i18n/tr/LC_MESSAGES/ckan.po
M ckan/i18n/uk_UA/LC_MESSAGES/ckan.mo
M ckan/i18n/uk_UA/LC_MESSAGES/ckan.po
M ckan/i18n/vi/LC_MESSAGES/ckan.mo
M ckan/i18n/vi/LC_MESSAGES/ckan.po
M ckan/i18n/vi_VN/LC_MESSAGES/ckan.mo
M ckan/i18n/vi_VN/LC_MESSAGES/ckan.po
M ckan/i18n/zh_CN/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_CN/LC_MESSAGES/ckan.po
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.mo
M ckan/i18n/zh_TW/LC_MESSAGES/ckan.po
M ckan/lib/search/index.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/validators.py
M ckan/new_tests/controllers/test_package.py
M ckan/new_tests/lib/search/test_index.py
M ckan/new_tests/logic/action/test_get.py
M ckan/public/base/less/ckan.less
M ckan/templates/package/resource_data.html
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/resource_views_list_item.html
M ckan/templates/package/snippets/resources_list.html
M ckan/tests/logic/test_action.py
M ckanext/datapusher/cli.py
M ckanext/datapusher/plugin.py
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/plugin.py
M ckanext/datastore/tests/test_create.py
M ckanext/datastore/tests/test_db.py
A ckanext/datastore/tests/test_info.py
M ckanext/example_idatasetform/templates/package/snippets/package_metadata_fields.html
A ckanext/example_idatasetform/tests/test_controllers.py
M doc/maintaining/filestore.rst
M doc/maintaining/installing/deployment.rst
Log Message:
-----------
Merge pull request #1 from ckan/master
Pull of ckan master in this branch
Commit: 077fcd5b2e0628768bbd34202022178d789b5b26
https://github.com/ckan/ckan/commit/077fcd5b2e0628768bbd34202022178d789b5b26
Author: Benjamin Laot <blaot35 at gmail.com>
Date: 2015-02-13 (Fri, 13 Feb 2015)
Changed paths:
M CHANGELOG.rst
M ckan/config/deployment.ini_tmpl
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/lib/datapreview.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/search/index.py
M ckan/logic/action/get.py
M ckan/logic/schema.py
A ckan/migration/versions/076_rename_view_plugins_2.py
M ckan/model/user.py
M ckan/new_tests/lib/test_datapreview.py
M ckan/new_tests/logic/action/test_get.py
M ckan/plugins/interfaces.py
M ckan/plugins/toolkit.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/less/layout.less
M ckan/public/base/less/module.less
M ckan/public/base/less/search.less
M ckan/templates/package/snippets/resource_view.html
M ckan/tests/functional/test_tracking.py
M ckan/tests/logic/test_action.py
M ckanext/datastore/db.py
M ckanext/imageview/plugin.py
M ckanext/pdfview/plugin.py
M ckanext/pdfview/tests/test_view.py
M ckanext/reclineview/plugin.py
M ckanext/reclineview/theme/public/recline_view.js
M ckanext/stats/stats.py
M ckanext/stats/templates/ckanext/stats/index.html
M ckanext/stats/tests/test_stats_lib.py
M ckanext/textview/plugin.py
M ckanext/textview/tests/test_view.py
M ckanext/webpageview/plugin.py
M doc/extensions/adding-custom-fields.rst
A doc/images/image_view.png
A doc/images/manage_views.png
A doc/images/recline_graph_view.png
A doc/images/recline_grid_view.png
A doc/images/recline_map_view.png
A doc/images/recline_view.png
A doc/images/text_view.png
A doc/images/views_overview.png
A doc/images/webpage_view.png
M doc/maintaining/background-tasks.rst
M doc/maintaining/configuration.rst
M doc/maintaining/data-viewer.rst
Log Message:
-----------
Merge pull request #2 from ckan/master
Pull of ckan master in this branch
Commit: e5b74615c468c0a2e997985c6d0f3f36b1bf39fe
https://github.com/ckan/ckan/commit/e5b74615c468c0a2e997985c6d0f3f36b1bf39fe
Author: Benjamin Laot <blaot35 at gmail.com>
Date: 2015-02-13 (Fri, 13 Feb 2015)
Changed paths:
M ckan/templates/organization/member_new.html
M ckan/templates/user/read_base.html
Log Message:
-----------
Made some fields translatable #2285
Commit: e1f202c54eed8ced2a185a09c851129af67032a0
https://github.com/ckan/ckan/commit/e1f202c54eed8ced2a185a09c851129af67032a0
Author: amercader <amercadero at gmail.com>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M ckan/templates/organization/member_new.html
M ckan/templates/user/read_base.html
Log Message:
-----------
Merge branch '#2285-Made-some-fields-translatable' of https://github.com/benjaminlaot/ckan into benjaminlaot-#2285-Made-some-fields-translatable
Commit: 17f7fde21a2b5cbe03fd65970d206e33b4a94b54
https://github.com/ckan/ckan/commit/17f7fde21a2b5cbe03fd65970d206e33b4a94b54
Author: amercader <amercadero at gmail.com>
Date: 2015-02-24 (Tue, 24 Feb 2015)
Changed paths:
M ckan/templates/organization/member_new.html
M ckan/templates/user/read_base.html
Log Message:
-----------
Merge branch 'benjaminlaot-#2285-Made-some-fields-translatable'
Compare: https://github.com/ckan/ckan/compare/44f027ea31fe...17f7fde21a2b
More information about the ckan-changes
mailing list