[ckan-changes] [okfn/ckan] 73308d: [#1117] Add new_tests dir with first new logic tes...
GitHub
noreply at github.com
Mon Oct 7 17:17:21 UTC 2013
Branch: refs/heads/847-new-theming-docs
Home: https://github.com/okfn/ckan
Commit: 73308db08242a6a2ee72079b6cc87ce4b0705761
https://github.com/okfn/ckan/commit/73308db08242a6a2ee72079b6cc87ce4b0705761
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
A ckan/new_tests/__init__.py
A ckan/new_tests/data.py
A ckan/new_tests/helpers.py
A ckan/new_tests/logic/__init__.py
A ckan/new_tests/logic/action/__init__.py
A ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Add new_tests dir with first new logic tests
Eventually (before this branch is merged into master) new_tests should
become tests and the current tests should become legacy_tests.
Commit: 3491cd695ec0c9758586d219c027165256fd7012
https://github.com/okfn/ckan/commit/3491cd695ec0c9758586d219c027165256fd7012
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Add new tests for updating user names and passwords
...and also for what happens when you call user_update without a valid
id.
Commit: bc3baa951de74a61a96c10c2726b991d7ee88894
https://github.com/okfn/ckan/commit/bc3baa951de74a61a96c10c2726b991d7ee88894
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[#1117] user_update don't crash on non-string name
Don't crash if the user tries to update their user name to a value that
is not a string (which they can do, using the API)
Commit: f3165ce46cf2c2f16a79013fb23f79bdd821ca90
https://github.com/okfn/ckan/commit/f3165ce46cf2c2f16a79013fb23f79bdd821ca90
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-17 (Wed, 17 Jul 2013)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[#1117] user_update: don't crash on non-string password
Fix a crash that happens if the user tries to update their password to a
value that isn't a string (which they can do, using the API)
Commit: 41a1a727cbecfa8331b45b16bd2570c11b98af07
https://github.com/okfn/ckan/commit/41a1a727cbecfa8331b45b16bd2570c11b98af07
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Typo
Commit: 6d9f3b0ff9c2b2509cbdfb088fb76a5d161eba7e
https://github.com/okfn/ckan/commit/6d9f3b0ff9c2b2509cbdfb088fb76a5d161eba7e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M ckan/new_tests/data.py
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Make various improvements to test_update.py
- Add some notes to the top of test_update.py about what I'm trying to do with
it, these will end up in the testing guidelines
- Make the static test data read-only
- Rename some of the test methods so that they're all test_user_update_*
- Add test_user_update_activity() test
- Other small tweaks
Commit: 683852c555928f1cff99e5863e63d8568f93a9e9
https://github.com/okfn/ckan/commit/683852c555928f1cff99e5863e63d8568f93a9e9
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Add some more user_update invalid password tests
Commit: df72fcbd336e29f3efa3b2d221dcd439c183762e
https://github.com/okfn/ckan/commit/df72fcbd336e29f3efa3b2d221dcd439c183762e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Fix some bad indentation
Commit: 7d1bdc511058e19f61080593f26a04b06f86bb43
https://github.com/okfn/ckan/commit/7d1bdc511058e19f61080593f26a04b06f86bb43
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-18 (Thu, 18 Jul 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Add user_update custom schema test
Commit: 6276cb2e143bef2e108dc4c612c32832926f9b79
https://github.com/okfn/ckan/commit/6276cb2e143bef2e108dc4c612c32832926f9b79
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-19 (Fri, 19 Jul 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Add test for user_update's defer_commit option
Commit: 482c4969afb32d796c231839d2d794d28daf90ae
https://github.com/okfn/ckan/commit/482c4969afb32d796c231839d2d794d28daf90ae
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-19 (Fri, 19 Jul 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
A doc/testing-coding-standards.rst
Log Message:
-----------
[#1117] Add draft testing coding standards doc
Commit: dab8d49e6d9a89df4e940cbed4282ab5d7698576
https://github.com/okfn/ckan/commit/dab8d49e6d9a89df4e940cbed4282ab5d7698576
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
A ckan/new_tests/logic/auth/test_update.py
Log Message:
-----------
[#1117] Add a few new-style tests for user_update auth
Commit: 19b0b016d5acb3162bb7fbaf40fc9c4320f384e8
https://github.com/okfn/ckan/commit/19b0b016d5acb3162bb7fbaf40fc9c4320f384e8
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
[#1117] Never return reset_keys in user dicts
Like the user's password, there's never any reason for a user dict to
contain their reset key (even if the user dict is being generated for
the user herself or for a sysadmin)
Commit: a956b1f7de469cf89a36441c2b11d12bb5fadcc7
https://github.com/okfn/ckan/commit/a956b1f7de469cf89a36441c2b11d12bb5fadcc7
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M ckan/lib/navl/validators.py
A ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Add docstring and unit tests for ignore_missing validator
Commit: ca16b016287d013f41abd033cb95085762ac96ca
https://github.com/okfn/ckan/commit/ca16b016287d013f41abd033cb95085762ac96ca
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Add another ignore_missing test
Commit: 0365a9599e3050256879f982d5edeade1d0f3a83
https://github.com/okfn/ckan/commit/0365a9599e3050256879f982d5edeade1d0f3a83
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Add some asserts to ignore_missing tests
Commit: 262adf316d0ac4131341fbd07e4cade16531d36d
https://github.com/okfn/ckan/commit/262adf316d0ac4131341fbd07e4cade16531d36d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Tweak a unit test
Commit: 69ea1ad0ca2c0d9a4ee1faf95c25e28b64d4cfe6
https://github.com/okfn/ckan/commit/69ea1ad0ca2c0d9a4ee1faf95c25e28b64d4cfe6
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Combine three unit tests into one
Commit: e7d5c9d08ddf3153c08ee3e96ee8e6b956db7523
https://github.com/okfn/ckan/commit/e7d5c9d08ddf3153c08ee3e96ee8e6b956db7523
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Improve a unit test
Add some more realistic data and check that it doesn't get modified.
Commit: 476b8ff944eeab40f6c98a5334df69b6d6787332
https://github.com/okfn/ckan/commit/476b8ff944eeab40f6c98a5334df69b6d6787332
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Move some unit test code into helper functions
Commit: 854407ae96b0722a874dcceb14192b28eb7ffe1e
https://github.com/okfn/ckan/commit/854407ae96b0722a874dcceb14192b28eb7ffe1e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Tweak a couple of docstrings
Commit: ed12fa0f61a555baa33ef762085df2b214dd46dc
https://github.com/okfn/ckan/commit/ed12fa0f61a555baa33ef762085df2b214dd46dc
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-25 (Thu, 25 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Move some test comments into asserts
This makes the output when tests fail more useful
Unfortunately I don't see how to do this with assert_raises.
Commit: 2f8e74a0e2bb39c2fec1bf9604ab6ada764c1f2b
https://github.com/okfn/ckan/commit/2f8e74a0e2bb39c2fec1bf9604ab6ada764c1f2b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Tweak a docstring
This is easier to read I think
Commit: e5d37e1d6543522aebd58ec9bcd1ef825179d0d2
https://github.com/okfn/ckan/commit/e5d37e1d6543522aebd58ec9bcd1ef825179d0d2
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Make a unit test more realistic
Make it use the _data() and _errors() helper functions to get more
realistic (non-empty) data and errors dicts. This just makes the test a
little more thorough and realistic.
Commit: 404f06e778c6b9f2de8dea44c241769a598f2e7a
https://github.com/okfn/ckan/commit/404f06e778c6b9f2de8dea44c241769a598f2e7a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M ckan/logic/validators.py
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Add new tests and docstring for name_validator()
There are no existing tests for this that I can see.
Commit: a0a3d93ca87df5c2af629dde365fe872c4c248d9
https://github.com/okfn/ckan/commit/a0a3d93ca87df5c2af629dde365fe872c4c248d9
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Add a valid unicode name to name_validator() test
Commit: f3d0de6208486528f0e08f7edcbba70faea2dd86
https://github.com/okfn/ckan/commit/f3d0de6208486528f0e08f7edcbba70faea2dd86
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
A ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Move some validator tests into the right test module
Oops :)
Commit: f234745c5f034ce59fb919dcf5536688a664bb88
https://github.com/okfn/ckan/commit/f234745c5f034ce59fb919dcf5536688a664bb88
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M ckan/new_tests/data.py
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Move some helpers into shared test helper data module
Commit: a3485a1fa4a872abc3d29f382069f34785f72f1e
https://github.com/okfn/ckan/commit/a3485a1fa4a872abc3d29f382069f34785f72f1e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Add unit tests for user_name_validator()
Commit: 807b601f3ade09aac3f0ef0d530e947774e93975
https://github.com/okfn/ckan/commit/807b601f3ade09aac3f0ef0d530e947774e93975
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M ckan/logic/validators.py
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Fix user_password validator
Commit f3165ce (user_update: don't crash on non-string password)
unwittingly changed the behavior of user_password_validator(), causing
some legacy tests to fail:
If the given password is Missing or '' user_password_validator() should
*not* raise Invalid.
Fiux user_password_validator to not raise Invalid in these cases, so
that the tests pass again.
Commit: 51cd5d18c4005f469c6052a6bddc3275b6373cde
https://github.com/okfn/ckan/commit/51cd5d18c4005f469c6052a6bddc3275b6373cde
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M ckan/new_tests/data.py
Log Message:
-----------
[#1117] Tweak a docstring
Commit: c6b953496177ca795ac9347eaf7986edb3049ed7
https://github.com/okfn/ckan/commit/c6b953496177ca795ac9347eaf7986edb3049ed7
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[#1117] Refactor and add docstring to user_name_validator
- Add docstring
- Use model.User.get() to find whether a user exists, instead of a lot
of SQLAlchemy in ckan.logic.
This should make it easier to unit test user_name_validator() in
isolation, because the tests will only have to mock one method
ckan.model.User.get() instead of having to mock several things.
Also SQLAlchemy should just be in the model anyway, not in the logic.
- Refactor and add code comments to clarify the obscure thing that
user_name_validator() does with context['user_obj'] on user_update()s.
This was completely obscure before, now hopefully it's clearer.
(But it's a bad design anyway, user_create and user_update shouldn't
be sharing the same user_name_validator function.)
I don't *think* I broke anything by refactoring this (tests
are still passing).
Commit: 93d0d819cc68cc3e84b472eefdf4fa3f26f32c07
https://github.com/okfn/ckan/commit/93d0d819cc68cc3e84b472eefdf4fa3f26f32c07
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
Changed paths:
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Mock ckan.model in user_name_validator() tests
Now that user_name_validator() has been refactored to call
model.User.get() instead of doing its own SQLAlchemy (commit c6b953),
it's really easy to mock ckan.model in the user_name_validator() unit
tests by just mocking the single method ckan.model.User.get().
This means the user_name_validator() unit tests no longer touch the disk
or db or bring in ckan.model.
Commit: eb6fd0a5ab53f60b0a43a797abcd62a8a45d84f0
https://github.com/okfn/ckan/commit/eb6fd0a5ab53f60b0a43a797abcd62a8a45d84f0
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
A ckan/new_tests/factories.py
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Add factory_boy to action tests
Add a new module ckan.new_tests.factories with (so far) just a User factory
class that uses the factory_boy library to create CKAN users.
Update the ckan.new_tests.logic.action.test_update tests to use this
factory instead of ckan.new_tests.data.
Still need to update the rest of the new tests to use the factory (and
also add factories for other classes such as dataset etc.), then data.py
can be deleted.
Still need to add factory_boy to dev-requirements.txt.
Commit: c556fabfd5c43b3ff0e775462b0831f1d59cee99
https://github.com/okfn/ckan/commit/c556fabfd5c43b3ff0e775462b0831f1d59cee99
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
M ckan/new_tests/logic/auth/test_update.py
Log Message:
-----------
[#1117] Use factory in auth/test_update.py
Instead of data.py.
Commit: a5fe9e6e231dbc64f729427323c677d415c60744
https://github.com/okfn/ckan/commit/a5fe9e6e231dbc64f729427323c677d415c60744
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
M ckan/new_tests/factories.py
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Remove data.py from test_validators.py
Move the helper functions it was using into factories.py and make it use
that instead.
Commit: fe8eec0f4bde1f4b23d71d49584e434c78148d91
https://github.com/okfn/ckan/commit/fe8eec0f4bde1f4b23d71d49584e434c78148d91
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
R ckan/new_tests/data.py
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Use factories instead of data in navl/test_validators.py
So data.py is now unused and we can remove it.
Commit: 3e7f6900882804a1a0b9560333654306f4e8cee1
https://github.com/okfn/ckan/commit/3e7f6900882804a1a0b9560333654306f4e8cee1
Author: John Martin <me at johnmart.in>
Date: 2013-07-30 (Tue, 30 Jul 2013)
Changed paths:
M ckan/public/base/less/homepage.less
M ckan/templates/home/index.html
A ckanext/homepage/__init__.py
A ckanext/homepage/plugin.py
A ckanext/homepage/theme/templates/home/index.html
A ckanext/homepage/theme/templates/home/snippets/featured_group.html
A ckanext/homepage/theme/templates/home/snippets/featured_organization.html
A ckanext/homepage/theme/templates/home/snippets/promoted.html
A ckanext/homepage/theme/templates/home/snippets/search.html
M setup.py
Log Message:
-----------
[#1126] First run at new homepage modules core extension
Commit: 7910f78ce23a049eb5cdd53efa1f2f117f65b0b9
https://github.com/okfn/ckan/commit/7910f78ce23a049eb5cdd53efa1f2f117f65b0b9
Author: John Martin <me at johnmart.in>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M ckan/templates/admin/config.html
A ckanext/homepage/theme/templates/admin/config.html
Log Message:
-----------
[#1126] Added config for sysadmin area
Commit: a957533216a07e6e03daabb4a78cdd0a17f6695f
https://github.com/okfn/ckan/commit/a957533216a07e6e03daabb4a78cdd0a17f6695f
Author: John Martin <me at johnmart.in>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M ckan/public/base/less/homepage.less
M ckan/templates/home/index.html
M ckanext/homepage/theme/templates/home/index.html
M ckanext/homepage/theme/templates/home/snippets/featured_group.html
M ckanext/homepage/theme/templates/home/snippets/featured_organization.html
M ckanext/homepage/theme/templates/home/snippets/promoted.html
M ckanext/homepage/theme/templates/home/snippets/search.html
Log Message:
-----------
[#1126] Simplified snippets and added temporary homepage layour variable
Commit: c3c39ea055dba142228e31e63991c3bd96edbbc4
https://github.com/okfn/ckan/commit/c3c39ea055dba142228e31e63991c3bd96edbbc4
Author: John Martin <me at johnmart.in>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M ckan/controllers/home.py
M ckan/public/base/less/homepage.less
R ckanext/homepage/theme/templates/home/index.html
A ckanext/homepage/theme/templates/home/layout1.html
A ckanext/homepage/theme/templates/home/layout2.html
Log Message:
-----------
[#1126] Simplified templates for new homepage modules
Commit: 8481935e46dd473a64d9770b7c080be2edeb979f
https://github.com/okfn/ckan/commit/8481935e46dd473a64d9770b7c080be2edeb979f
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Add some helper decorators to validators tests
Add a bunch of helper decorators at the top of the file, and change the
test methods below to use them.
Commit: d8dfa43664dab6d19031aee990815951c15f09f4
https://github.com/okfn/ckan/commit/d8dfa43664dab6d19031aee990815951c15f09f4
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Add some helper decorators to validators tests
Add a bunch of helper decorators at the top of the file, and change the
test methods below to use them.
Commit: 1f9540162c1dee8609f49fb853601d4d712ee80a
https://github.com/okfn/ckan/commit/1f9540162c1dee8609f49fb853601d4d712ee80a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
R ckan/new_tests/data.py
A ckan/new_tests/factories.py
M ckan/new_tests/lib/navl/test_validators.py
M ckan/new_tests/logic/action/test_update.py
M ckan/new_tests/logic/auth/test_update.py
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
Merge branch '1117-factory_boy' into 1117-start-new-test-suite
Commit: 782fc4b166fb48e8ea1e8c5e7236e88b53950df0
https://github.com/okfn/ckan/commit/782fc4b166fb48e8ea1e8c5e7236e88b53950df0
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Remove duplicated helper decorators :/
Commit: 1bb66d777326e9ca965c4d28bf87f35da8a97df6
https://github.com/okfn/ckan/commit/1bb66d777326e9ca965c4d28bf87f35da8a97df6
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M .tx/config
M CONTRIBUTING.rst
M bin/ckan_spam.py
M bin/travis-build
R build.sh
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/config/routing.py
M ckan/controllers/admin.py
M ckan/lib/base.py
M ckan/lib/datapreview.py
M ckan/lib/dictization/model_save.py
M ckan/lib/navl/__init__.py
M ckan/lib/package_saver.py
M ckan/lib/plugins.py
M ckan/lib/render.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/model/extension.py
M ckan/model/modification.py
M ckan/model/package_relationship.py
M ckan/model/resource.py
M ckan/plugins/core.py
M ckan/public/base/css/main.css
M ckan/public/base/javascript/main.js
M ckan/public/base/javascript/modules/custom-fields.js
M ckan/public/base/javascript/modules/slug-preview.js
M ckan/public/base/javascript/plugins/jquery.slug-preview.js
R ckan/public/base/less/font-awesome.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/icons.less
M ckan/public/base/less/iehacks.less
M ckan/public/base/test/index.html
M ckan/public/base/test/spec/modules/custom-fields.spec.js
M ckan/public/base/test/spec/modules/resource-upload-field.spec.js
M ckan/public/base/test/vendor/mocha.css
M ckan/public/base/test/vendor/mocha.js
A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings-white.png
A ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
R ckan/public/base/vendor/bootstrap/img/glyphicons-halflings.png
R ckan/public/base/vendor/bootstrap/js/.jshintrc
M ckan/public/base/vendor/bootstrap/js/bootstrap.js
M ckan/public/base/vendor/bootstrap/js/bootstrap.min.js
M ckan/public/base/vendor/bootstrap/less/bootstrap.less
M ckan/public/base/vendor/bootstrap/less/dropdowns.less
M ckan/public/base/vendor/bootstrap/less/responsive.less
M ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.css
A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
M ckan/public/base/vendor/font-awesome/css/font-awesome.css
A ckan/public/base/vendor/font-awesome/css/font-awesome.min.css
M ckan/public/base/vendor/font-awesome/font/FontAwesome.otf
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.eot
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.svg
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.ttf
M ckan/public/base/vendor/font-awesome/font/fontawesome-webfont.woff
A ckan/public/base/vendor/font-awesome/less/bootstrap.less
A ckan/public/base/vendor/font-awesome/less/core.less
A ckan/public/base/vendor/font-awesome/less/extras.less
M ckan/public/base/vendor/font-awesome/less/font-awesome-ie7.less
M ckan/public/base/vendor/font-awesome/less/font-awesome.less
A ckan/public/base/vendor/font-awesome/less/icons.less
A ckan/public/base/vendor/font-awesome/less/mixins.less
A ckan/public/base/vendor/font-awesome/less/path.less
A ckan/public/base/vendor/font-awesome/less/variables.less
M ckan/public/base/vendor/jquery.js
M ckan/public/base/vendor/resource.config
M ckan/templates/ajax_snippets/related-item.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/header.html
M ckan/templates/macros/autoform.html
M ckan/templates/macros/form.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/stages.html
M ckan/templates/user/edit_user_form.html
M ckan/tests/__init__.py
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/PKG-INFO
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/SOURCES.txt
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/dependency_links.txt
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/entry_points.txt
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/not-zip-safe
R ckan/tests/ckantestplugin/ckantestplugin.egg-info/top_level.txt
R ckan/tests/ckantestplugin/ckantestplugin/__init__.py
R ckan/tests/ckantestplugin/setup.cfg
R ckan/tests/ckantestplugin/setup.py
A ckan/tests/ckantestplugins.py
M ckan/tests/functional/api/model/test_package.py
M ckan/tests/functional/api/test_revision_search.py
M ckan/tests/functional/api/test_util.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_pagination.py
M ckan/tests/functional/test_preview_interface.py
M ckan/tests/functional/test_tag_vocab.py
M ckan/tests/lib/test_resource_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/mock_plugin.py
M ckan/tests/models/test_package_relationships.py
M ckan/tests/test_coding_standards.py
M ckan/tests/test_plugins.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/plugin.py
M ckanext/datastore/tests/test_configure.py
M ckanext/datastore/tests/test_create.py
M ckanext/datastore/tests/test_dump.py
M ckanext/datastore/tests/test_search.py
M ckanext/datastore/tests/test_upsert.py
M ckanext/multilingual/tests/test_multilingual_plugin.py
M ckanext/pdfpreview/tests/test_preview.py
M ckanext/reclinepreview/tests/test_preview.py
M ckanext/resourceproxy/tests/test_proxy.py
M ckanext/stats/stats.py
M ckanext/test_tag_vocab_plugin.py
M ckanext/textpreview/plugin.py
M ckanext/textpreview/tests/test_preview.py
A doc/changelog.rst
M doc/documentation-guidelines.rst
M doc/templating.rst
M doc/upgrade-source.rst
R fabfile.py
R jshint.json
M setup.py
M test-core.ini
R test_sync.ini
R test_sync2.ini
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1117-start-new-test-suite
Commit: a541fc56c36c2df9a7f1aaee72915880a70dd748
https://github.com/okfn/ckan/commit/a541fc56c36c2df9a7f1aaee72915880a70dd748
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M doc/test.rst
Log Message:
-----------
[#1117] Remove SQLite from testing docs
Commit: a87c0ba85c8fa3777c4761fa1a2483a217210548
https://github.com/okfn/ckan/commit/a87c0ba85c8fa3777c4761fa1a2483a217210548
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M doc/test.rst
Log Message:
-----------
[#1117] Minor edits to testing docs
Commit: 7a9d31a14a271d75153a0fad2dec0d21b3571c0d
https://github.com/okfn/ckan/commit/7a9d31a14a271d75153a0fad2dec0d21b3571c0d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M dev-requirements.txt
Log Message:
-----------
[#1117] Add mock and factory-boy to dev-requirements.txt
Commit: 1267791442003c995110abb4b15792db9f2cbb94
https://github.com/okfn/ckan/commit/1267791442003c995110abb4b15792db9f2cbb94
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-07-31 (Wed, 31 Jul 2013)
Changed paths:
M dev-requirements.txt
Log Message:
-----------
Merge branch '1117-start-new-test-suite' of github.com:okfn/ckan into 1117-start-new-test-suite
Commit: 3a0bb7658395b17f60c4ee57e16866e4609c80a1
https://github.com/okfn/ckan/commit/3a0bb7658395b17f60c4ee57e16866e4609c80a1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/new_tests/factories.py
M ckan/new_tests/lib/navl/test_validators.py
M ckan/new_tests/logic/action/test_update.py
M ckan/new_tests/logic/auth/test_update.py
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] PEP8 fixes
Make the PEP8 tests happy
Commit: 282545ca9ece66eba8da9078de012ded815d2e00
https://github.com/okfn/ckan/commit/282545ca9ece66eba8da9078de012ded815d2e00
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
A __init__.py b/ckan/new_tests/lib/__init__.py
A ckan/new_tests/logic/auth/__init__.py
A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
Log Message:
-----------
[#1117] Add __init__.py files to new_tests subdirs
This means that nosetests finds the test modules when given a directory
as argument (and not just when you tell it the exact test file)
Commit: 135c59b3de2d518643d94ea5faaa033801135792
https://github.com/okfn/ckan/commit/135c59b3de2d518643d94ea5faaa033801135792
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Remove uses of assert_raises as context manager
Using assert_raises as a context manager isn't supported in Python 2.6.
Tests were failing on Travis when run with Python 2.6. Hopefully this
fixes them.
Commit: b705361263ce686bebbb107dbc8bbecde5f7abf1
https://github.com/okfn/ckan/commit/b705361263ce686bebbb107dbc8bbecde5f7abf1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/new_tests/helpers.py
M ckan/new_tests/logic/action/test_update.py
M ckan/new_tests/logic/auth/test_update.py
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Remove setup db stuff from some new test classes
Only test classes that use the db (which should be few of them) need to
do things like cleaning and initing the db. This makes the tests much
faster.
Commit: a0a2f699b156f9a5bec0e545ba5b3e51e93aabcd
https://github.com/okfn/ckan/commit/a0a2f699b156f9a5bec0e545ba5b3e51e93aabcd
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
M ckan/new_tests/logic/action/test_update.py
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Always use `as context` when doing `with nose.tools.assert_raises`
It looks like `with nose.tools.assert_raises:` without the `as context`
doesn't work in Python 2.6. In commit 135c59b3de2d518643d94ea I thought
it was the other way round. Hopefully *this* fixes the tests with Python
2.6.
Commit: cbd8d8910727bc1d0d26e06048b50096537e746e
https://github.com/okfn/ckan/commit/cbd8d8910727bc1d0d26e06048b50096537e746e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
M ckan/new_tests/logic/action/test_update.py
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Don't use `with nose.tools.assert_raises`
Third attempt to fix the new tests in Python 2.6. Looks like using
assert_raises as a context manager doesn't work in Python 2.6 at all.
Just use nose.tools.assert_raises(...) normally instead.
Commit: 6195c2935f27a588d215d4aa3514bb75d0b74f97
https://github.com/okfn/ckan/commit/6195c2935f27a588d215d4aa3514bb75d0b74f97
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/ckan_nose_plugin.py
Log Message:
-----------
[#1117] Skip ckan_nose_plugin's db stuff for new tests
Commit: 8bcccd2b7f4637f0fb0b0fd055254feb30258a05
https://github.com/okfn/ckan/commit/8bcccd2b7f4637f0fb0b0fd055254feb30258a05
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/tests/lib/test_navl.py
Log Message:
-----------
[#1117] Remove a legacy test for ignore_missing
ignore_missing() unit tests in ckan/new_tests/ have replaced this now.
Commit: e947f4aa3c4d1c5eeed58f4bf1775ac2f8e51999
https://github.com/okfn/ckan/commit/e947f4aa3c4d1c5eeed58f4bf1775ac2f8e51999
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Add a new test for updating multiple user attributes at once
Commit: 650807ecfa05e62cd34193672206b18e2329cef6
https://github.com/okfn/ckan/commit/650807ecfa05e62cd34193672206b18e2329cef6
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Add another condition to a user_update test
Commit: bdc088497a22120fbbdaccb1b97fe1f6d889b0a2
https://github.com/okfn/ckan/commit/bdc088497a22120fbbdaccb1b97fe1f6d889b0a2
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Add a test for user_update's annoying email behavior
Commit: 3baf152cb7af29789512d33490ccb7b77ee3c1ea
https://github.com/okfn/ckan/commit/3baf152cb7af29789512d33490ccb7b77ee3c1ea
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Add tests that user_update doesn't return password, apikey, etc.
Commit: 0eb154830f122819e4f896338a4b4cc38008ab04
https://github.com/okfn/ckan/commit/0eb154830f122819e4f896338a4b4cc38008ab04
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/new_tests/logic/action/test_update.py
Log Message:
-----------
[#1117] Fix silly test class name
Commit: ccc47e015be43128b8b557cb3fa41979cc1e920b
https://github.com/okfn/ckan/commit/ccc47e015be43128b8b557cb3fa41979cc1e920b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-01 (Thu, 01 Aug 2013)
Changed paths:
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
[#1117] Remove legacy user_update tests
These have been replaced by new-style tests in ckan/new_tests/
Commit: 4f341650cb2f6ce173d17434a1fbcb025ff70f46
https://github.com/okfn/ckan/commit/4f341650cb2f6ce173d17434a1fbcb025ff70f46
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-02 (Fri, 02 Aug 2013)
Changed paths:
M ckan/new_tests/logic/auth/test_update.py
Log Message:
-----------
[#1117] Add mocking to user_update auth tests
These tests now run without touching the model.
Also added one extra test case.
Commit: 081e1262e064d14f887ef121c439adb8507977c9
https://github.com/okfn/ckan/commit/081e1262e064d14f887ef121c439adb8507977c9
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-02 (Fri, 02 Aug 2013)
Changed paths:
M ckan/new_tests/helpers.py
M ckan/new_tests/logic/auth/test_update.py
Log Message:
-----------
[#1117] Move call_auth() into test helpers
Where other auth test modules can use it.
Also add a complete docstring.
Commit: f61f31910831d76b2dbff875e789ea22c201c822
https://github.com/okfn/ckan/commit/f61f31910831d76b2dbff875e789ea22c201c822
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-02 (Fri, 02 Aug 2013)
Changed paths:
M ckan/new_tests/logic/auth/test_update.py
Log Message:
-----------
[#1117] Check error messages in user_update auth tests
Commit: 15daad72548844234704b34a99b99dfabaac9064
https://github.com/okfn/ckan/commit/15daad72548844234704b34a99b99dfabaac9064
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-02 (Fri, 02 Aug 2013)
Changed paths:
M ckan/new_tests/helpers.py
Log Message:
-----------
[#1117] Optimize the reset_db() test helper function
This version is faster. Code from @joetsoi
Commit: 2f85e0bc7e45963e10b5d780df9bc3c39816464f
https://github.com/okfn/ckan/commit/2f85e0bc7e45963e10b5d780df9bc3c39816464f
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-02 (Fri, 02 Aug 2013)
Changed paths:
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Remove an unused import
Commit: 17626e4172d335e84d436c974015ee0b67c774ee
https://github.com/okfn/ckan/commit/17626e4172d335e84d436c974015ee0b67c774ee
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-02 (Fri, 02 Aug 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Add helper decorators to navl/test_validators.py
Commit: 8feecf5d4819d610dd62617b8cad8d941cef57e2
https://github.com/okfn/ckan/commit/8feecf5d4819d610dd62617b8cad8d941cef57e2
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-02 (Fri, 02 Aug 2013)
Changed paths:
M CONTRIBUTING.rst
A ckan/new_tests/controllers/__init__.py
M ckan/new_tests/factories.py
M ckan/new_tests/helpers.py
M ckan/new_tests/lib/__init__.py
M ckan/new_tests/logic/action/__init__.py
M ckan/new_tests/logic/action/test_update.py
M ckan/new_tests/logic/auth/__init__.py
M ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_schema.py
M ckan/new_tests/logic/test_validators.py
A ckan/new_tests/migration/__init__.py
A ckan/new_tests/model/__init__.py
A ckan/new_tests/plugins/__init__.py
M doc/multilingual.rst
M doc/testing-coding-standards.rst
Log Message:
-----------
[#1117] Lots of work on the testing coding standards
Commit: b16f6fe07003a5d2e3f9f95aea64a14e60a6665b
https://github.com/okfn/ckan/commit/b16f6fe07003a5d2e3f9f95aea64a14e60a6665b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-02 (Fri, 02 Aug 2013)
Changed paths:
M ckan/controllers/package.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/get.py
M ckan/new_authz.py
M doc/conf.py
M doc/upgrade-package-to-minor-release.rst
M doc/upgrade-source.rst
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1117-start-new-test-suite
Commit: 1b73733cdf5aa4a490bd4407159afbe4bddf64c9
https://github.com/okfn/ckan/commit/1b73733cdf5aa4a490bd4407159afbe4bddf64c9
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-08-02 (Fri, 02 Aug 2013)
Changed paths:
M ckan/new_tests/logic/auth/__init__.py
Log Message:
-----------
[#1117] PEP8
Commit: 669aefb71e7d4c5b72366c5dbae60d4f45bf313a
https://github.com/okfn/ckan/commit/669aefb71e7d4c5b72366c5dbae60d4f45bf313a
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2013-08-11 (Sun, 11 Aug 2013)
Changed paths:
M ckan/new_tests/helpers.py
Log Message:
-----------
[#1117] use model.repo.delete_all() in test helpers
Commit: 6b1b6f082a402a43815565a82ba407caeb07edcd
https://github.com/okfn/ckan/commit/6b1b6f082a402a43815565a82ba407caeb07edcd
Author: John Martin <me at johnmart.in>
Date: 2013-08-29 (Thu, 29 Aug 2013)
Changed paths:
M ckanext/homepage/plugin.py
M ckanext/homepage/theme/templates/home/snippets/featured_group.html
M ckanext/homepage/theme/templates/home/snippets/featured_organization.html
Log Message:
-----------
[#1126] Brings featured groups/orgs from from be06121 into this branch
It's just a slightly edited version of
https://github.com/okfn/ckan/blob/be06121/ckanext/featured/plugin.py as now
the helpers are returning data and not data+html.
Commit: 8bd5d35fc29ccf539dcee78979b80329f04bf664
https://github.com/okfn/ckan/commit/8bd5d35fc29ccf539dcee78979b80329f04bf664
Author: amercader <amercadero at gmail.com>
Date: 2013-08-29 (Thu, 29 Aug 2013)
Changed paths:
M .tx/config
M CHANGELOG.rst
M bin/travis-build
M ckan/config/deployment.ini_tmpl
M ckan/config/middleware.py
M ckan/config/solr/schema-2.0.xml
M ckan/controllers/feed.py
A ckan/i18n/ar/LC_MESSAGES/ckan.mo
A 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
A ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
A 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
A ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
A ckan/i18n/en_AU/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
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/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
A ckan/i18n/km/LC_MESSAGES/ckan.mo
A 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
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
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
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
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/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/dictization/model_dictize.py
M ckan/lib/formatters.py
M ckan/lib/helpers.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/search/__init__.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/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
A ckan/migration/versions/069_resource_url_and_metadata_modified.py
A ckan/migration/versions/070_add_activity_and_resource_indexes.py
M ckan/model/activity.py
M ckan/model/package.py
M ckan/model/resource.py
M ckan/new_authz.py
M ckan/plugins/core.py
M ckan/plugins/interfaces.py
M ckan/templates/group/snippets/group_form.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/snippets/activity_item.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_package.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_action.py
A ckan/tests/models/test_activity.py
M ckan/tests/models/test_package.py
M ckan/tests/test_plugins.py
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/logic/schema.py
M ckanext/datastore/plugin.py
M ckanext/datastore/tests/test_create.py
M ckanext/datastore/tests/test_dump.py
M ckanext/multilingual/solr/schema.xml
M ckanext/reclinepreview/theme/public/resource.config
M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
M ckanext/resourceproxy/controller.py
M ckanext/resourceproxy/tests/test_proxy.py
M dev-requirements.txt
M doc/conf.py
M doc/configuration.rst
M doc/data-viewer.rst
M doc/datastore.rst
M doc/documentation-guidelines.rst
M doc/install-from-source.rst
M doc/test.rst
M doc/upgrade-package-to-minor-release.rst
M doc/upgrade-package-to-patch-release.rst
M doc/upgrade-source.rst
M doc/upgrading.rst
A pip-requirements-docs.txt
A requirements.in
M requirements.txt
M setup.py
Log Message:
-----------
Merge branch 'master' into 1117-start-new-test-suite
Commit: bf28f1a1a1a0b05fb17f4e8b3e5684f199120709
https://github.com/okfn/ckan/commit/bf28f1a1a1a0b05fb17f4e8b3e5684f199120709
Author: kindly <kindly at gmail.com>
Date: 2013-09-05 (Thu, 05 Sep 2013)
Changed paths:
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
M ckan/templates/admin/config.html
M ckanext/homepage/plugin.py
R ckanext/homepage/theme/templates/admin/config.html
Log Message:
-----------
add stats and make homepage_style config option
Commit: 87d0b8b520e1f4860bec04b2a6e5edd67a40b33e
https://github.com/okfn/ckan/commit/87d0b8b520e1f4860bec04b2a6e5edd67a40b33e
Author: joetsoi <joe.yeung.tsoi at gmail.com>
Date: 2013-09-06 (Fri, 06 Sep 2013)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
[#1228] strip whitespace from title in model_dictize.package_dictize
Commit: 6327e2454ae5a98df9e71ecd27725aa0ea9f2e2d
https://github.com/okfn/ckan/commit/6327e2454ae5a98df9e71ecd27725aa0ea9f2e2d
Author: Ian Ward <ian at excess.org>
Date: 2013-09-09 (Mon, 09 Sep 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#772] explaion plugin loading order
Commit: 0c8bbd171f6b919de112f1f33045c0475aae6402
https://github.com/okfn/ckan/commit/0c8bbd171f6b919de112f1f33045c0475aae6402
Author: John Martin <me at johnmart.in>
Date: 2013-09-10 (Tue, 10 Sep 2013)
Changed paths:
M ckan/controllers/admin.py
M ckan/controllers/home.py
M ckan/public/base/less/homepage.less
M ckanext/homepage/theme/templates/home/layout2.html
A ckanext/homepage/theme/templates/home/layout3.html
A ckanext/homepage/theme/templates/home/snippets/stats.html
Log Message:
-----------
[#1126] Added stats and new layouts 2 and 3 for homepage
Commit: 569987d68ef1d4c63d71e48eb12a798cac57a59f
https://github.com/okfn/ckan/commit/569987d68ef1d4c63d71e48eb12a798cac57a59f
Author: Dominik Moritz <domoritz at gmail.com>
Date: 2013-09-10 (Tue, 10 Sep 2013)
Changed paths:
M ckan/templates/snippets/organization.html
Log Message:
-----------
[#1235] Add image block to be able to replace only the image easily
Commit: 50acd34cb95d73adb7213d2c6be54fe4ff71e2a0
https://github.com/okfn/ckan/commit/50acd34cb95d73adb7213d2c6be54fe4ff71e2a0
Author: Dominik Moritz <domoritz at gmail.com>
Date: 2013-09-10 (Tue, 10 Sep 2013)
Changed paths:
M ckan/templates/header.html
Log Message:
-----------
[#1235] Add block for content of container to allow people to add something to the left of the account block
Commit: cab8f8008edb6781a6d053df4095a8e23ef8550a
https://github.com/okfn/ckan/commit/cab8f8008edb6781a6d053df4095a8e23ef8550a
Author: John Martin <me at johnmart.in>
Date: 2013-09-12 (Thu, 12 Sep 2013)
Changed paths:
M ckan/templates/organization/member_new.html
Log Message:
-----------
[#1214] Removed unecessary closed div as it was breaking the templates
Commit: fea743c9289371ecbbb9c2d013d8f176ed8f4b27
https://github.com/okfn/ckan/commit/fea743c9289371ecbbb9c2d013d8f176ed8f4b27
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-09-12 (Thu, 12 Sep 2013)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
Fix bug in (group|organization)_member_create
According to the documentation, the "username" parameter accepts either name or
id, but the code only accepted name. I've fixed it to accept both.
Commit: f03e409b6e8eed6633cf530ff8cf08b882d1b726
https://github.com/okfn/ckan/commit/f03e409b6e8eed6633cf530ff8cf08b882d1b726
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-09-12 (Thu, 12 Sep 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#848] Fix configuration name search.facet.limits -> search.facet.limit
Commit: 43afc32641e9d09293ebb5276f1098598770ff3a
https://github.com/okfn/ckan/commit/43afc32641e9d09293ebb5276f1098598770ff3a
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-09-12 (Thu, 12 Sep 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#848] extra_template_paths and extra_public_paths aren't deprecated
Commit: fca56dceb35bae9889b2b017af0a8b38afddec15
https://github.com/okfn/ckan/commit/fca56dceb35bae9889b2b017af0a8b38afddec15
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-09-12 (Thu, 12 Sep 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#848] ckan.template_footer_end is deprecated
Commit: 2994a3c3232a8134746337ff528ff613c1844565
https://github.com/okfn/ckan/commit/2994a3c3232a8134746337ff528ff613c1844565
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-09-12 (Thu, 12 Sep 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
[#848] Reorganize and add examples of FileStore's configuration parameters
Commit: 690bbaeea6b058a078da5212751d98cd790dc1dd
https://github.com/okfn/ckan/commit/690bbaeea6b058a078da5212751d98cd790dc1dd
Author: John Martin <me at johnmart.in>
Date: 2013-09-19 (Thu, 19 Sep 2013)
Changed paths:
M ckan/templates/user/login.html
Log Message:
-----------
[#1236] Changes header on sidebar to be more relevant to content
Commit: d1e8b9d40e864520ad26425eada1a7af0595390b
https://github.com/okfn/ckan/commit/d1e8b9d40e864520ad26425eada1a7af0595390b
Author: John Martin <me at johnmart.in>
Date: 2013-09-19 (Thu, 19 Sep 2013)
Changed paths:
M ckan/templates/package/snippets/package_metadata_fields.html
Log Message:
-----------
[#1187] Adds source URL and version to package form
Commit: 736a614980f6876d632e0724434d77f93dc7e00a
https://github.com/okfn/ckan/commit/736a614980f6876d632e0724434d77f93dc7e00a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M doc/testing-coding-standards.rst
Log Message:
-----------
[#1117] Remove testing guidelines about assert messages
This is unnecessary in most cases, should be clear from the test name
(or else the test may be doing too much)
Commit: c5ea35f1db74e228aa1e47dbe92ca6db0b6c5ec4
https://github.com/okfn/ckan/commit/c5ea35f1db74e228aa1e47dbe92ca6db0b6c5ec4
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M ckan/new_tests/factories.py
M ckan/new_tests/logic/auth/test_update.py
Log Message:
-----------
[#1117] Add factories.MockUser class
Commit: e50a79c7382a400d5491e8f7af91c55f6ee8c93a
https://github.com/okfn/ckan/commit/e50a79c7382a400d5491e8f7af91c55f6ee8c93a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Remove an unnecessary deepcopy
Commit: 084feee3bc7b94f70ec6282d90ba122b74342c1c
https://github.com/okfn/ckan/commit/084feee3bc7b94f70ec6282d90ba122b74342c1c
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Simplify a test decorator
Commit: 696f98b392d659211d4c04f60418bc206462a46d
https://github.com/okfn/ckan/commit/696f98b392d659211d4c04f60418bc206462a46d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M ckan/new_tests/lib/navl/test_validators.py
Log Message:
-----------
[#1117] Simplify some more test decorators
Commit: cf157df17944f68efd37be119e23f7cf06f6125b
https://github.com/okfn/ckan/commit/cf157df17944f68efd37be119e23f7cf06f6125b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Simplify some more test decorators
And also remove some duplicated test decorators
Commit: 5acbbdb56df2fcd937bc2020f536712271076a39
https://github.com/okfn/ckan/commit/5acbbdb56df2fcd937bc2020f536712271076a39
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M CONTRIBUTING.rst
M ckan/config/deployment.ini_tmpl
M ckan/controllers/admin.py
M ckan/controllers/api.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/user.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/plugins.py
M ckan/logic/__init__.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/update.py
M ckan/logic/validators.py
M ckan/model/package.py
M ckan/model/resource.py
M ckan/new_authz.py
M ckan/pastertemplates/template/setup.py_tmpl
M ckan/plugins/interfaces.py
M ckan/plugins/toolkit.py
A ckan/plugins/toolkit_sphinx_extension.py
M ckan/public/base/vendor/select2/README.md
A ckan/public/base/vendor/select2/select2-spinner.gif
M ckan/public/base/vendor/select2/select2.css
M ckan/public/base/vendor/select2/select2.js
R ckan/public/base/vendor/select2/select2.min.css
M ckan/public/base/vendor/select2/select2.min.js
M ckan/public/base/vendor/select2/select2.png
A ckan/public/base/vendor/select2/select2x2.png
R ckan/public/base/vendor/select2/spinner.gif
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/dataviewer/base.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/footer.html
M ckan/templates/group/admins.html
M ckan/templates/group/base_form_page.html
M ckan/templates/group/confirm_delete.html
M ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/followers.html
M ckan/templates/group/history.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/header.html
M ckan/templates/home/index.html
M ckan/templates/macros/autoform.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/admins.html
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/confirm_delete.html
M ckan/templates/organization/confirm_delete_member.html
M ckan/templates/organization/index.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
M ckan/templates/package/activity.html
M ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/confirm_delete.html
M ckan/templates/package/confirm_delete_resource.html
M ckan/templates/package/followers.html
M ckan/templates/package/history.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates/package/snippets/revisions_table.html
M ckan/templates/page.html
M ckan/templates/related/base_form_page.html
M ckan/templates/related/confirm_delete.html
M ckan/templates/related/edit_form.html
M ckan/templates/revision/read.html
M ckan/templates/revision/snippets/revisions_list.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/context/dataset.html
M ckan/templates/snippets/context/group.html
M ckan/templates/snippets/context/user.html
M ckan/templates/snippets/disqus_trackback.html
M ckan/templates/snippets/follow_button.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/private.html
M ckan/templates/tag/index.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/followers.html
M ckan/templates/user/list.html
M ckan/templates/user/logout_first.html
M ckan/templates/user/read_base.html
M ckan/templates/user/request_reset.html
M ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/followers.html
A ckan/tests/functional/test_tracking.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_resource_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_init.py
M ckanext/datastore/logic/auth.py
A ckanext/example_iauthfunctions/__init__.py
A ckanext/example_iauthfunctions/plugin.py
A ckanext/example_iauthfunctions/plugin_v1.py
A ckanext/example_iauthfunctions/plugin_v2.py
A ckanext/example_iauthfunctions/plugin_v3.py
A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
R ckanext/textpreview/theme/public/highlight.pack.js
M ckanext/textpreview/theme/public/resource.config
A ckanext/textpreview/theme/public/vendor/highlight.pack.js
M doc/api.rst
M doc/authorization.rst
M doc/background-tasks.rst
M doc/ckan-coding-standards.rst
M doc/conf.py
M doc/configuration.rst
M doc/data-viewer.rst
M doc/documentation-guidelines.rst
A doc/extensions/best-practices.rst
A doc/extensions/converters.rst
A doc/extensions/index.rst
A doc/extensions/plugin-interfaces.rst
A doc/extensions/plugins-toolkit.rst
A doc/extensions/testing-extensions.rst
A doc/extensions/tutorial.rst
A doc/extensions/validators.rst
M doc/index.rst
M doc/python-coding-standards.rst
M doc/tag-vocabularies.rst
R doc/toolkit.rst
R doc/writing-extensions.rst
M setup.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1117-start-new-test-suite
Commit: 5ca99eee04dae54c9f9542bb21b1114294365445
https://github.com/okfn/ckan/commit/5ca99eee04dae54c9f9542bb21b1114294365445
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-09-23 (Mon, 23 Sep 2013)
Changed paths:
M ckan/new_tests/helpers.py
Log Message:
-----------
[#1117] Tests use clean_db() not delete_all()
This fixes crashes when the database was not initialized or was only
partially initialized
Commit: 3d592d3e12b306d0585f8734c098363653e3fba9
https://github.com/okfn/ckan/commit/3d592d3e12b306d0585f8734c098363653e3fba9
Author: John Glover <j at johnglover.net>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M ckan/templates/organization/member_new.html
Log Message:
-----------
Merge pull request #1214 from okfn/1214-add_member_page
Sidebar displaced on Add members page
Commit: a145047b6f95d24552afe18af97c4b4858e95430
https://github.com/okfn/ckan/commit/a145047b6f95d24552afe18af97c4b4858e95430
Author: Joe Tsoi <joe.yeung.tsoi at gmail.com>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M ckan/templates/user/login.html
Log Message:
-----------
Merge pull request #1236 from okfn/1236-forgotten-password-string-change
Forgotten details or password?
Commit: 21c21df965609e9dbfd1a20d1e01dc5d44807f34
https://github.com/okfn/ckan/commit/21c21df965609e9dbfd1a20d1e01dc5d44807f34
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M ckan/tests/logic/test_action.py
Log Message:
-----------
[#1243] Add tests to group_member_create.
Commit: 6948349af6452a879a53f5fdb0e2f3614386fdaf
https://github.com/okfn/ckan/commit/6948349af6452a879a53f5fdb0e2f3614386fdaf
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M ckan/controllers/admin.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/model/package.py
M ckan/model/resource.py
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/dataviewer/base.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/footer.html
M ckan/templates/group/admins.html
M ckan/templates/group/base_form_page.html
M ckan/templates/group/confirm_delete.html
M ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/followers.html
M ckan/templates/group/history.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/header.html
M ckan/templates/home/index.html
M ckan/templates/macros/autoform.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/admins.html
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/confirm_delete.html
M ckan/templates/organization/confirm_delete_member.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
M ckan/templates/package/activity.html
M ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/confirm_delete.html
M ckan/templates/package/confirm_delete_resource.html
M ckan/templates/package/followers.html
M ckan/templates/package/history.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates/package/snippets/revisions_table.html
M ckan/templates/page.html
M ckan/templates/related/base_form_page.html
M ckan/templates/related/confirm_delete.html
M ckan/templates/related/edit_form.html
M ckan/templates/revision/read.html
M ckan/templates/revision/snippets/revisions_list.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/context/dataset.html
M ckan/templates/snippets/context/group.html
M ckan/templates/snippets/context/user.html
M ckan/templates/snippets/disqus_trackback.html
M ckan/templates/snippets/follow_button.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/private.html
M ckan/templates/tag/index.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/followers.html
M ckan/templates/user/list.html
M ckan/templates/user/login.html
M ckan/templates/user/logout_first.html
M ckan/templates/user/read_base.html
M ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/followers.html
A ckan/tests/functional/test_tracking.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_resource_search.py
M ckan/tests/logic/test_action.py
M doc/configuration.rst
M test-core.ini
Log Message:
-----------
Merge branch 'master' into 1243
Conflicts:
ckan/tests/logic/test_action.py
Commit: ecc89adfaeeccfd907585369485420a9fbf04d47
https://github.com/okfn/ckan/commit/ecc89adfaeeccfd907585369485420a9fbf04d47
Author: Nigel Babu <nigelbabu at gmail.com>
Date: 2013-09-24 (Tue, 24 Sep 2013)
Changed paths:
M ckan/logic/action/create.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
Merge pull request #1243 from okfn/1243
(group|organization)_member_create only accepts username (and not id)
Commit: e7db320c5f514048f18e892e3158bfe0c4c83c1f
https://github.com/okfn/ckan/commit/e7db320c5f514048f18e892e3158bfe0c4c83c1f
Author: Guy Sheffer <guysoft at gmail.com>
Date: 2013-09-25 (Wed, 25 Sep 2013)
Changed paths:
M doc/i18n.rst
Log Message:
-----------
Add notes and changes to new language submission, since pull requests are not accepted anymore
Commit: 2d46b36aa53cb96ca37c4040b514935e9abe5ced
https://github.com/okfn/ckan/commit/2d46b36aa53cb96ca37c4040b514935e9abe5ced
Author: Vitor Baptista <vitor at vitorbaptista.com>
Date: 2013-09-25 (Wed, 25 Sep 2013)
Changed paths:
M CHANGELOG.rst
Log Message:
-----------
Correct typo in CHANGELOG, forntend -> frontend.
Commit: 1c40d4b9b2c33b3f380b66f13ff3cfc52c5eafcd
https://github.com/okfn/ckan/commit/1c40d4b9b2c33b3f380b66f13ff3cfc52c5eafcd
Author: John Martin <me at johnmart.in>
Date: 2013-09-26 (Thu, 26 Sep 2013)
Changed paths:
M CHANGELOG.rst
M ckan/controllers/admin.py
M ckan/controllers/api.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/user.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/update.py
M ckan/logic/validators.py
M ckan/model/package.py
M ckan/model/resource.py
M ckan/new_authz.py
M ckan/plugins/interfaces.py
M ckan/plugins/toolkit.py
M ckan/public/base/vendor/select2/README.md
A ckan/public/base/vendor/select2/select2-spinner.gif
M ckan/public/base/vendor/select2/select2.css
M ckan/public/base/vendor/select2/select2.js
R ckan/public/base/vendor/select2/select2.min.css
M ckan/public/base/vendor/select2/select2.min.js
M ckan/public/base/vendor/select2/select2.png
A ckan/public/base/vendor/select2/select2x2.png
R ckan/public/base/vendor/select2/spinner.gif
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/dataviewer/base.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/footer.html
M ckan/templates/group/admins.html
M ckan/templates/group/base_form_page.html
M ckan/templates/group/confirm_delete.html
M ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/followers.html
M ckan/templates/group/history.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/header.html
M ckan/templates/home/index.html
M ckan/templates/macros/autoform.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/admins.html
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/confirm_delete.html
M ckan/templates/organization/confirm_delete_member.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
M ckan/templates/package/activity.html
M ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/confirm_delete.html
M ckan/templates/package/confirm_delete_resource.html
M ckan/templates/package/followers.html
M ckan/templates/package/history.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates/package/snippets/revisions_table.html
M ckan/templates/page.html
M ckan/templates/related/base_form_page.html
M ckan/templates/related/confirm_delete.html
M ckan/templates/related/edit_form.html
M ckan/templates/revision/read.html
M ckan/templates/revision/snippets/revisions_list.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/context/dataset.html
M ckan/templates/snippets/context/group.html
M ckan/templates/snippets/context/user.html
M ckan/templates/snippets/disqus_trackback.html
M ckan/templates/snippets/follow_button.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/private.html
M ckan/templates/tag/index.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/followers.html
M ckan/templates/user/list.html
M ckan/templates/user/login.html
M ckan/templates/user/logout_first.html
M ckan/templates/user/read_base.html
M ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/followers.html
A ckan/tests/functional/test_tracking.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_resource_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_init.py
M ckanext/datastore/logic/auth.py
M ckanext/example_iauthfunctions/plugin.py
M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
R ckanext/textpreview/theme/public/highlight.pack.js
M ckanext/textpreview/theme/public/resource.config
A ckanext/textpreview/theme/public/vendor/highlight.pack.js
M doc/configuration.rst
M test-core.ini
Log Message:
-----------
Merged master
Commit: 8ba03bbb3e278e6f4d6902f90f337652bfb5470c
https://github.com/okfn/ckan/commit/8ba03bbb3e278e6f4d6902f90f337652bfb5470c
Author: John Martin <me at johnmart.in>
Date: 2013-09-26 (Thu, 26 Sep 2013)
Changed paths:
M ckan/templates/header.html
M ckan/templates/snippets/organization.html
Log Message:
-----------
Merge pull request #1235 from okfn/1235-new-template-blocks
Additional template blocks needed
Commit: 708da6f5979e4973113f904ad98900aeea4acbc6
https://github.com/okfn/ckan/commit/708da6f5979e4973113f904ad98900aeea4acbc6
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M CHANGELOG.rst
M ckan/logic/action/create.py
M ckan/templates/header.html
M ckan/templates/organization/member_new.html
M ckan/templates/snippets/organization.html
M ckan/templates/user/login.html
M ckan/tests/logic/test_action.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1117-start-new-test-suite
Commit: 9147540ab8e381a41ab849239b919c19a2641a35
https://github.com/okfn/ckan/commit/9147540ab8e381a41ab849239b919c19a2641a35
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M ckan/new_tests/controllers/__init__.py
M ckan/new_tests/logic/action/__init__.py
M ckan/new_tests/logic/action/test_update.py
M doc/testing-coding-standards.rst
Log Message:
-----------
[#1117] Discourage overuse of mocking
Tweak the testing guidelines to discourage overuse of mocking.
Commit: 098ac5de1ece4a5851a2ee4cd4290847f3472aeb
https://github.com/okfn/ckan/commit/098ac5de1ece4a5851a2ee4cd4290847f3472aeb
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M doc/testing-coding-standards.rst
Log Message:
-----------
[#1117] Add another example to testing guidelines
Commit: af2ed73934b49cece0920266d0dba3b025ac114e
https://github.com/okfn/ckan/commit/af2ed73934b49cece0920266d0dba3b025ac114e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M ckan/new_tests/helpers.py
M doc/testing-coding-standards.rst
Log Message:
-----------
[#1117] Testing guidelines small tweaks
Commit: 841ab9d9a88b70523a3cd0fad7275d0c225ab67f
https://github.com/okfn/ckan/commit/841ab9d9a88b70523a3cd0fad7275d0c225ab67f
Author: John Martin <me at johnmart.in>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M .tx/config
M CHANGELOG.rst
M CONTRIBUTING.rst
M bin/travis-build
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/middleware.py
M ckan/config/solr/schema-2.0.xml
M ckan/controllers/admin.py
M ckan/controllers/api.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/user.py
A ckan/i18n/ar/LC_MESSAGES/ckan.mo
A 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
A ckan/i18n/da_DK/LC_MESSAGES/ckan.mo
A 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
A ckan/i18n/en_AU/LC_MESSAGES/ckan.mo
A ckan/i18n/en_AU/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
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/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
A ckan/i18n/km/LC_MESSAGES/ckan.mo
A 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
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
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
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
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/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/base.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/formatters.py
M ckan/lib/helpers.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/plugins.py
M ckan/lib/search/__init__.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.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/auth/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/069_resource_url_and_metadata_modified.py
A ckan/migration/versions/070_add_activity_and_resource_indexes.py
M ckan/model/activity.py
M ckan/model/package.py
M ckan/model/resource.py
M ckan/new_authz.py
M ckan/pastertemplates/template/setup.py_tmpl
M ckan/plugins/core.py
M ckan/plugins/interfaces.py
M ckan/plugins/toolkit.py
A ckan/plugins/toolkit_sphinx_extension.py
M ckan/public/base/vendor/select2/README.md
A ckan/public/base/vendor/select2/select2-spinner.gif
M ckan/public/base/vendor/select2/select2.css
M ckan/public/base/vendor/select2/select2.js
R ckan/public/base/vendor/select2/select2.min.css
M ckan/public/base/vendor/select2/select2.min.js
M ckan/public/base/vendor/select2/select2.png
A ckan/public/base/vendor/select2/select2x2.png
R ckan/public/base/vendor/select2/spinner.gif
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/dataviewer/base.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/footer.html
M ckan/templates/group/admins.html
M ckan/templates/group/base_form_page.html
M ckan/templates/group/confirm_delete.html
M ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/followers.html
M ckan/templates/group/history.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/header.html
M ckan/templates/macros/autoform.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/admins.html
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/confirm_delete.html
M ckan/templates/organization/confirm_delete_member.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
M ckan/templates/organization/snippets/organization_form.html
M ckan/templates/package/activity.html
M ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/confirm_delete.html
M ckan/templates/package/confirm_delete_resource.html
M ckan/templates/package/followers.html
M ckan/templates/package/history.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates/package/snippets/revisions_table.html
M ckan/templates/page.html
M ckan/templates/related/base_form_page.html
M ckan/templates/related/confirm_delete.html
M ckan/templates/related/edit_form.html
M ckan/templates/revision/read.html
M ckan/templates/revision/snippets/revisions_list.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/context/dataset.html
M ckan/templates/snippets/context/group.html
M ckan/templates/snippets/context/user.html
M ckan/templates/snippets/disqus_trackback.html
M ckan/templates/snippets/follow_button.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/private.html
M ckan/templates/tag/index.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/followers.html
M ckan/templates/user/list.html
M ckan/templates/user/login.html
M ckan/templates/user/logout_first.html
M ckan/templates/user/read_base.html
M ckan/templates/user/request_reset.html
M ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/followers.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/test_package.py
A ckan/tests/functional/test_tracking.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_resource_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_init.py
A ckan/tests/models/test_activity.py
M ckan/tests/models/test_package.py
M ckan/tests/test_plugins.py
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/logic/schema.py
M ckanext/datastore/plugin.py
M ckanext/datastore/tests/test_create.py
M ckanext/datastore/tests/test_dump.py
M ckanext/datastore/tests/test_search.py
A ckanext/example_iauthfunctions/__init__.py
A ckanext/example_iauthfunctions/plugin.py
A ckanext/example_iauthfunctions/plugin_v1.py
A ckanext/example_iauthfunctions/plugin_v2.py
A ckanext/example_iauthfunctions/plugin_v3.py
A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
M ckanext/multilingual/solr/schema.xml
M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
M ckanext/reclinepreview/theme/public/resource.config
M ckanext/reclinepreview/theme/public/vendor/recline/recline.js
M ckanext/reclinepreview/theme/public/vendor/recline/recline.min.js
M ckanext/resourceproxy/controller.py
M ckanext/resourceproxy/tests/test_proxy.py
R ckanext/textpreview/theme/public/highlight.pack.js
M ckanext/textpreview/theme/public/resource.config
A ckanext/textpreview/theme/public/vendor/highlight.pack.js
M dev-requirements.txt
M doc/api.rst
M doc/authorization.rst
M doc/background-tasks.rst
M doc/ckan-coding-standards.rst
M doc/conf.py
M doc/configuration.rst
M doc/data-viewer.rst
M doc/datastore.rst
M doc/documentation-guidelines.rst
A doc/extensions/best-practices.rst
A doc/extensions/converters.rst
A doc/extensions/index.rst
A doc/extensions/plugin-interfaces.rst
A doc/extensions/plugins-toolkit.rst
A doc/extensions/testing-extensions.rst
A doc/extensions/tutorial.rst
A doc/extensions/validators.rst
M doc/index.rst
M doc/install-from-source.rst
M doc/python-coding-standards.rst
M doc/tag-vocabularies.rst
M doc/test.rst
R doc/toolkit.rst
M doc/upgrade-package-to-minor-release.rst
M doc/upgrade-package-to-patch-release.rst
M doc/upgrade-source.rst
M doc/upgrading.rst
R doc/writing-extensions.rst
A pip-requirements-docs.txt
A requirements.in
M requirements.txt
M setup.py
M test-core.ini
Log Message:
-----------
Merged master
Commit: 7e61b82eac629c92ba04e0d9567e96b7c709f49b
https://github.com/okfn/ckan/commit/7e61b82eac629c92ba04e0d9567e96b7c709f49b
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M ckan/plugins/interfaces.py
Log Message:
-----------
Fix a Sphinx error
Commit: 3fbe844985a00aee1450fd7235ba61bcf293623b
https://github.com/okfn/ckan/commit/3fbe844985a00aee1450fd7235ba61bcf293623b
Author: John Martin <me at johnmart.in>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M ckanext/homepage/plugin.py
Log Message:
-----------
[#1126] Removed because it's not used
Commit: e7d295d27b56f3ab5252f2e090927c0a3e57ea1e
https://github.com/okfn/ckan/commit/e7d295d27b56f3ab5252f2e090927c0a3e57ea1e
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M CHANGELOG.rst
M CONTRIBUTING.rst
M ckan/controllers/admin.py
M ckan/controllers/api.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/user.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/navl/dictization_functions.py
M ckan/lib/plugins.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/update.py
M ckan/logic/validators.py
M ckan/model/package.py
M ckan/model/resource.py
M ckan/new_authz.py
M ckan/pastertemplates/template/setup.py_tmpl
M ckan/plugins/interfaces.py
M ckan/plugins/toolkit.py
A ckan/plugins/toolkit_sphinx_extension.py
M ckan/public/base/vendor/select2/README.md
A ckan/public/base/vendor/select2/select2-spinner.gif
M ckan/public/base/vendor/select2/select2.css
M ckan/public/base/vendor/select2/select2.js
R ckan/public/base/vendor/select2/select2.min.css
M ckan/public/base/vendor/select2/select2.min.js
M ckan/public/base/vendor/select2/select2.png
A ckan/public/base/vendor/select2/select2x2.png
R ckan/public/base/vendor/select2/spinner.gif
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/dataviewer/base.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/footer.html
M ckan/templates/group/admins.html
M ckan/templates/group/base_form_page.html
M ckan/templates/group/confirm_delete.html
M ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/followers.html
M ckan/templates/group/history.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/header.html
M ckan/templates/home/index.html
M ckan/templates/macros/autoform.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/admins.html
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/confirm_delete.html
M ckan/templates/organization/confirm_delete_member.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
M ckan/templates/package/activity.html
M ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/confirm_delete.html
M ckan/templates/package/confirm_delete_resource.html
M ckan/templates/package/followers.html
M ckan/templates/package/history.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates/package/snippets/revisions_table.html
M ckan/templates/page.html
M ckan/templates/related/base_form_page.html
M ckan/templates/related/confirm_delete.html
M ckan/templates/related/edit_form.html
M ckan/templates/revision/read.html
M ckan/templates/revision/snippets/revisions_list.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/context/dataset.html
M ckan/templates/snippets/context/group.html
M ckan/templates/snippets/context/user.html
M ckan/templates/snippets/disqus_trackback.html
M ckan/templates/snippets/follow_button.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/private.html
M ckan/templates/tag/index.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/followers.html
M ckan/templates/user/list.html
M ckan/templates/user/login.html
M ckan/templates/user/logout_first.html
M ckan/templates/user/read_base.html
M ckan/templates/user/request_reset.html
M ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/followers.html
A ckan/tests/functional/test_tracking.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_resource_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_init.py
M ckanext/datastore/logic/auth.py
A ckanext/example_iauthfunctions/__init__.py
A ckanext/example_iauthfunctions/plugin.py
A ckanext/example_iauthfunctions/plugin_v1.py
A ckanext/example_iauthfunctions/plugin_v2.py
A ckanext/example_iauthfunctions/plugin_v3.py
A ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
R ckanext/textpreview/theme/public/highlight.pack.js
M ckanext/textpreview/theme/public/resource.config
A ckanext/textpreview/theme/public/vendor/highlight.pack.js
M doc/api.rst
M doc/authorization.rst
M doc/background-tasks.rst
M doc/ckan-coding-standards.rst
M doc/conf.py
M doc/configuration.rst
M doc/data-viewer.rst
M doc/documentation-guidelines.rst
A doc/extensions/best-practices.rst
A doc/extensions/converters.rst
A doc/extensions/index.rst
A doc/extensions/plugin-interfaces.rst
A doc/extensions/plugins-toolkit.rst
A doc/extensions/testing-extensions.rst
A doc/extensions/tutorial.rst
A doc/extensions/validators.rst
M doc/index.rst
M doc/tag-vocabularies.rst
R doc/toolkit.rst
R doc/writing-extensions.rst
M setup.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1228-dictize-whitespace
Commit: 66645627a9ac2a23cc0335e4ae3766d60e0aedc3
https://github.com/okfn/ckan/commit/66645627a9ac2a23cc0335e4ae3766d60e0aedc3
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-01 (Tue, 01 Oct 2013)
Changed paths:
M ckan/new_tests/logic/test_validators.py
Log Message:
-----------
[#1117] Fix an import (PEP8)
Commit: ad55287efb4a706ad4e957bc43cf7b019ad3b3c6
https://github.com/okfn/ckan/commit/ad55287efb4a706ad4e957bc43cf7b019ad3b3c6
Author: kindly <kindly at gmail.com>
Date: 2013-10-02 (Wed, 02 Oct 2013)
Changed paths:
M ckan/controllers/home.py
M ckan/lib/app_globals.py
M ckan/lib/helpers.py
M ckan/templates/home/index.html
A ckan/templates/home/index_base.html
A ckan/templates/home/layout1.html
A ckan/templates/home/layout2.html
A ckan/templates/home/layout3.html
A ckan/templates/home/snippets/featured_group.html
A ckan/templates/home/snippets/featured_organization.html
A ckan/templates/home/snippets/promoted.html
A ckan/templates/home/snippets/search.html
A ckan/templates/home/snippets/stats.html
R ckanext/homepage/__init__.py
R ckanext/homepage/plugin.py
R ckanext/homepage/theme/templates/home/layout1.html
R ckanext/homepage/theme/templates/home/layout2.html
R ckanext/homepage/theme/templates/home/layout3.html
R ckanext/homepage/theme/templates/home/snippets/featured_group.html
R ckanext/homepage/theme/templates/home/snippets/featured_organization.html
R ckanext/homepage/theme/templates/home/snippets/promoted.html
R ckanext/homepage/theme/templates/home/snippets/search.html
R ckanext/homepage/theme/templates/home/snippets/stats.html
M doc/configuration.rst
M setup.py
Log Message:
-----------
[1126] move homepage modules into core and fix tests
Commit: f1616290b2f96c1c5cb5ad98d3ccdfbc3e9be492
https://github.com/okfn/ckan/commit/f1616290b2f96c1c5cb5ad98d3ccdfbc3e9be492
Author: John Martin <me at johnmart.in>
Date: 2013-10-02 (Wed, 02 Oct 2013)
Changed paths:
M ckan/templates/home/index.html
R ckan/templates/home/index_base.html
M ckan/templates/home/layout1.html
M ckan/templates/home/layout2.html
M ckan/templates/home/layout3.html
Log Message:
-----------
[#1126] Removed index_base.html and changed layouts into snippets
Commit: 4e6625afd9890c25990cdf012d69006a74ea7f63
https://github.com/okfn/ckan/commit/4e6625afd9890c25990cdf012d69006a74ea7f63
Author: kindly <kindly at gmail.com>
Date: 2013-10-02 (Wed, 02 Oct 2013)
Changed paths:
M CONTRIBUTING.rst
M ckan/ckan_nose_plugin.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/navl/validators.py
M ckan/logic/validators.py
A ckan/new_tests/__init__.py
A ckan/new_tests/controllers/__init__.py
A ckan/new_tests/factories.py
A ckan/new_tests/helpers.py
A ckan/new_tests/lib/__init__.py
A ckan/new_tests/lib/navl/test_validators.py
A ckan/new_tests/logic/__init__.py
A ckan/new_tests/logic/action/__init__.py
A ckan/new_tests/logic/action/test_update.py
A ckan/new_tests/logic/auth/__init__.py
A ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_schema.py
A ckan/new_tests/logic/test_validators.py
A ckan/new_tests/migration/__init__.py
A ckan/new_tests/model/__init__.py
A ckan/new_tests/plugins/__init__.py
M ckan/plugins/interfaces.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_navl.py
M ckan/tests/logic/test_action.py
M dev-requirements.txt
M doc/multilingual.rst
M doc/test.rst
A doc/testing-coding-standards.rst
A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
Log Message:
-----------
Merge branch '1117-start-new-test-suite'
Commit: 4ee4ddb84f6c4f34adfa9783e7ee531c9664a8b3
https://github.com/okfn/ckan/commit/4ee4ddb84f6c4f34adfa9783e7ee531c9664a8b3
Author: John Glover <j at johnglover.net>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#1126] PEP8 and fix typo
Commit: c82d8e55fd8549cd5ee9c8c2d66b10de586193b6
https://github.com/okfn/ckan/commit/c82d8e55fd8549cd5ee9c8c2d66b10de586193b6
Author: John Glover <j at johnglover.net>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
M ckan/lib/helpers.py
M ckan/public/base/less/homepage.less
M ckan/templates/admin/config.html
M ckan/templates/home/index.html
A ckan/templates/home/layout1.html
A ckan/templates/home/layout2.html
A ckan/templates/home/layout3.html
A ckan/templates/home/snippets/featured_group.html
A ckan/templates/home/snippets/featured_organization.html
A ckan/templates/home/snippets/promoted.html
A ckan/templates/home/snippets/search.html
A ckan/templates/home/snippets/stats.html
M doc/configuration.rst
Log Message:
-----------
Merge pull request #1126 from okfn/1126-homepage-module
Homepage modules
Commit: ae5a51c6d1765bf2d8271fa4c67a4a79ed5d8451
https://github.com/okfn/ckan/commit/ae5a51c6d1765bf2d8271fa4c67a4a79ed5d8451
Author: John Glover <j at johnglover.net>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
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
Log Message:
-----------
[#1126] Update css after merge
Commit: dcfe82da0c458870089a0b7e0e40ae60167ee273
https://github.com/okfn/ckan/commit/dcfe82da0c458870089a0b7e0e40ae60167ee273
Author: John Glover <j at johnglover.net>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
M CHANGELOG.rst
M CONTRIBUTING.rst
M ckan/ckan_nose_plugin.py
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/navl/validators.py
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/validators.py
M ckan/model/package.py
M ckan/model/resource.py
A ckan/new_tests/__init__.py
A ckan/new_tests/controllers/__init__.py
A ckan/new_tests/factories.py
A ckan/new_tests/helpers.py
A ckan/new_tests/lib/__init__.py
A ckan/new_tests/lib/navl/test_validators.py
A ckan/new_tests/logic/__init__.py
A ckan/new_tests/logic/action/__init__.py
A ckan/new_tests/logic/action/test_update.py
A ckan/new_tests/logic/auth/__init__.py
A ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_schema.py
A ckan/new_tests/logic/test_validators.py
A ckan/new_tests/migration/__init__.py
A ckan/new_tests/model/__init__.py
A ckan/new_tests/plugins/__init__.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/less/homepage.less
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/dataviewer/base.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/footer.html
M ckan/templates/group/admins.html
M ckan/templates/group/base_form_page.html
M ckan/templates/group/confirm_delete.html
M ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/followers.html
M ckan/templates/group/history.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/header.html
M ckan/templates/home/index.html
A ckan/templates/home/layout1.html
A ckan/templates/home/layout2.html
A ckan/templates/home/layout3.html
A ckan/templates/home/snippets/featured_group.html
A ckan/templates/home/snippets/featured_organization.html
A ckan/templates/home/snippets/promoted.html
A ckan/templates/home/snippets/search.html
A ckan/templates/home/snippets/stats.html
M ckan/templates/macros/autoform.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/admins.html
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/confirm_delete.html
M ckan/templates/organization/confirm_delete_member.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
M ckan/templates/package/activity.html
M ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/confirm_delete.html
M ckan/templates/package/confirm_delete_resource.html
M ckan/templates/package/followers.html
M ckan/templates/package/history.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates/package/snippets/revisions_table.html
M ckan/templates/page.html
M ckan/templates/related/base_form_page.html
M ckan/templates/related/confirm_delete.html
M ckan/templates/related/edit_form.html
M ckan/templates/revision/read.html
M ckan/templates/revision/snippets/revisions_list.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/context/dataset.html
M ckan/templates/snippets/context/group.html
M ckan/templates/snippets/context/user.html
M ckan/templates/snippets/disqus_trackback.html
M ckan/templates/snippets/follow_button.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/private.html
M ckan/templates/tag/index.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/followers.html
M ckan/templates/user/list.html
M ckan/templates/user/login.html
M ckan/templates/user/logout_first.html
M ckan/templates/user/read_base.html
M ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/followers.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_user.py
A ckan/tests/functional/test_tracking.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_navl.py
M ckan/tests/lib/test_resource_search.py
M ckan/tests/logic/test_action.py
M dev-requirements.txt
M doc/configuration.rst
M doc/multilingual.rst
M doc/test.rst
A doc/testing-coding-standards.rst
A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' into '1187-source-url-and-version-added-to-package-form'
Commit: eddd6610e24e29a508d0f3439921d4d129540742
https://github.com/okfn/ckan/commit/eddd6610e24e29a508d0f3439921d4d129540742
Author: John Glover <j at johnglover.net>
Date: 2013-10-03 (Thu, 03 Oct 2013)
Changed paths:
M ckan/templates/package/snippets/package_metadata_fields.html
Log Message:
-----------
Merge pull request #1187 from okfn/1187-source-url-and-version-added-to-package-form
Dataset Source (url) and Version fields missing
Commit: 50f0d989dcae4b2f9c3ba4b24211eea0f8caed1c
https://github.com/okfn/ckan/commit/50f0d989dcae4b2f9c3ba4b24211eea0f8caed1c
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M CONTRIBUTING.rst
M ckan/ckan_nose_plugin.py
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/navl/validators.py
M ckan/logic/validators.py
A ckan/new_tests/__init__.py
A ckan/new_tests/controllers/__init__.py
A ckan/new_tests/factories.py
A ckan/new_tests/helpers.py
A ckan/new_tests/lib/__init__.py
A ckan/new_tests/lib/navl/test_validators.py
A ckan/new_tests/logic/__init__.py
A ckan/new_tests/logic/action/__init__.py
A ckan/new_tests/logic/action/test_update.py
A ckan/new_tests/logic/auth/__init__.py
A ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_schema.py
A ckan/new_tests/logic/test_validators.py
A ckan/new_tests/migration/__init__.py
A ckan/new_tests/model/__init__.py
A ckan/new_tests/plugins/__init__.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/less/homepage.less
M ckan/templates/admin/config.html
M ckan/templates/home/index.html
A ckan/templates/home/layout1.html
A ckan/templates/home/layout2.html
A ckan/templates/home/layout3.html
A ckan/templates/home/snippets/featured_group.html
A ckan/templates/home/snippets/featured_organization.html
A ckan/templates/home/snippets/promoted.html
A ckan/templates/home/snippets/search.html
A ckan/templates/home/snippets/stats.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_navl.py
M ckan/tests/logic/test_action.py
M dev-requirements.txt
M doc/configuration.rst
M doc/multilingual.rst
M doc/test.rst
A doc/testing-coding-standards.rst
A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1228-dictize-whitespace
Commit: 59504d7f38e6ef35a2681451ccdaaa99de42b541
https://github.com/okfn/ckan/commit/59504d7f38e6ef35a2681451ccdaaa99de42b541
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M ckan/lib/dictization/model_dictize.py
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
Merge branch '1228-dictize-whitespace'
Commit: 958027dfd182bfaff874aff1ce1f973bf29fc016
https://github.com/okfn/ckan/commit/958027dfd182bfaff874aff1ce1f973bf29fc016
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M CHANGELOG.rst
M CONTRIBUTING.rst
M ckan/ckan_nose_plugin.py
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/navl/validators.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/validators.py
M ckan/model/package.py
M ckan/model/resource.py
A ckan/new_tests/__init__.py
A ckan/new_tests/controllers/__init__.py
A ckan/new_tests/factories.py
A ckan/new_tests/helpers.py
A ckan/new_tests/lib/__init__.py
A ckan/new_tests/lib/navl/test_validators.py
A ckan/new_tests/logic/__init__.py
A ckan/new_tests/logic/action/__init__.py
A ckan/new_tests/logic/action/test_update.py
A ckan/new_tests/logic/auth/__init__.py
A ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_schema.py
A ckan/new_tests/logic/test_validators.py
A ckan/new_tests/migration/__init__.py
A ckan/new_tests/model/__init__.py
A ckan/new_tests/plugins/__init__.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/less/homepage.less
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/dataviewer/base.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/footer.html
M ckan/templates/group/admins.html
M ckan/templates/group/base_form_page.html
M ckan/templates/group/confirm_delete.html
M ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/followers.html
M ckan/templates/group/history.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/header.html
M ckan/templates/home/index.html
A ckan/templates/home/layout1.html
A ckan/templates/home/layout2.html
A ckan/templates/home/layout3.html
A ckan/templates/home/snippets/featured_group.html
A ckan/templates/home/snippets/featured_organization.html
A ckan/templates/home/snippets/promoted.html
A ckan/templates/home/snippets/search.html
A ckan/templates/home/snippets/stats.html
M ckan/templates/macros/autoform.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/admins.html
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/confirm_delete.html
M ckan/templates/organization/confirm_delete_member.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
M ckan/templates/package/activity.html
M ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/confirm_delete.html
M ckan/templates/package/confirm_delete_resource.html
M ckan/templates/package/followers.html
M ckan/templates/package/history.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates/package/snippets/revisions_table.html
M ckan/templates/page.html
M ckan/templates/related/base_form_page.html
M ckan/templates/related/confirm_delete.html
M ckan/templates/related/edit_form.html
M ckan/templates/revision/read.html
M ckan/templates/revision/snippets/revisions_list.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/context/dataset.html
M ckan/templates/snippets/context/group.html
M ckan/templates/snippets/context/user.html
M ckan/templates/snippets/disqus_trackback.html
M ckan/templates/snippets/follow_button.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/private.html
M ckan/templates/tag/index.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/followers.html
M ckan/templates/user/list.html
M ckan/templates/user/login.html
M ckan/templates/user/logout_first.html
M ckan/templates/user/read_base.html
M ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/followers.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_user.py
A ckan/tests/functional/test_tracking.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_navl.py
M ckan/tests/lib/test_resource_search.py
M ckan/tests/logic/test_action.py
M dev-requirements.txt
M doc/configuration.rst
M doc/multilingual.rst
M doc/test.rst
A doc/testing-coding-standards.rst
A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 848-finishing-configuration-docs
Commit: 23ab179467aebd0c98b843b293622715c78b794f
https://github.com/okfn/ckan/commit/23ab179467aebd0c98b843b293622715c78b794f
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M doc/configuration.rst
Log Message:
-----------
Merge branch '848-finishing-configuration-docs'
Commit: 11ff9097f9bca2bbc3bf4e280f6134e477944738
https://github.com/okfn/ckan/commit/11ff9097f9bca2bbc3bf4e280f6134e477944738
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M CHANGELOG.rst
M CONTRIBUTING.rst
M ckan/ckan_nose_plugin.py
M ckan/controllers/admin.py
M ckan/controllers/api.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/user.py
M ckan/lib/app_globals.py
M ckan/lib/cli.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/navl/validators.py
M ckan/logic/__init__.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/action/update.py
M ckan/logic/auth/create.py
M ckan/logic/auth/update.py
M ckan/logic/validators.py
M ckan/model/package.py
M ckan/model/resource.py
M ckan/new_authz.py
A ckan/new_tests/__init__.py
A ckan/new_tests/controllers/__init__.py
A ckan/new_tests/factories.py
A ckan/new_tests/helpers.py
A ckan/new_tests/lib/__init__.py
A ckan/new_tests/lib/navl/test_validators.py
A ckan/new_tests/logic/__init__.py
A ckan/new_tests/logic/action/__init__.py
A ckan/new_tests/logic/action/test_update.py
A ckan/new_tests/logic/auth/__init__.py
A ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_schema.py
A ckan/new_tests/logic/test_validators.py
A ckan/new_tests/migration/__init__.py
A ckan/new_tests/model/__init__.py
A ckan/new_tests/plugins/__init__.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/homepage.less
M ckan/public/base/vendor/select2/README.md
A ckan/public/base/vendor/select2/select2-spinner.gif
M ckan/public/base/vendor/select2/select2.css
M ckan/public/base/vendor/select2/select2.js
R ckan/public/base/vendor/select2/select2.min.css
M ckan/public/base/vendor/select2/select2.min.js
M ckan/public/base/vendor/select2/select2.png
A ckan/public/base/vendor/select2/select2x2.png
R ckan/public/base/vendor/select2/spinner.gif
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/admin/base.html
M ckan/templates/admin/config.html
M ckan/templates/dataviewer/base.html
M ckan/templates/dataviewer/snippets/data_preview.html
M ckan/templates/footer.html
M ckan/templates/group/admins.html
M ckan/templates/group/base_form_page.html
M ckan/templates/group/confirm_delete.html
M ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/followers.html
M ckan/templates/group/history.html
M ckan/templates/group/index.html
M ckan/templates/group/member_new.html
M ckan/templates/group/new.html
M ckan/templates/group/read.html
M ckan/templates/header.html
M ckan/templates/home/index.html
A ckan/templates/home/layout1.html
A ckan/templates/home/layout2.html
A ckan/templates/home/layout3.html
A ckan/templates/home/snippets/featured_group.html
A ckan/templates/home/snippets/featured_organization.html
A ckan/templates/home/snippets/promoted.html
A ckan/templates/home/snippets/search.html
A ckan/templates/home/snippets/stats.html
M ckan/templates/macros/autoform.html
M ckan/templates/organization/about.html
M ckan/templates/organization/activity_stream.html
M ckan/templates/organization/admins.html
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/bulk_process.html
M ckan/templates/organization/confirm_delete.html
M ckan/templates/organization/confirm_delete_member.html
M ckan/templates/organization/index.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
M ckan/templates/organization/read_base.html
M ckan/templates/package/activity.html
M ckan/templates/package/activity_stream.html
M ckan/templates/package/base.html
M ckan/templates/package/confirm_delete.html
M ckan/templates/package/confirm_delete_resource.html
M ckan/templates/package/followers.html
M ckan/templates/package/history.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/search.html
M ckan/templates/package/snippets/additional_info.html
M ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/package/snippets/resource_form.html
M ckan/templates/package/snippets/resources_list.html
M ckan/templates/package/snippets/revisions_table.html
M ckan/templates/page.html
M ckan/templates/related/base_form_page.html
M ckan/templates/related/confirm_delete.html
M ckan/templates/related/edit_form.html
M ckan/templates/revision/read.html
M ckan/templates/revision/snippets/revisions_list.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/context/dataset.html
M ckan/templates/snippets/context/group.html
M ckan/templates/snippets/context/user.html
M ckan/templates/snippets/disqus_trackback.html
M ckan/templates/snippets/follow_button.html
M ckan/templates/snippets/license.html
M ckan/templates/snippets/organization.html
M ckan/templates/snippets/private.html
M ckan/templates/tag/index.html
M ckan/templates/user/activity_stream.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/edit.html
M ckan/templates/user/followers.html
M ckan/templates/user/list.html
M ckan/templates/user/login.html
M ckan/templates/user/logout_first.html
M ckan/templates/user/read_base.html
M ckan/templates/user/request_reset.html
M ckan/templates/user/snippets/followee_dropdown.html
M ckan/templates/user/snippets/followers.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_user.py
A ckan/tests/functional/test_tracking.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_navl.py
M ckan/tests/lib/test_resource_search.py
M ckan/tests/logic/test_action.py
M ckan/tests/logic/test_init.py
M ckanext/datastore/logic/auth.py
M ckanext/example_iauthfunctions/plugin.py
M ckanext/example_iauthfunctions/tests/test_example_iauthfunctions.py
M ckanext/pdfpreview/theme/public/vendor/pdfjs/pdf.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/compatibility.min.js
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.css
A ckanext/pdfpreview/theme/public/vendor/pdfviewer/viewer.min.js
A ckanext/pdfpreview/theme/public/vendor/webL10n/l10n.min.js
R ckanext/textpreview/theme/public/highlight.pack.js
M ckanext/textpreview/theme/public/resource.config
A ckanext/textpreview/theme/public/vendor/highlight.pack.js
M dev-requirements.txt
M doc/configuration.rst
M doc/extensions/best-practices.rst
M doc/multilingual.rst
M doc/test.rst
A doc/testing-coding-standards.rst
A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 772-document-plugin-load-order
Commit: 70bff16b4408e614933cfaf42fdbf4d2a774ad94
https://github.com/okfn/ckan/commit/70bff16b4408e614933cfaf42fdbf4d2a774ad94
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M doc/configuration.rst
M doc/extensions/best-practices.rst
Log Message:
-----------
[#772] Clarify plugin-loading order and best practice
Commit: 09364bedc0dd84239865befbb92805a97cd67909
https://github.com/okfn/ckan/commit/09364bedc0dd84239865befbb92805a97cd67909
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M doc/configuration.rst
M doc/extensions/best-practices.rst
Log Message:
-----------
Merge branch '772-document-plugin-load-order'
Commit: e0e0fb5c2562ef021038cedb84aab42d89911659
https://github.com/okfn/ckan/commit/e0e0fb5c2562ef021038cedb84aab42d89911659
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M CHANGELOG.rst
M CONTRIBUTING.rst
M ckan/ckan_nose_plugin.py
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/navl/validators.py
M ckan/logic/action/create.py
M ckan/logic/validators.py
A ckan/new_tests/__init__.py
A ckan/new_tests/controllers/__init__.py
A ckan/new_tests/factories.py
A ckan/new_tests/helpers.py
A ckan/new_tests/lib/__init__.py
A ckan/new_tests/lib/navl/test_validators.py
A ckan/new_tests/logic/__init__.py
A ckan/new_tests/logic/action/__init__.py
A ckan/new_tests/logic/action/test_update.py
A ckan/new_tests/logic/auth/__init__.py
A ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_schema.py
A ckan/new_tests/logic/test_validators.py
A ckan/new_tests/migration/__init__.py
A ckan/new_tests/model/__init__.py
A ckan/new_tests/plugins/__init__.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/less/homepage.less
M ckan/templates/admin/config.html
M ckan/templates/header.html
M ckan/templates/home/index.html
A ckan/templates/home/layout1.html
A ckan/templates/home/layout2.html
A ckan/templates/home/layout3.html
A ckan/templates/home/snippets/featured_group.html
A ckan/templates/home/snippets/featured_organization.html
A ckan/templates/home/snippets/promoted.html
A ckan/templates/home/snippets/search.html
A ckan/templates/home/snippets/stats.html
M ckan/templates/organization/member_new.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/snippets/organization.html
M ckan/templates/user/login.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_navl.py
M ckan/tests/logic/test_action.py
M dev-requirements.txt
M doc/configuration.rst
M doc/extensions/best-practices.rst
M doc/multilingual.rst
M doc/test.rst
A doc/testing-coding-standards.rst
A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into translation-doc-deprecated
Commit: b6f1ff3f220b5e2198d2441261854fb398412cbc
https://github.com/okfn/ckan/commit/b6f1ff3f220b5e2198d2441261854fb398412cbc
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M doc/i18n.rst
Log Message:
-----------
Merge branch 'translation-doc-deprecated'
Commit: 068d0e06de48e0e0863ad32cc65557fb34b30cdd
https://github.com/okfn/ckan/commit/068d0e06de48e0e0863ad32cc65557fb34b30cdd
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M CHANGELOG.rst
M CONTRIBUTING.rst
M ckan/ckan_nose_plugin.py
M ckan/controllers/admin.py
M ckan/lib/app_globals.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/lib/navl/validators.py
M ckan/logic/action/create.py
M ckan/logic/validators.py
A ckan/new_tests/__init__.py
A ckan/new_tests/controllers/__init__.py
A ckan/new_tests/factories.py
A ckan/new_tests/helpers.py
A ckan/new_tests/lib/__init__.py
A ckan/new_tests/lib/navl/test_validators.py
A ckan/new_tests/logic/__init__.py
A ckan/new_tests/logic/action/__init__.py
A ckan/new_tests/logic/action/test_update.py
A ckan/new_tests/logic/auth/__init__.py
A ckan/new_tests/logic/auth/test_update.py
A ckan/new_tests/logic/test_schema.py
A ckan/new_tests/logic/test_validators.py
A ckan/new_tests/migration/__init__.py
A ckan/new_tests/model/__init__.py
A ckan/new_tests/plugins/__init__.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/green.css
M ckan/public/base/css/main.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/red.css
M ckan/public/base/less/homepage.less
M ckan/templates/admin/config.html
M ckan/templates/header.html
M ckan/templates/home/index.html
A ckan/templates/home/layout1.html
A ckan/templates/home/layout2.html
A ckan/templates/home/layout3.html
A ckan/templates/home/snippets/featured_group.html
A ckan/templates/home/snippets/featured_organization.html
A ckan/templates/home/snippets/promoted.html
A ckan/templates/home/snippets/search.html
A ckan/templates/home/snippets/stats.html
M ckan/templates/organization/member_new.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/snippets/organization.html
M ckan/templates/user/login.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_user.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_navl.py
M ckan/tests/logic/test_action.py
M dev-requirements.txt
M doc/configuration.rst
M doc/extensions/best-practices.rst
M doc/i18n.rst
M doc/multilingual.rst
M doc/test.rst
A doc/testing-coding-standards.rst
A navl/__init__.py b/ckan/new_tests/lib/navl/__init__.py
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 847-new-theming-docs
Commit: 3c7f6c8e4048cb6dddb34263aabd58e41934e27d
https://github.com/okfn/ckan/commit/3c7f6c8e4048cb6dddb34263aabd58e41934e27d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2013-10-07 (Mon, 07 Oct 2013)
Changed paths:
M ckan/templates/home/snippets/promoted.html
A ckanext/example_theme/v11_extra_public_directory/__init__.py
A ckanext/example_theme/v11_extra_public_directory/plugin.py
A ckanext/example_theme/v11_extra_public_directory/public/promoted-image.jpg
A ckanext/example_theme/v11_extra_public_directory/templates/home/index.html
A ckanext/example_theme/v11_extra_public_directory/templates/home/snippets/promoted.html
A ckanext/example_theme/v11_extra_public_directory/templates/snippets
M doc/theming.rst
M setup.py
Log Message:
-----------
[#847] Add extra_public_paths example
Compare: https://github.com/okfn/ckan/compare/96aee947eb28...3c7f6c8e4048
More information about the ckan-changes
mailing list