[ckan-changes] [okfn/ckan] 845c0e: [#2389] Move recline js and css to a snippet
GitHub
noreply at github.com
Mon Jul 9 11:25:40 UTC 2012
Branch: refs/heads/feature-2375-demo-theme
Home: https://github.com/okfn/ckan
Commit: 845c0e5769edb6a1e66a86d97e3ae67f10841363
https://github.com/okfn/ckan/commit/845c0e5769edb6a1e66a86d97e3ae67f10841363
Author: amercader <amercadero at gmail.com>
Date: 2012-05-31 (Thu, 31 May 2012)
Changed paths:
M ckan/templates/package/resource_read.html
A ckan/templates/snippets/recline-extra-footer.html
A ckan/templates/snippets/recline-extra-header.html
Log Message:
-----------
[#2389] Move recline js and css to a snippet
This will make easier to modify the libraries and load them
conditionally.
Commit: d1c82313143b77249223d6da56823c51d1255137
https://github.com/okfn/ckan/commit/d1c82313143b77249223d6da56823c51d1255137
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-18 (Mon, 18 Jun 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/user.py
Log Message:
-----------
Added route 'user/dashboard' and action 'dashboard' to user controller.
Commit: b26daa5cc74f9914de317012edd58d1d17283147
https://github.com/okfn/ckan/commit/b26daa5cc74f9914de317012edd58d1d17283147
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-19 (Tue, 19 Jun 2012)
Changed paths:
M ckan/controllers/user.py
A ckan/templates/user/dashboard.html
M ckan/templates/user/layout.html
Log Message:
-----------
New template 'dashboard.html', modified layout
Commit: 958d00408712c4a3c6b8bd535323ef7c140288de
https://github.com/okfn/ckan/commit/958d00408712c4a3c6b8bd535323ef7c140288de
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/logic/action/get.py
M ckan/model/follower.py
M ckan/templates/user/dashboard.html
Log Message:
-----------
UserFollowingUser and UserFollowingDataset classes extended to discover followed users and datasets; inlcuded in user controller and template; contains bug: no datasets are displayed
Commit: bc0caafcc6b83aa1fd6a7a5c3d078d435b8f0372
https://github.com/okfn/ckan/commit/bc0caafcc6b83aa1fd6a7a5c3d078d435b8f0372
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Add standard python coding standards.
Commit: c8147bed3fb4dfddf969d2568050c53de1308361
https://github.com/okfn/ckan/commit/c8147bed3fb4dfddf969d2568050c53de1308361
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Import aron's javascript style guide.
>From http://aron.github.com/ckan-style/styleguide/javascript/
Commit: e72fa91427614493ecfab5836a6b5713b4dedfd3
https://github.com/okfn/ckan/commit/e72fa91427614493ecfab5836a6b5713b4dedfd3
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Promote the javascript sub-sections so they appear in TOC
Commit: 9b64dd9975ba30a3fdc0826801e7ea79a183bf1b
https://github.com/okfn/ckan/commit/9b64dd9975ba30a3fdc0826801e7ea79a183bf1b
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/logic/action/get.py
M ckan/model/activity.py
M ckan/templates/user/dashboard.html
Log Message:
-----------
Unified activity stream implemented
unified means activities of the user, of the users being followed by the user and of the datasets being followed by the user
Commit: 5cefb0980a698045751245b2bed2ccbd51222894
https://github.com/okfn/ckan/commit/5cefb0980a698045751245b2bed2ccbd51222894
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Import aron's html style guide.
>From http://aron.github.com/ckan-style/styleguide/html/
Commit: 2eaae78ca266a46819950b2e866f32400ba333fd
https://github.com/okfn/ckan/commit/2eaae78ca266a46819950b2e866f32400ba333fd
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Import aron's css style guide.
>From http://aron.github.com/ckan-style/styleguide/css/
Commit: d0b3da6f5a15f4f3b33e64999bc5493cd099d887
https://github.com/okfn/ckan/commit/d0b3da6f5a15f4f3b33e64999bc5493cd099d887
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Tidying up of coding-standards restructured text
Commit: ca7b65a202dfc01104367cf8bb281b768c35bf7e
https://github.com/okfn/ckan/commit/ca7b65a202dfc01104367cf8bb281b768c35bf7e
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Moving python coding standards up the document.
Commit: 7fa53634b8163bc99f66d3c9ff4f2ecd0cae9899
https://github.com/okfn/ckan/commit/7fa53634b8163bc99f66d3c9ff4f2ecd0cae9899
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M ckan/lib/helpers.py
M ckan/public/css/style.css
M ckan/templates/user/dashboard.html
Log Message:
-----------
Bug fixing, UI refinement
Commit: 7aef1cd36df8dcd10a093f533dbdd5781cf35261
https://github.com/okfn/ckan/commit/7aef1cd36df8dcd10a093f533dbdd5781cf35261
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M ckan/templates/layout_base.html
Log Message:
-----------
Click on User tile redirects to dashboard
Commit: 495f7e1ecf3347f22135f4c4bc0dae8202a1db4b
https://github.com/okfn/ckan/commit/495f7e1ecf3347f22135f4c4bc0dae8202a1db4b
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/templates/layout_base.html
Log Message:
-----------
user/me redirects to dashboard
Commit: 6c4e2c14a65783b5b4ffd4679d9db99556a529cd
https://github.com/okfn/ckan/commit/6c4e2c14a65783b5b4ffd4679d9db99556a529cd
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Add further information about the check-in policy.
Commit: 96383a63a77e73a3f2c12a12c04e16337955fa5f
https://github.com/okfn/ckan/commit/96383a63a77e73a3f2c12a12c04e16337955fa5f
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M ckan/config/routing.py
M ckan/templates/user/layout.html
Log Message:
-----------
added route /user/read
Commit: 57aea6e7132d8ac6ca9eba44b0f9d6a25eeb1c98
https://github.com/okfn/ckan/commit/57aea6e7132d8ac6ca9eba44b0f9d6a25eeb1c98
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-20 (Wed, 20 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Add info about making changes to models.
>From the CKAN wiki: http://wiki.ckan.org/Making_changes_to_model_code
Commit: fa81fcab7302e6c6e75f220df592e20f826e8d4f
https://github.com/okfn/ckan/commit/fa81fcab7302e6c6e75f220df592e20f826e8d4f
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M ckan/model/follower.py
Log Message:
-----------
Update comments
Commit: 43bfa72795db57a19771f8fde3b2e4ce54e44f17
https://github.com/okfn/ckan/commit/43bfa72795db57a19771f8fde3b2e4ce54e44f17
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Add information about writing action layer code.
Commit: 306a3982908d249c329f231172e33813ab5bdc17
https://github.com/okfn/ckan/commit/306a3982908d249c329f231172e33813ab5bdc17
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M doc/coding-standards.rst
M doc/writing-extensions.rst
Log Message:
-----------
[#2437] Add link to details about writing extensions.
Commit: 859eab8c9efb5c85237f7c3ef46041e5295a9acb
https://github.com/okfn/ckan/commit/859eab8c9efb5c85237f7c3ef46041e5295a9acb
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M doc/coding-standards.rst
A doc/release-cycle.rst
Log Message:
-----------
[#2437] Add information about the release cycle.
Commit: acbeab430826683d4a49b1d28d8b94daf7ea33c6
https://github.com/okfn/ckan/commit/acbeab430826683d4a49b1d28d8b94daf7ea33c6
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Add information about testing.
Commit: 43c7d093146b03d2f73e60686e28c6e170037ec1
https://github.com/okfn/ckan/commit/43c7d093146b03d2f73e60686e28c6e170037ec1
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] More instruction about particular areas of the codebase.
Commit: 15e3d4d46d59cf64c640e7636e47b9e41fef9d4b
https://github.com/okfn/ckan/commit/15e3d4d46d59cf64c640e7636e47b9e41fef9d4b
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Move testing section into CKAN-specfic section.
Commit: b1e1ba2db2454ac80473ffe6b2c189022553c6f1
https://github.com/okfn/ckan/commit/b1e1ba2db2454ac80473ffe6b2c189022553c6f1
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-21 (Thu, 21 Jun 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Correct formatting
Commit: e759ef98adf6de7f25ebcd925d16d4ab4359e192
https://github.com/okfn/ckan/commit/e759ef98adf6de7f25ebcd925d16d4ab4359e192
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-22 (Fri, 22 Jun 2012)
Changed paths:
M ckan/controllers/api.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/user.py
M ckan/lib/authenticator.py
M ckan/lib/base.py
M ckan/lib/create_test_data.py
M ckan/lib/helpers.py
M ckan/lib/search/__init__.py
M ckan/logic/__init__.py
M ckan/public/scripts/application.js
M ckan/templates/js_strings.html
M ckan/templates/package/layout.html
A ckan/templates/snippets/follow_button.html
M ckan/templates/user/layout.html
M ckan/tests/logic/test_action.py
M doc/solr-setup.rst
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: db7481921ba37e7b044ea59360d90cc934149b74
https://github.com/okfn/ckan/commit/db7481921ba37e7b044ea59360d90cc934149b74
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-23 (Sat, 23 Jun 2012)
Changed paths:
M doc/install-from-source.rst
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
Log Message:
-----------
Update and simplify install instructions
Update the install instructions so that they work with both Ubuntu 12.04 and
Ubuntu 10.04 without modification (and should work on other systems with little
modification). Also shorten and simplify the instructions.
- Add pip to the required packages that are apt-get installed, instead of
installing it with easy_install.
- Add --no-site-packages to the virtualenv command, the previous command made
a virtualenv with site packages on Ubuntu 10.04 and a virtualenv without site
packages on Ubuntu 12.04, because the default behaviour of virtualenv has
changed. Without site packages is better as it means virtualenvs will be the
same on different people's systems.
- Remove the part about apt-get installing some Python modules on Ubuntu 10.04,
this only works on Ubuntu 10.04 and not even on other versions of Ubuntu, and
it requires site packages which complicates things, just tell everyone to pip
install all the Python modules into their virtualenvs instead.
- Merge the three pip requirements files into one
- Remove pastescript==1.7.3 from the requirements file, a newer version of
pastescript already gets installed as a dependency of one of the earlier
packages, then trying to install this older version makes pip crash.
- Remove the --ignore-installed option from pip install commands, not needed
now that we're using --no-site-packages.
- There's no need to deacticate and reactivate your virtualenv
- Generally edit the instructions, aim to make them shorter and easier to
follow quickly without having to read it all carefully
- I also tried to make the language a little friendlier and less formal in a
few places, e.g. You're done! instead of You are finished, etc.
Commit: 896e2a9e8918e46e75affcc9cf738acb361862a5
https://github.com/okfn/ckan/commit/896e2a9e8918e46e75affcc9cf738acb361862a5
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-23 (Sat, 23 Jun 2012)
Changed paths:
M doc/solr-setup.rst
Log Message:
-----------
Add i386 JAVA_HOME example to solr install instructions
Commit: 3c6ec2ee0dbce59ba4b53d097fa5a17ea26ff67b
https://github.com/okfn/ckan/commit/3c6ec2ee0dbce59ba4b53d097fa5a17ea26ff67b
Author: amercader <amercadero at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M doc/release-cycle.rst
Log Message:
-----------
[#2437] Minor edit on release cycle docs
Commit: 2bf11bb1b18ce0190c007d1604f485d8c50a9073
https://github.com/okfn/ckan/commit/2bf11bb1b18ce0190c007d1604f485d8c50a9073
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/config/environment.py
M ckan/controllers/admin.py
M ckan/controllers/authorization_group.py
M ckan/controllers/datastore.py
M ckan/controllers/error.py
M ckan/controllers/feed.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/template.py
M ckan/controllers/user.py
M ckan/lib/accept.py
M ckan/lib/celery_app.py
M ckan/lib/search/__init__.py
M ckan/lib/search/common.py
M ckan/tests/functional/test_group.py
M ckan/tests/test_versions.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: bd65dea8fd781eb725c7e7b4797e19baa9001a0e
https://github.com/okfn/ckan/commit/bd65dea8fd781eb725c7e7b4797e19baa9001a0e
Author: John Glover <j at johnglover.net>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/lib/i18n.py
Log Message:
-----------
[2518] Allow custom i18n directory.
Custom i18n directory can be set via the config
option ckan.i18n_directory.
Commit: c191cacedd9bf502435f77ce97e2924aea5ae837
https://github.com/okfn/ckan/commit/c191cacedd9bf502435f77ce97e2924aea5ae837
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/config/middleware.py
M ckan/lib/i18n.py
Log Message:
-----------
[#2524] Add functionality for none supplied locale
Commit: c9435c4296fa5de58cbe96f9bdc0be5744a5f731
https://github.com/okfn/ckan/commit/c9435c4296fa5de58cbe96f9bdc0be5744a5f731
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/config/environment.py
M ckan/controllers/admin.py
M ckan/controllers/authorization_group.py
M ckan/controllers/datastore.py
M ckan/controllers/error.py
M ckan/controllers/feed.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/template.py
M ckan/controllers/user.py
M ckan/lib/accept.py
M ckan/lib/celery_app.py
M ckan/lib/search/__init__.py
M ckan/lib/search/common.py
Log Message:
-----------
Merge branch 'master' into defect-2289-i18n-flash
Commit: c632dbb383e1397b620f069ed68eb9d1a8bb5c32
https://github.com/okfn/ckan/commit/c632dbb383e1397b620f069ed68eb9d1a8bb5c32
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#2289] flash messages now translated for logging in
Commit: 3b5cac80b612a6f5597b9faa931ef737cca95708
https://github.com/okfn/ckan/commit/3b5cac80b612a6f5597b9faa931ef737cca95708
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M pip-requirements.txt
Log Message:
-----------
[#2428] Install PyUtilib from PyPI not svn
Commit: d8a31186372b1609bd1274187d350f13731e1997
https://github.com/okfn/ckan/commit/d8a31186372b1609bd1274187d350f13731e1997
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#2289] minor bugfix
Commit: 3eea09976742d1f3021d49a7613fb6338c195f48
https://github.com/okfn/ckan/commit/3eea09976742d1f3021d49a7613fb6338c195f48
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M doc/install-from-source.rst
Log Message:
-----------
[#2592] Fix up descriptions of required packages
and remove subversion from the list, no longer needed
Commit: 64d4887d05dd367ac031c765e62c50408c121160
https://github.com/okfn/ckan/commit/64d4887d05dd367ac031c765e62c50408c121160
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M pip-requirements.txt
Log Message:
-----------
[#2592] Add comment to pip requirements file
Commit: e4b0dd2b94da1c893a17f8db98d03e2376cdda2b
https://github.com/okfn/ckan/commit/e4b0dd2b94da1c893a17f8db98d03e2376cdda2b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M doc/install-from-source.rst
Log Message:
-----------
[#2592] Remove subversion from apt-get install command
Commit: 8fe263dd67b1c37ff2672b8a986d4d544bb5ea10
https://github.com/okfn/ckan/commit/8fe263dd67b1c37ff2672b8a986d4d544bb5ea10
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M doc/install-from-source.rst
Log Message:
-----------
[#2592] Put ~ back on cd command
Commit: 099164e1455a7958bd61bcc371a96fb82ca72ca1
https://github.com/okfn/ckan/commit/099164e1455a7958bd61bcc371a96fb82ca72ca1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/config/environment.py
M ckan/controllers/admin.py
M ckan/controllers/authorization_group.py
M ckan/controllers/datastore.py
M ckan/controllers/error.py
M ckan/controllers/feed.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/template.py
M ckan/controllers/user.py
M ckan/lib/accept.py
M ckan/lib/celery_app.py
M ckan/lib/search/__init__.py
M ckan/lib/search/common.py
Log Message:
-----------
Merge branch 'master', remote-tracking branch 'origin' into 2592-update-source-install-docs
Commit: 5d0780f563b0920c475176d0142d79989a5d76ed
https://github.com/okfn/ckan/commit/5d0780f563b0920c475176d0142d79989a5d76ed
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/tests/test_plugins.py
Log Message:
-----------
[#2428] Fix some tests that were failing
due to pyutilib upgrade
Commit: cb283b1bd116992c4b49604c92decb82967f31a5
https://github.com/okfn/ckan/commit/cb283b1bd116992c4b49604c92decb82967f31a5
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M doc/solr-setup.rst
Log Message:
-----------
[#2592] Fix broken path in solr setup instructions
Commit: 5f010600f6d4c837ca79c245f3c4b4ce1a54f8c9
https://github.com/okfn/ckan/commit/5f010600f6d4c837ca79c245f3c4b4ce1a54f8c9
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M doc/test.rst
Log Message:
-----------
Minor fixes to test instructions
Commit: 33f85396ca978dd3f3b85602f266ea6da93b0c10
https://github.com/okfn/ckan/commit/33f85396ca978dd3f3b85602f266ea6da93b0c10
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 2592-update-source-install-docs
Commit: 8e7f6b7d061c2a08148a15d78e31e0cc7fedd9ec
https://github.com/okfn/ckan/commit/8e7f6b7d061c2a08148a15d78e31e0cc7fedd9ec
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/tests/test_plugins.py
Log Message:
-----------
[#2592] allow old and new pyutillib behaviour for tests
Commit: 5cee5021f2bd482ee304b71c863c55aad38bd7c0
https://github.com/okfn/ckan/commit/5cee5021f2bd482ee304b71c863c55aad38bd7c0
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/tests/test_plugins.py
Log Message:
-----------
Revert "[#2592] allow old and new pyutillib behaviour for tests"
This reverts commit 8e7f6b7d061c2a08148a15d78e31e0cc7fedd9ec.
Commit: 6960a0fafa92d109b9a627c4deacdf6a2a03ac83
https://github.com/okfn/ckan/commit/6960a0fafa92d109b9a627c4deacdf6a2a03ac83
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckanext/organizations/forms.py
M ckanext/organizations/templates/organization_package_form.html
Log Message:
-----------
Stops users adding datasets without organizations set.
Changes the schema in organization_dataset to make sure that the package
has an organization set, and removes the None option from the dropdown.
Commit: 0516bf557838287ad4a4162bc2985732f9f9dad3
https://github.com/okfn/ckan/commit/0516bf557838287ad4a4162bc2985732f9f9dad3
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckanext/organizations/forms.py
Log Message:
-----------
PEP8ificiation
Commit: bb4b36e575a6a5575b6c22ca641982d2309f06cf
https://github.com/okfn/ckan/commit/bb4b36e575a6a5575b6c22ca641982d2309f06cf
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M doc/solr-setup.rst
Log Message:
-----------
Fix a broken path in solr setup instructions
Commit: 8550c0cd5de62fe52a2b6d862f9891e0650a412e
https://github.com/okfn/ckan/commit/8550c0cd5de62fe52a2b6d862f9891e0650a412e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M pip-requirements.txt
Log Message:
-----------
[#2428] Upgrade routes requirement to 1.12
Commit: 2e426d7b885ab8c33e0d1343cce6006dd42dc13c
https://github.com/okfn/ckan/commit/2e426d7b885ab8c33e0d1343cce6006dd42dc13c
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M doc/install-from-source.rst
Log Message:
-----------
[#2592] Remove more requirements from install
Remove mercurial, libxml2, libxslt, wget and build-essential
requirements from install instructions
Commit: 507c5a6ae636aac7d26d2f3755b77f42da896918
https://github.com/okfn/ckan/commit/507c5a6ae636aac7d26d2f3755b77f42da896918
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Log Message:
-----------
Merge branch '2592-update-source-install-docs' of github.com:okfn/ckan into 2592-update-source-install-docs
Commit: c2bae5740ea210af201082e2cc45f5deba28fa32
https://github.com/okfn/ckan/commit/c2bae5740ea210af201082e2cc45f5deba28fa32
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M doc/install-from-source.rst
Log Message:
-----------
[#2592] Make location of virtualenv optional
Commit: a160c34d0fd6f39b5fd3910d34b718227ef19d06
https://github.com/okfn/ckan/commit/a160c34d0fd6f39b5fd3910d34b718227ef19d06
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/logic/schema.py
M ckan/tests/lib/test_dictization_schema.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 2592-update-source-install-docs
Commit: a136ff5e9a1c9f6dc27b698ffd698d3c6521238e
https://github.com/okfn/ckan/commit/a136ff5e9a1c9f6dc27b698ffd698d3c6521238e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M doc/install-from-source.rst
Log Message:
-----------
[#2592] Tweak install from source intro
Commit: a341d7675b176b88a753016d7c1491c7a3df4779
https://github.com/okfn/ckan/commit/a341d7675b176b88a753016d7c1491c7a3df4779
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/environment.py
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/authorization_group.py
M ckan/controllers/datastore.py
M ckan/controllers/error.py
M ckan/controllers/feed.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/template.py
M ckan/controllers/user.py
M ckan/lib/accept.py
M ckan/lib/authenticator.py
M ckan/lib/base.py
M ckan/lib/celery_app.py
M ckan/lib/create_test_data.py
M ckan/lib/helpers.py
M ckan/lib/search/__init__.py
M ckan/lib/search/common.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/auth/create.py
M ckan/logic/auth/publisher/create.py
M ckan/logic/schema.py
M ckan/public/scripts/application.js
M ckan/templates/js_strings.html
M ckan/templates/package/layout.html
A ckan/templates/snippets/follow_button.html
M ckan/templates/user/layout.html
M ckan/tests/functional/test_group.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/logic/test_action.py
M ckan/tests/test_versions.py
M doc/solr-setup.rst
Log Message:
-----------
Merge commit
Commit: 03a00570d2b17234b316ac48020690a0467b3371
https://github.com/okfn/ckan/commit/03a00570d2b17234b316ac48020690a0467b3371
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/model/follower.py
M ckan/templates/user/dashboard.html
M ckan/tests/functional/test_user.py
Log Message:
-----------
Pulled controller functionality into helper function
Commit: e955ec7b30cd85c77da06c85488522415ffa4f8e
https://github.com/okfn/ckan/commit/e955ec7b30cd85c77da06c85488522415ffa4f8e
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/model/follower.py
Log Message:
-----------
Merge branch 'feature-2305-dashboard-activity-stream' of https://github.com/kunsv/ckan into feature-2305-dashboard-activity-stream
Conflicts:
ckan/model/follower.py
Commit: bbfd131b42bccf9ea976e1802ecf66550f1a5c24
https://github.com/okfn/ckan/commit/bbfd131b42bccf9ea976e1802ecf66550f1a5c24
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/tests/functional/api/test_follow.py
Log Message:
-----------
Some tests added
Commit: d8734c0064d0f1264408fc20d332c42b7ab09019
https://github.com/okfn/ckan/commit/d8734c0064d0f1264408fc20d332c42b7ab09019
Author: amercader <amercadero at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
M ckan/templates/js_strings.html
Log Message:
-----------
[#2389] Remove Datastore option from the resource form
The datastore checkbox was confusing so we simplified the process. All
resources have the datastore potentially enabled, and only after an
actual write, the controller sets the 'webstore_url' extra to active.
Commit: 8ebf3118f717f7b7deaeedbe6644b311f43d1a23
https://github.com/okfn/ckan/commit/8ebf3118f717f7b7deaeedbe6644b311f43d1a23
Author: amercader <amercadero at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M ckan/controllers/datastore.py
Log Message:
-----------
[#2389,#2472] Remove datastore enabled checks from controller
Datastore is now enabled by default for all resources. When something is
posted to the datastore, the 'webstore_url' extra is set to 'active'.
Also replaced model calls with logic functions.
Commit: 30f663496a4a83c64a50d2668df90b1d860efe53
https://github.com/okfn/ckan/commit/30f663496a4a83c64a50d2668df90b1d860efe53
Author: amercader <amercadero at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M pip-requirements-test.txt
Log Message:
-----------
[#2604] Add requests as requirement for tests
Commit: 33f42937f1f1cb2c524dcc20e0f32734f6a05bc2
https://github.com/okfn/ckan/commit/33f42937f1f1cb2c524dcc20e0f32734f6a05bc2
Author: amercader <amercadero at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M pip-requirements-test.txt
Log Message:
-----------
[#2604] Add requests as requirement for tests
Commit: 16320b20476295c20f7602b542d4f3b085c698dc
https://github.com/okfn/ckan/commit/16320b20476295c20f7602b542d4f3b085c698dc
Author: amercader <amercadero at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M ckan/tests/functional/test_datastore.py
Log Message:
-----------
[#2389] New tests for the datastore
A mock class mimics Nginx forwarding requests to Elastic Search, so we
can actually test what is being returned.
Commit: eba1856526076ddaa5e0ac6667ba0e0a6f8f2b5d
https://github.com/okfn/ckan/commit/eba1856526076ddaa5e0ac6667ba0e0a6f8f2b5d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M doc/install-from-source.rst
M doc/test.rst
Log Message:
-----------
[#2592] Replace pyenv with ~/pyenv in docs
Commit: f485f2e944acf2382aca8867c3a89d26016e49cf
https://github.com/okfn/ckan/commit/f485f2e944acf2382aca8867c3a89d26016e49cf
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M doc/install-from-source.rst
Log Message:
-----------
[#2592] stop tip being quoted
Commit: 42a65080d886d1575f54615d1a4f2440a7f10e4c
https://github.com/okfn/ckan/commit/42a65080d886d1575f54615d1a4f2440a7f10e4c
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M ckan/logic/auth/publisher/create.py
M ckan/logic/schema.py
M ckan/tests/lib/test_dictization_schema.py
M ckanext/organizations/templates/organization_layout.html
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: 9da63242265940de1ddff6ad727be0a450ac6107
https://github.com/okfn/ckan/commit/9da63242265940de1ddff6ad727be0a450ac6107
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M ckan/logic/auth/publisher/create.py
M ckanext/organizations/templates/organization_layout.html
Log Message:
-----------
Merge branch 'master' into 2592-update-source-install-docs
Commit: f34883f0c6789d4f4ad2c5b524b6377bce0c1535
https://github.com/okfn/ckan/commit/f34883f0c6789d4f4ad2c5b524b6377bce0c1535
Author: amercader <amercadero at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M CHANGELOG.txt
M ckan/logic/auth/publisher/create.py
M ckan/tests/test_plugins.py
M ckanext/organizations/templates/organization_layout.html
M doc/install-from-source.rst
M doc/solr-setup.rst
M doc/test.rst
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: de5c8549995dd178ea910757750876c677a2ff04
https://github.com/okfn/ckan/commit/de5c8549995dd178ea910757750876c677a2ff04
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
[#2592] add changelog comment
Commit: be7112e70b2242f4eae7876cdf14e0d9fb4a9a53
https://github.com/okfn/ckan/commit/be7112e70b2242f4eae7876cdf14e0d9fb4a9a53
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M CHANGELOG.txt
M ckan/tests/test_plugins.py
M doc/install-from-source.rst
M doc/solr-setup.rst
M doc/test.rst
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
Log Message:
-----------
Merge branch '2592-update-source-install-docs'
Commit: 152cf537ca09ebad8e8d9fcb6bdf37f8b36feae1
https://github.com/okfn/ckan/commit/152cf537ca09ebad8e8d9fcb6bdf37f8b36feae1
Author: John Glover <j at johnglover.net>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/schema-1.4.xml
M ckan/lib/search/index.py
M ckan/tests/logic/test_tag_vocab.py
Log Message:
-----------
[1732] Fix tag facet list when using vocab tags.
Removes vocab tags from tag list when indexing.
Adds vocab tags to their own dynamic field called
vocab_<vocab name>.
Commit: a03c9605ab7d7ecbae90b1d40f0f052a73b0f410
https://github.com/okfn/ckan/commit/a03c9605ab7d7ecbae90b1d40f0f052a73b0f410
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M ckan/controllers/api.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
Dashboard now available through API; API tests modified
Commit: e2e5041940bee1d661723cedb3127ae98e65c8eb
https://github.com/okfn/ckan/commit/e2e5041940bee1d661723cedb3127ae98e65c8eb
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M CHANGELOG.txt
M ckan/logic/auth/publisher/create.py
M ckan/logic/schema.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/test_plugins.py
M ckanext/organizations/templates/organization_layout.html
M doc/install-from-source.rst
M doc/solr-setup.rst
M doc/test.rst
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
Log Message:
-----------
Merge branch 'master' into defect-2289-i18n-flash
Commit: 8aaaf0bfcbd0817be82efe5de0307450c620c5d8
https://github.com/okfn/ckan/commit/8aaaf0bfcbd0817be82efe5de0307450c620c5d8
Author: John Glover <j at johnglover.net>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M CHANGELOG.txt
M ckan/logic/auth/publisher/create.py
M ckan/tests/test_plugins.py
M ckanext/organizations/templates/organization_layout.html
M doc/install-from-source.rst
M doc/solr-setup.rst
M doc/test.rst
M pip-requirements-test.txt
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into 1732-feature-facet-by-vocabs
Commit: 1c3361322b6be982615ac793db2b2fc1a456585a
https://github.com/okfn/ckan/commit/1c3361322b6be982615ac793db2b2fc1a456585a
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M ckan/tests/functional/test_activity.py
Log Message:
-----------
brief test for dashboard activtities
Commit: bad89a82900b154a86606b13d219d81e6893fbe0
https://github.com/okfn/ckan/commit/bad89a82900b154a86606b13d219d81e6893fbe0
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M ckan/templates/user/dashboard.html
Log Message:
-----------
user encouragement added
Commit: 392e9be79d2104d3e71f2305e742c82d39761941
https://github.com/okfn/ckan/commit/392e9be79d2104d3e71f2305e742c82d39761941
Author: Sven R. Kunze <kunsv at hrz.tu-chemnitz.de>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M CHANGELOG.txt
M ckan/logic/auth/publisher/create.py
M ckan/tests/test_plugins.py
M ckanext/organizations/templates/organization_layout.html
M doc/install-from-source.rst
M doc/solr-setup.rst
M doc/test.rst
M pip-requirements-test.txt
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
Log Message:
-----------
Merge branch 'master' of git://github.com/okfn/ckan into feature-2305-dashboard-activity-stream
Commit: bd817df3cda3b0fc2e7a20d0b4808c022215cf50
https://github.com/okfn/ckan/commit/bd817df3cda3b0fc2e7a20d0b4808c022215cf50
Author: amercader <amercadero at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M ckan/public/scripts/application.js
M ckan/public/scripts/vendor/recline/recline.js
M ckan/templates/js_strings.html
Log Message:
-----------
[#2389] Try to make the data explorer fail with more dignity
Adds some checks for DataStore and DataProxy backends. Recline does not
make easy to catch exceptions and errors while initializing, but
hopefully this will cover the most common cases.
Note: includes a small patch on recline.js, which will be ported
upstream.
Commit: 7f59a58e15dfc1d2498534ef0d474cc7ea08d2b9
https://github.com/okfn/ckan/commit/7f59a58e15dfc1d2498534ef0d474cc7ea08d2b9
Author: amercader <amercadero at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M doc/datastore.rst
Log Message:
-----------
Update datastore docs
Commit: 57edefe385abf276c6874e6f7ce30b7621eca122
https://github.com/okfn/ckan/commit/57edefe385abf276c6874e6f7ce30b7621eca122
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/tests/functional/test_user.py
Log Message:
-----------
Remove print statements from test_user.py
Commit: 3cc2f81745260c3569991758452adf32b5fb0289
https://github.com/okfn/ckan/commit/3cc2f81745260c3569991758452adf32b5fb0289
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/model/activity.py
Log Message:
-----------
[#2347] Don't add foreign keys to activity model
Don't want to have to do a db migrate for this branch
Commit: 59b3297bae4461b47037071db26ec80e18eef81a
https://github.com/okfn/ckan/commit/59b3297bae4461b47037071db26ec80e18eef81a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/config/routing.py
M ckan/templates/user/layout.html
Log Message:
-----------
[#2347] Remove an unnecessary route, fix link
Commit: c72c53c28ac32ed64159df263c6acb76238740bd
https://github.com/okfn/ckan/commit/c72c53c28ac32ed64159df263c6acb76238740bd
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/public/css/style.css
Log Message:
-----------
[#2305] Remove some duplicated css
Commit: 5e165b9e38f716b38907e3ac3e162f62c221d0d9
https://github.com/okfn/ckan/commit/5e165b9e38f716b38907e3ac3e162f62c221d0d9
Author: amercader <amercadero at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/public/scripts/application.js
M ckan/tests/functional/test_datastore.py
Log Message:
-----------
[#2389] Fix silly errors on datastore tests
Commit: 06ac119c0565001e9a11f9483e2aab6032fa3edf
https://github.com/okfn/ckan/commit/06ac119c0565001e9a11f9483e2aab6032fa3edf
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
Add follow feature to CHANGELOG
Commit: f84b110e38bae47a4cfb05ea062c6d52ed6f144a
https://github.com/okfn/ckan/commit/f84b110e38bae47a4cfb05ea062c6d52ed6f144a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
[#2305] Add follow api to changelog
Commit: 40189ee0f34c2dfb46e7363fd8281c7bf884b15a
https://github.com/okfn/ckan/commit/40189ee0f34c2dfb46e7363fd8281c7bf884b15a
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M CHANGELOG.txt
M ckan/tests/test_plugins.py
M doc/install-from-source.rst
M doc/solr-setup.rst
M doc/test.rst
M pip-requirements-test.txt
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: c8bc38c62e86a6c834c82fbad78ab233515ead43
https://github.com/okfn/ckan/commit/c8bc38c62e86a6c834c82fbad78ab233515ead43
Author: amercader <amercadero at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
Log Message:
-----------
[#2389] Fix tests that were failing if 'error' was present on the JS strings
Commit: 0d234d78452b47f60677cc2ada342b9852fc5007
https://github.com/okfn/ckan/commit/0d234d78452b47f60677cc2ada342b9852fc5007
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/routing.py
M ckan/controllers/api.py
M ckan/controllers/user.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/model/follower.py
M ckan/public/css/style.css
A ckan/templates/user/dashboard.html
M ckan/templates/user/layout.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_user.py
Log Message:
-----------
Merge branch 'feature-2305-dashboard-activity-stream'
Commit: 2c2bf5405bfae1381314f859300461991101960e
https://github.com/okfn/ckan/commit/2c2bf5405bfae1381314f859300461991101960e
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/routing.py
M ckan/controllers/api.py
M ckan/controllers/user.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/model/follower.py
M ckan/public/css/style.css
A ckan/templates/user/dashboard.html
M ckan/templates/user/layout.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_user.py
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: d290e736397f26be37191f3fadedebe8690804b1
https://github.com/okfn/ckan/commit/d290e736397f26be37191f3fadedebe8690804b1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
[#2592] Add new source install instructions to CHANGELOG
Commit: 890e95ffa81a30e657be1ae693824725b5a942ba
https://github.com/okfn/ckan/commit/890e95ffa81a30e657be1ae693824725b5a942ba
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/controllers/related.py
Log Message:
-----------
Indents the related tab when looking at a list of related items
Commit: fcc52c04adc14276e99e66cb5adb63674f8d3fbe
https://github.com/okfn/ckan/commit/fcc52c04adc14276e99e66cb5adb63674f8d3fbe
Author: amercader <amercadero at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/controllers/package.py
Log Message:
-----------
Remove unnecessary exception params that were causing tests to fail due to Unicode issues
Commit: 9ac8976d20a785abafad6f78d40f2699e6aa31a9
https://github.com/okfn/ckan/commit/9ac8976d20a785abafad6f78d40f2699e6aa31a9
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/lib/i18n.py
Log Message:
-----------
[#2289] include discovered locales
Commit: f50cd42e3065dde811b133b9266e444a9b1b9a2c
https://github.com/okfn/ckan/commit/f50cd42e3065dde811b133b9266e444a9b1b9a2c
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/validators.py
A ckan/templates/activity_streams/follow_dataset.html
A ckan/templates/activity_streams/follow_user.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_activity.py
Log Message:
-----------
[#2615] Add activities when following something
Add activity stream activities when a user starts to follow a dataset or
another user.
Commit: 52de660da3cd4b84b0ed62e9c7885b065ef76953
https://github.com/okfn/ckan/commit/52de660da3cd4b84b0ed62e9c7885b065ef76953
Author: amercader <amercadero at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckanext/stats/templates/ckanext/stats/index.html
Log Message:
-----------
Fix stats extension frontend
Commit: fea640d621a5006a600a2b7a67d972010d31da95
https://github.com/okfn/ckan/commit/fea640d621a5006a600a2b7a67d972010d31da95
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckanext/stats/templates/ckanext/stats/index.html
Log Message:
-----------
Do not load excanvas.js in IE 9
IE 9 natively supports the canvas element and loading this fallback
will break Flot.
Commit: d70799823cb2dd585708440523801cf2f71aae7c
https://github.com/okfn/ckan/commit/d70799823cb2dd585708440523801cf2f71aae7c
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
A ckan/public/scripts/vendor/flot/0.7/excanvas.js
Log Message:
-----------
Add excanvas to flot vendor directory
Commit: d1e76cc9d82793209d8d9369981c0e1d6bd97709
https://github.com/okfn/ckan/commit/d1e76cc9d82793209d8d9369981c0e1d6bd97709
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckanext/stats/templates/ckanext/stats/index.html
Log Message:
-----------
Load flot locally rather than from CDN
Commit: c550b6a49930b7e7918123cf13edd848db9d3672
https://github.com/okfn/ckan/commit/c550b6a49930b7e7918123cf13edd848db9d3672
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/public/scripts/vendor/html5shiv/html5.js
Log Message:
-----------
Upgrade html5shiv to latest release candidate
This includes nice functionality for overriding the default behaviour
which is required to use excanvas.js.
Commit: ab7bcaedaea0b96b80674bb33ee2f7340cbcc47d
https://github.com/okfn/ckan/commit/ab7bcaedaea0b96b80674bb33ee2f7340cbcc47d
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckanext/stats/templates/ckanext/stats/index.html
Log Message:
-----------
Disable html5shiv overriding method on stats page
This was conflicting with the excanvas library used to render the
flot graphs in IE.
Commit: 30e4d440f0d6bfd6014b40eb0cbadac3bf1d73f7
https://github.com/okfn/ckan/commit/30e4d440f0d6bfd6014b40eb0cbadac3bf1d73f7
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckanext/stats/templates/ckanext/stats/index.html
Log Message:
-----------
Remove trailing commas from all objects in stats page
These choke IE and cause the graphs not to render.
Commit: b9b9b7859c6cb9162da6430e9b49ecd22610a86f
https://github.com/okfn/ckan/commit/b9b9b7859c6cb9162da6430e9b49ecd22610a86f
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckanext/stats/templates/ckanext/stats/index.html
Log Message:
-----------
Add link to excanvas thread on the net
Commit: 23f57d93549e45277584996ac6eb1680401c0e0c
https://github.com/okfn/ckan/commit/23f57d93549e45277584996ac6eb1680401c0e0c
Author: Aron Carroll <self at aroncarroll.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/public/scripts/application.js
Log Message:
-----------
Fix trailing commas in application.js
This prevents exceptions being thrown in IE
Commit: 0588164a70c4b406b41f7808652bedf06514753b
https://github.com/okfn/ckan/commit/0588164a70c4b406b41f7808652bedf06514753b
Author: amercader <amercadero at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckanext/stats/controller.py
M ckanext/stats/templates/ckanext/stats/index.html
Log Message:
-----------
Move logic from template to controller
Commit: 53baba208e350a0619300a79d755026e7ce6dea1
https://github.com/okfn/ckan/commit/53baba208e350a0619300a79d755026e7ce6dea1
Author: amercader <amercadero at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/config/solr/CHANGELOG.txt
Log Message:
-----------
[#1732] Update schema CHANGELOG (no new version)
Commit: 308fd73395f7f4960ce17a4da7fd6a3a3db57bc2
https://github.com/okfn/ckan/commit/308fd73395f7f4960ce17a4da7fd6a3a3db57bc2
Author: amercader <amercadero at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/schema-1.4.xml
M ckan/lib/search/index.py
M ckan/tests/logic/test_tag_vocab.py
Log Message:
-----------
Merge branch '1732-feature-facet-by-vocabs'
Commit: 5dd74fb1f9a1ffda82d89d1d53f24f69c25bb134
https://github.com/okfn/ckan/commit/5dd74fb1f9a1ffda82d89d1d53f24f69c25bb134
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
[#2615] Use get_action() to get activity_create
Commit: c9e0e044494d0500bfdd88023e0a03b8a7012125
https://github.com/okfn/ckan/commit/c9e0e044494d0500bfdd88023e0a03b8a7012125
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/lib/i18n.py
Log Message:
-----------
[#2289] add some docstrings etc to lib/i18n
Commit: 646e551881c54c54b120f68f36205bb7207b53fc
https://github.com/okfn/ckan/commit/646e551881c54c54b120f68f36205bb7207b53fc
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/tests/lib/test_tag_search.py
Log Message:
-----------
[#2439] Allow query parameter to be a list of strings
As well as a single string.
Commit: 903bd62d06392eb211925b4f63d2ee89570bbb78
https://github.com/okfn/ckan/commit/903bd62d06392eb211925b4f63d2ee89570bbb78
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/lib/search/query.py
M ckan/logic/action/get.py
M ckan/tests/logic/test_tag.py
Log Message:
-----------
[#2439] Mark fields parameter as deprecated
... in tag_search and tag_autocomplete.
Commit: fbf984e150fc5d6e050a554dd750c5fd85e4e216
https://github.com/okfn/ckan/commit/fbf984e150fc5d6e050a554dd750c5fd85e4e216
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/validators.py
A ckan/templates/activity_streams/follow_dataset.html
A ckan/templates/activity_streams/follow_user.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_activity.py
Log Message:
-----------
Merge branch '2615-activities_for_follow'
Commit: a719c132afe400ea038a4340c09d46c1a34ea068
https://github.com/okfn/ckan/commit/a719c132afe400ea038a4340c09d46c1a34ea068
Author: Toby <toby.junk at gmail.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
[xs] whitespace fixes of test
Commit: 85310d44b79ddab590e687c23441b7e244243171
https://github.com/okfn/ckan/commit/85310d44b79ddab590e687c23441b7e244243171
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M doc/apiv3.rst
Log Message:
-----------
[#2439] Update to docs
Commit: 47f2aa5c9fc355769a33d83eb9078fc4cfa5cc0e
https://github.com/okfn/ckan/commit/47f2aa5c9fc355769a33d83eb9078fc4cfa5cc0e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
[#2345] Add new action API autodocs to CHANGELOG
Commit: db21610e18d2a054e6d8ef3e162f862e902a66ae
https://github.com/okfn/ckan/commit/db21610e18d2a054e6d8ef3e162f862e902a66ae
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/schema-1.4.xml
M ckan/controllers/package.py
M ckan/lib/search/index.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/validators.py
M ckan/public/scripts/application.js
A ckan/public/scripts/vendor/flot/0.7/excanvas.js
M ckan/public/scripts/vendor/html5shiv/html5.js
A ckan/templates/activity_streams/follow_dataset.html
A ckan/templates/activity_streams/follow_user.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_activity.py
M ckan/tests/logic/test_tag_vocab.py
M ckanext/stats/controller.py
M ckanext/stats/templates/ckanext/stats/index.html
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: 881f287ff7b65b1949838f5554481f27659fd1c9
https://github.com/okfn/ckan/commit/881f287ff7b65b1949838f5554481f27659fd1c9
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/schema-1.4.xml
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/lib/search/index.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/validators.py
M ckan/public/scripts/application.js
A ckan/public/scripts/vendor/flot/0.7/excanvas.js
M ckan/public/scripts/vendor/html5shiv/html5.js
A ckan/templates/activity_streams/follow_dataset.html
A ckan/templates/activity_streams/follow_user.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_activity.py
M ckan/tests/logic/test_tag_vocab.py
M ckanext/stats/controller.py
M ckanext/stats/templates/ckanext/stats/index.html
Log Message:
-----------
Merge branch 'master' of https://github.com/okfn/ckan
Commit: bfb48c0a1f0d3b6b518c41a9fe5d41bc0641aaf8
https://github.com/okfn/ckan/commit/bfb48c0a1f0d3b6b518c41a9fe5d41bc0641aaf8
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M ckan/logic/auth/publisher/create.py
Log Message:
-----------
2601 Ensuring users not in a group cannot add datasets
When publisher auth is enabled only users who are in a group/org should
be able to add a dataset.
Commit: 15a3ae9f04d765882a00c68aa7c934a6aa51d4f9
https://github.com/okfn/ckan/commit/15a3ae9f04d765882a00c68aa7c934a6aa51d4f9
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
rePEP8ification
Commit: 1bca3b5853ef318ee02d6303e70e147440b2c9d2
https://github.com/okfn/ckan/commit/1bca3b5853ef318ee02d6303e70e147440b2c9d2
Author: kindly <kindly at gmail.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M ckan/config/middleware.py
M ckan/controllers/user.py
M ckan/lib/i18n.py
Log Message:
-----------
Merge branch 'defect-2289-i18n-flash'
Commit: 54e8722bdb38ba66e9566c09c44c25edeb29aa07
https://github.com/okfn/ckan/commit/54e8722bdb38ba66e9566c09c44c25edeb29aa07
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M ckan/lib/search/query.py
Log Message:
-----------
[#2439] Sanitise method parameters.
And comment reason for making the list copy.
Response to feedback from code-review.
Commit: 5fa209a41e2b01faf629ce9fa91bb8c7eb172ed5
https://github.com/okfn/ckan/commit/5fa209a41e2b01faf629ce9fa91bb8c7eb172ed5
Author: amercader <amercadero at gmail.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M ckan/tests/functional/test_datastore.py
Log Message:
-----------
[#2389] Be more strict when checking for ES
Commit: 71278f801b6bf734c7a9a5ddb745c556c0c3d866
https://github.com/okfn/ckan/commit/71278f801b6bf734c7a9a5ddb745c556c0c3d866
Author: amercader <amercadero at gmail.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M ckan/tests/functional/test_authz.py
Log Message:
-----------
[#2389] Yet more failing errors if 'error' was present on the JS strings
Commit: f04cdbca0ef62d24061ba1e72517d09c8e2f6f7f
https://github.com/okfn/ckan/commit/f04cdbca0ef62d24061ba1e72517d09c8e2f6f7f
Author: amercader <amercadero at gmail.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M CHANGELOG.txt
R Coding_Standards.rst
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/schema-1.4.xml
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/authorization_group.py
M ckan/controllers/datastore.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/related.py
M ckan/controllers/revision.py
M ckan/controllers/storage.py
M ckan/controllers/tag.py
M ckan/controllers/template.py
M ckan/controllers/user.py
A ckan/i18n/check_po_files.py
M ckan/lib/accept.py
M ckan/lib/authenticator.py
M ckan/lib/base.py
M ckan/lib/celery_app.py
M ckan/lib/create_test_data.py
M ckan/lib/helpers.py
M ckan/lib/i18n.py
M ckan/lib/repoze_patch.py
M ckan/lib/search/__init__.py
M ckan/lib/search/common.py
M ckan/lib/search/index.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/auth/create.py
M ckan/logic/auth/publisher/create.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/follower.py
M ckan/model/tag.py
M ckan/public/css/style.css
M ckan/public/scripts/application.js
A ckan/public/scripts/vendor/flot/0.7/excanvas.js
M ckan/public/scripts/vendor/html5shiv/html5.js
A ckan/templates/activity_streams/follow_dataset.html
A ckan/templates/activity_streams/follow_user.html
M ckan/templates/js_strings.html
M ckan/templates/package/layout.html
A ckan/templates/snippets/follow_button.html
A ckan/templates/user/dashboard.html
M ckan/templates/user/layout.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_tag_vocab.py
M ckan/tests/test_plugins.py
M ckan/tests/test_versions.py
M ckanext/multilingual/tests/test_multilingual_plugin.py
M ckanext/organizations/templates/organization_layout.html
M ckanext/organizations/templates/organization_read.html
M ckanext/stats/controller.py
M ckanext/stats/templates/ckanext/stats/index.html
A doc/coding-standards.rst
M doc/configuration.rst
M doc/geospatial.rst
A doc/harvesting.rst
M doc/index.rst
A doc/install-from-package-amazon.rst
A doc/install-from-package-virtualbox.rst
M doc/install-from-package.rst
M doc/install-from-source.rst
M doc/post-installation.rst
M doc/solr-setup.rst
M doc/test.rst
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
M setup.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' into feature-2389-better-dataexplorer-error-handling
Conflicts:
ckan/controllers/datastore.py
ckan/templates/js_strings.html
Commit: 2df478db3968b7dffcc472d10f83884b18a01c59
https://github.com/okfn/ckan/commit/2df478db3968b7dffcc472d10f83884b18a01c59
Author: amercader <amercadero at gmail.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M ckan/controllers/datastore.py
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
M ckan/public/scripts/vendor/recline/recline.js
M ckan/templates/js_strings.html
M ckan/templates/package/resource_read.html
A ckan/templates/snippets/recline-extra-footer.html
A ckan/templates/snippets/recline-extra-header.html
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_datastore.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M doc/datastore.rst
Log Message:
-----------
Merge branch 'feature-2389-better-dataexplorer-error-handling'
Commit: 3676cfe1ba104271007407077e2caebfd187b930
https://github.com/okfn/ckan/commit/3676cfe1ba104271007407077e2caebfd187b930
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/schema-1.4.xml
M ckan/controllers/api.py
M ckan/controllers/datastore.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/user.py
M ckan/lib/helpers.py
M ckan/lib/i18n.py
M ckan/lib/search/index.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/auth/publisher/create.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/follower.py
M ckan/public/css/style.css
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
A ckan/public/scripts/vendor/flot/0.7/excanvas.js
M ckan/public/scripts/vendor/html5shiv/html5.js
M ckan/public/scripts/vendor/recline/recline.js
A ckan/templates/activity_streams/follow_dataset.html
A ckan/templates/activity_streams/follow_user.html
M ckan/templates/js_strings.html
M ckan/templates/package/resource_read.html
A ckan/templates/snippets/recline-extra-footer.html
A ckan/templates/snippets/recline-extra-header.html
A ckan/templates/user/dashboard.html
M ckan/templates/user/layout.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_datastore.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/logic/test_tag_vocab.py
M ckan/tests/test_plugins.py
M ckanext/organizations/templates/organization_layout.html
M ckanext/stats/controller.py
M ckanext/stats/templates/ckanext/stats/index.html
M doc/datastore.rst
M doc/install-from-source.rst
M doc/solr-setup.rst
M doc/test.rst
M pip-requirements-test.txt
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1601-defect-organizations-server-error
Commit: 043704464559d6258bf93f1d2cd53518d3f0a816
https://github.com/okfn/ckan/commit/043704464559d6258bf93f1d2cd53518d3f0a816
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/logic/auth/publisher/create.py
M ckanext/organizations/forms.py
M ckanext/organizations/templates/organization_package_form.html
Log Message:
-----------
Merge branch '1601-defect-organizations-server-error'
Commit: 93931067fb9126c46cfbcec6a1a8f017aca1b31b
https://github.com/okfn/ckan/commit/93931067fb9126c46cfbcec6a1a8f017aca1b31b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M CHANGELOG.txt
Log Message:
-----------
Add credit to Sven in CHANGELOG
Commit: af1f41fb48fc1e8634455b2fa3b464d28de6213d
https://github.com/okfn/ckan/commit/af1f41fb48fc1e8634455b2fa3b464d28de6213d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/templates/package/search.html
Log Message:
-----------
[#2290] Mark facet titles in search pages for translation
Commit: 33faf3e512fa888414e9b191dadb3835fb5e232f
https://github.com/okfn/ckan/commit/33faf3e512fa888414e9b191dadb3835fb5e232f
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/templates/group/read.html
Log Message:
-----------
Mark facet titles on group read page for translation
Commit: 4594319109fd4e2cd8f152216ae9214e22a8c2ca
https://github.com/okfn/ckan/commit/4594319109fd4e2cd8f152216ae9214e22a8c2ca
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M setup.py
Log Message:
-----------
Add strings from core extensions to pot file
Commit: fb782e2043d58c7015eb17ee6fe236316dc79ea9
https://github.com/okfn/ckan/commit/fb782e2043d58c7015eb17ee6fe236316dc79ea9
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckanext/organizations/controllers.py
Log Message:
-----------
Fix a string that had a lot of whitespace in it
Commit: 58d054970a1ff108678ae8ee3124c7f27eca224a
https://github.com/okfn/ckan/commit/58d054970a1ff108678ae8ee3124c7f27eca224a
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Dictize results list of resource_search action.
Looks like this action wasn't even working!
Commit: f386122015e1b8408b1f94046d8422eb2d17ac7a
https://github.com/okfn/ckan/commit/f386122015e1b8408b1f94046d8422eb2d17ac7a
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Docstring for resource_search action.
Commit: ebd9bc613ea4cea5617998cf2c669ff3f267f4dd
https://github.com/okfn/ckan/commit/ebd9bc613ea4cea5617998cf2c669ff3f267f4dd
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
Add 'q' parameter to resource_search action.
This deprecates the existing 'fields' parameter, which is not compatible
with GET-ing the resource_search action.
Commit: cc070212a450b7c716cf79e81b29ba54301709be
https://github.com/okfn/ckan/commit/cc070212a450b7c716cf79e81b29ba54301709be
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
Ensure legacy parameter, fields, still works.
Keep the old fields `parameter's` behaviour, but encourage use of the new
`query` parameter.
Commit: f8450f4f2b11308e340c83bd78d114e513717615
https://github.com/okfn/ckan/commit/f8450f4f2b11308e340c83bd78d114e513717615
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
Special chars are escaped in search terms.
Commit: aeef82cbf16656308730b3e3b9121a4828b526c2
https://github.com/okfn/ckan/commit/aeef82cbf16656308730b3e3b9121a4828b526c2
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Useful validation errors for resource_search
Commit: 966ab39183351701656786d63a193bf79898c748
https://github.com/okfn/ckan/commit/966ab39183351701656786d63a193bf79898c748
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Remove unused session object.
Commit: 79505e541263eadce6f7245e6548240499413ca1
https://github.com/okfn/ckan/commit/79505e541263eadce6f7245e6548240499413ca1
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
General tidy of resource_search action.
Commit: d4ea63a2b9c2f5dd339879269fb366f847b3ab76
https://github.com/okfn/ckan/commit/d4ea63a2b9c2f5dd339879269fb366f847b3ab76
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/tests/logic/test_action.py
Log Message:
-----------
Add reference to ticket number
Commit: dcca75713e44763645c2190cd531b30f8c99ff31
https://github.com/okfn/ckan/commit/dcca75713e44763645c2190cd531b30f8c99ff31
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Add log message warning of deprecated parameter.
Obviously this won't indicate to the action api users, only
when in library access.
Commit: 575a96470a9278dc660144743999b9c2849e114d
https://github.com/okfn/ckan/commit/575a96470a9278dc660144743999b9c2849e114d
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/lib/search/query.py
M ckan/logic/action/get.py
Log Message:
-----------
Context determines resource_search's result type.
This is provided as it allows the search api to continue to use
this action, and still provide the required result-type for the
action api.
Commit: aad834c25ce6f28cd719a59d3d89f5cc79ab533c
https://github.com/okfn/ckan/commit/aad834c25ce6f28cd719a59d3d89f5cc79ab533c
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/tests/logic/test_action.py
Log Message:
-----------
Test resource_search works with a GET request
Commit: f4b6a025618d4ae874f4ffb452365cc6301b4aa6
https://github.com/okfn/ckan/commit/f4b6a025618d4ae874f4ffb452365cc6301b4aa6
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/lib/search/query.py
Log Message:
-----------
Use the new 'query' parameter in resource_search
instead of the now deprecated 'fields' paramter.
Commit: 80781b39423084f33cacd981e8e88e9a69c4d1ce
https://github.com/okfn/ckan/commit/80781b39423084f33cacd981e8e88e9a69c4d1ce
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
Clarify translatable string.
``{field}`` is usually used to represent a substitution.
Commit: 51dd38facbf2c622b1d23213951d86f2a2695000
https://github.com/okfn/ckan/commit/51dd38facbf2c622b1d23213951d86f2a2695000
Author: Ross Jones <rossdjones at gmail.com>
Date: 2012-07-02 (Mon, 02 Jul 2012)
Changed paths:
M ckan/lib/search/query.py
M ckan/logic/action/get.py
M ckan/tests/lib/test_tag_search.py
M ckan/tests/logic/test_tag.py
M doc/apiv3.rst
Log Message:
-----------
Merge pull request #45 from okfn/2439-tag_search-and-tag_autocomplete-GETable
Looks great and all the tests pass.
Commit: 3e00ffea420bd11af64b0d2d417e3c6100b71390
https://github.com/okfn/ckan/commit/3e00ffea420bd11af64b0d2d417e3c6100b71390
Author: amercader <amercadero at gmail.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M doc/configuration.rst
Log Message:
-----------
Make synchronous search the default behaviour
Unless already loaded or explicitly disabled via the
`ckan.search.automatic_index` configuration option, the synchronous
search plugin will be loaded during startup time.
Commit: 08cba3144db70784f90c381a2139c8c035f2b63e
https://github.com/okfn/ckan/commit/08cba3144db70784f90c381a2139c8c035f2b63e
Author: amercader <amercadero at gmail.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M ckan/config/environment.py
Log Message:
-----------
PEP8 environment.py
Commit: ebc0452576384ace0ea04574b53dc7b9847096b3
https://github.com/okfn/ckan/commit/ebc0452576384ace0ea04574b53dc7b9847096b3
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M ckan/lib/search/query.py
M ckan/logic/action/get.py
M ckan/tests/lib/test_tag_search.py
M ckan/tests/logic/test_tag.py
M doc/apiv3.rst
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan
Commit: 63d82ceaea33277b21be3d336f1cd29d98959704
https://github.com/okfn/ckan/commit/63d82ceaea33277b21be3d336f1cd29d98959704
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M pip-requirements.txt
Log Message:
-----------
Update several dependencies
Replaced PyUtilib==4.0.2848 with pyutilib.component.core==4.5.3, this
avoids pulling in all the pyutilib packages and the packages they depend
on.
Updated webhelpers, solrpy, formalchemy, markupsafe, tempita, routes and
paste to the latest versions from pypi
Commit: a8dab115f0e94b7f475d15ffd6897bd03a6f81b4
https://github.com/okfn/ckan/commit/a8dab115f0e94b7f475d15ffd6897bd03a6f81b4
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M pip-requirements.txt
Log Message:
-----------
Update babel, psyco and zope dependencies
Commit: 755431512cf806b3af77a3942b613da369f719f8
https://github.com/okfn/ckan/commit/755431512cf806b3af77a3942b613da369f719f8
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M pip-requirements.txt
Log Message:
-----------
Upgrade sqlalchemy-migrate to 0.7.2 (latest)
Commit: 5629aade36916b967ffae250812e833816e0dddd
https://github.com/okfn/ckan/commit/5629aade36916b967ffae250812e833816e0dddd
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-03 (Tue, 03 Jul 2012)
Changed paths:
M pip-requirements.txt
Log Message:
-----------
Upgrade sqlalchemy to 0.7.8 (latest)
Commit: cd7974b2be434d88d937f1fbad2042413b463c48
https://github.com/okfn/ckan/commit/cd7974b2be434d88d937f1fbad2042413b463c48
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/lib/plugins.py
Log Message:
-----------
Refactor form_to_db_schema_options
Make it call self.form_to_db_schema so that the form_to_db_schema()
methods of IDatasetForm extensions get called.
Also make it call new form_to_db_schema_api_create() and
form_to_db_schema_api_update() methods which could potentially be
overridden by extensions also.
Commit: 90012807433047593f7acac22522af5bc1302ac6
https://github.com/okfn/ckan/commit/90012807433047593f7acac22522af5bc1302ac6
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/templates/package/read.html
Log Message:
-----------
Fix a crasher in package/read.html template
Sometimes c.pkg_dict has no member named groups (e.g. when there is an
active IDatasetForm plugin with a db_to_form_schema() method).
Commit: a5bedce1d321752fd083a7a4ec10e263439e713d
https://github.com/okfn/ckan/commit/a5bedce1d321752fd083a7a4ec10e263439e713d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Add db_to_form_schema method
For IDatasetForm plugins to base their db_to_form_schema() dicts on
Commit: 7f59f2539abfa009618d34deea087a97a4a94dba
https://github.com/okfn/ckan/commit/7f59f2539abfa009618d34deea087a97a4a94dba
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Rename db_to_form_schema -> db_to_form_package_schema()
Commit: 38fc15cfc0965e567444b2653ff5a36b3f33828b
https://github.com/okfn/ckan/commit/38fc15cfc0965e567444b2653ff5a36b3f33828b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/lib/plugins.py
M ckan/logic/schema.py
M ckan/tests/schema/test_schema.py
M ckanext/publisher_form/forms.py
M ckanext/test_tag_vocab_plugin.py
Log Message:
-----------
Rename package_form_schema() -> form_to_db_package_schema()
The only purpose of this schema is to be used as a base schema by
IDatasetForm plugins for their form_to_db_schema() methods, hopefully
the new name makes that clearer
Commit: c5553b8e0fdd3e0394c97880f343bee4615b2301
https://github.com/okfn/ckan/commit/c5553b8e0fdd3e0394c97880f343bee4615b2301
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
Add back in deprectated package_form_schema() for backwards compatibility
Commit: efca8cb18ca6379a51cb81e59d347ecb370ec78c
https://github.com/okfn/ckan/commit/efca8cb18ca6379a51cb81e59d347ecb370ec78c
Author: kindly <kindly at gmail.com>
Date: 2012-07-06 (Fri, 06 Jul 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
[2627] fix some more date issues when displayed
Commit: 519472c1bcf15f66e18927f775e06e5ee70724fa
https://github.com/okfn/ckan/commit/519472c1bcf15f66e18927f775e06e5ee70724fa
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Add config file argument to paster commands.
Commit: 29a06dc503681cb0ab7951ea05cf55b47d025998
https://github.com/okfn/ckan/commit/29a06dc503681cb0ab7951ea05cf55b47d025998
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
M doc/coding-standards.rst
Log Message:
-----------
[#2437] Update commit message guidelines
Commit: 4636408d71d96e961935b50f4703fdbe5c109c79
https://github.com/okfn/ckan/commit/4636408d71d96e961935b50f4703fdbe5c109c79
Author: Ian Murray <ian.murray at okfn.org>
Date: 2012-07-07 (Sat, 07 Jul 2012)
Changed paths:
M doc/coding-standards.rst
A doc/release-cycle.rst
M doc/writing-extensions.rst
Log Message:
-----------
Merge branch 'task-2437-add-coding-standards-to-ckan-docs'
Commit: 997635b6d303e96fb5c802363932cdcfe5045b17
https://github.com/okfn/ckan/commit/997635b6d303e96fb5c802363932cdcfe5045b17
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/config/solr/CHANGELOG.txt
M ckan/config/solr/schema-1.4.xml
M ckan/controllers/api.py
M ckan/controllers/datastore.py
M ckan/controllers/package.py
M ckan/controllers/related.py
M ckan/controllers/user.py
M ckan/lib/helpers.py
M ckan/lib/i18n.py
M ckan/lib/plugins.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/auth/publisher/create.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/model/follower.py
M ckan/public/css/style.css
M ckan/public/scripts/application.js
M ckan/public/scripts/templates.js
A ckan/public/scripts/vendor/flot/0.7/excanvas.js
M ckan/public/scripts/vendor/html5shiv/html5.js
M ckan/public/scripts/vendor/recline/recline.js
A ckan/templates/activity_streams/follow_dataset.html
A ckan/templates/activity_streams/follow_user.html
A ckan/templates/snippets/recline-extra-footer.html
A ckan/templates/snippets/recline-extra-header.html
A ckan/templates/user/dashboard.html
M ckan/templates_legacy/js_strings.html
M ckan/templates_legacy/user/layout.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_authz.py
M ckan/tests/functional/test_datastore.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_tag_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_tag.py
M ckan/tests/logic/test_tag_vocab.py
M ckan/tests/schema/test_schema.py
M ckan/tests/test_plugins.py
M ckanext/organizations/controllers.py
M ckanext/organizations/forms.py
M ckanext/organizations/templates/organization_package_form.html
M ckanext/publisher_form/forms.py
M ckanext/stats/controller.py
M ckanext/stats/templates/ckanext/stats/index.html
M ckanext/test_tag_vocab_plugin.py
M doc/apiv3.rst
M doc/coding-standards.rst
M doc/configuration.rst
M doc/datastore.rst
M doc/install-from-source.rst
A doc/release-cycle.rst
M doc/solr-setup.rst
M doc/test.rst
M doc/writing-extensions.rst
M pip-requirements-test.txt
M pip-requirements.txt
R requires/lucid_conflict.txt
R requires/lucid_missing.txt
R requires/lucid_present.txt
R setup.py
Log Message:
-----------
Merge branch 'master' into feature-2375-demo-theme
Conflicts:
ckan/config/environment.py
comment reformatting
ckan/controllers/user.py
redirect on login and flash message fix - keep both
ckan/lib/helpers.py
new functions in both branches - keep
ckan/lib/i18n.py
minor change
ckan/templates/group/read.html
ckan/templates/package/read.html
ckan/templates/package/resource_read.html
ckan/templates/package/search.html
ignore template changes as not relevant
doc/install-from-source.rst
less install instructions
requires/lucid_conflict.txt
requires/lucid_missing.txt
requirements jinja2/fanstatic moved to pip-requirements.txt
setup.py
use ckan i18n `ripper` not genshi
Commit: 17ff899d7da46097d490481aa2d13d84179b919f
https://github.com/okfn/ckan/commit/17ff899d7da46097d490481aa2d13d84179b919f
Author: Toby <toby.junk at gmail.com>
Date: 2012-07-09 (Mon, 09 Jul 2012)
Changed paths:
A ckan/public/base/images/ckan-logo-footer.png
M ckan/public/base/less/footer.less
M ckan/templates/footer.html
Log Message:
-----------
Merge branch 'feature-2375-demo-theme' of github.com:okfn/ckan into feature-2375-demo-theme
Compare: https://github.com/okfn/ckan/compare/9fffd893bda6...17ff899d7da4
More information about the ckan-changes
mailing list