[ckan-changes] [okfn/ckan] e155d9: [2911] initial draft
GitHub
noreply at github.com
Fri Dec 14 18:00:32 UTC 2012
Branch: refs/heads/1635-feature-email-notifications-for-activity-streams
Home: https://github.com/okfn/ckan
Commit: e155d9ae67a7095d788b236ff749b4f52005372a
https://github.com/okfn/ckan/commit/e155d9ae67a7095d788b236ff749b4f52005372a
Author: kindly <kindly at gmail.com>
Date: 2012-09-06 (Thu, 06 Sep 2012)
Changed paths:
A doc/oranization_group_auth.rst
Log Message:
-----------
[2911] initial draft
Commit: a76dcab9f0472715d29e7d786beced107d7a5abc
https://github.com/okfn/ckan/commit/a76dcab9f0472715d29e7d786beced107d7a5abc
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-09-10 (Mon, 10 Sep 2012)
Changed paths:
M doc/oranization_group_auth.rst
Log Message:
-----------
Fleshing out Organizations and Groups spec
Adding more detail from my own thoughts, the pull request, and Ross's
Google Doc
Commit: 5e2f6facc94f467bc112f0c7cfc90eccff05ce00
https://github.com/okfn/ckan/commit/5e2f6facc94f467bc112f0c7cfc90eccff05ce00
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-09-10 (Mon, 10 Sep 2012)
Changed paths:
M doc/oranization_group_auth.rst
Log Message:
-----------
Add a comment to Organizations and Groups spec
Commit: c3c67d87d2a585e407f9556af7999d00f4d937fa
https://github.com/okfn/ckan/commit/c3c67d87d2a585e407f9556af7999d00f4d937fa
Author: kindly <kindly at gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)
Changed paths:
M doc/oranization_group_auth.rst
Log Message:
-----------
[2911] Answer seans questions in doc
Commit: fcd5861939b49ef08509da72ae24bc1dbbc04417
https://github.com/okfn/ckan/commit/fcd5861939b49ef08509da72ae24bc1dbbc04417
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-09-13 (Thu, 13 Sep 2012)
Changed paths:
M doc/oranization_group_auth.rst
Log Message:
-----------
Fix typos and wrapping in Groups and Organizations spec
Commit: 12f00213a0b66c0a44c016a90a0e67b1f7e07bd5
https://github.com/okfn/ckan/commit/12f00213a0b66c0a44c016a90a0e67b1f7e07bd5
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-09-13 (Thu, 13 Sep 2012)
Changed paths:
M doc/oranization_group_auth.rst
Log Message:
-----------
Clarify that sysadmins can edit organization metadata
In Groups and Organizations spec
Commit: 5e469854039074c2ae18f73bdb98d38b3b48306c
https://github.com/okfn/ckan/commit/5e469854039074c2ae18f73bdb98d38b3b48306c
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-09-13 (Thu, 13 Sep 2012)
Changed paths:
M doc/oranization_group_auth.rst
Log Message:
-----------
Add a little explanation of groups vs organizations
... at the top of the Groups and Organizations spec
Commit: 63ef8eaaf7688d960b3ddb7f985303eb7a64bca1
https://github.com/okfn/ckan/commit/63ef8eaaf7688d960b3ddb7f985303eb7a64bca1
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-09-13 (Thu, 13 Sep 2012)
Changed paths:
M doc/oranization_group_auth.rst
Log Message:
-----------
Add a bit about groups vs tags to groups and organizations spec
Commit: 10f09824ee32a2f941966e744d5eb3bf17909623
https://github.com/okfn/ckan/commit/10f09824ee32a2f941966e744d5eb3bf17909623
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-09-17 (Mon, 17 Sep 2012)
Changed paths:
M doc/oranization_group_auth.rst
Log Message:
-----------
Clarify groups 'orthogonal collaboration' in Groups & Orgs spec
Commit: d7863bee7c211507edbb68f6431da444bfe86e87
https://github.com/okfn/ckan/commit/d7863bee7c211507edbb68f6431da444bfe86e87
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-09-17 (Mon, 17 Sep 2012)
Changed paths:
R doc/oranization_group_auth.rst
A doc/organizations_and_groups.rst
Log Message:
-----------
renamed: doc/oranization_group_auth.rst -> doc/organizations_and_groups.rst
Commit: 86372c55d1ae532e4fe8235ab59b32934fd96545
https://github.com/okfn/ckan/commit/86372c55d1ae532e4fe8235ab59b32934fd96545
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-20 (Thu, 20 Sep 2012)
Changed paths:
M doc/organizations_and_groups.rst
Log Message:
-----------
[#2911] Add transition plans phase 1
Commit: 005ab3ee50c22d2a26162cb4ceabd516876ee359
https://github.com/okfn/ckan/commit/005ab3ee50c22d2a26162cb4ceabd516876ee359
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-21 (Fri, 21 Sep 2012)
Changed paths:
M doc/organizations_and_groups.rst
Log Message:
-----------
[#2911] Updates to orgs doc
Commit: 2a3eea182d787dde2a10bd60cdb45a55f021036d
https://github.com/okfn/ckan/commit/2a3eea182d787dde2a10bd60cdb45a55f021036d
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-21 (Fri, 21 Sep 2012)
Changed paths:
M doc/organizations_and_groups.rst
Log Message:
-----------
{#2911] Style fixes
Commit: c49c3d7a6e6a635ceecd796b55a679f519242830
https://github.com/okfn/ckan/commit/c49c3d7a6e6a635ceecd796b55a679f519242830
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-21 (Fri, 21 Sep 2012)
Changed paths:
M doc/organizations_and_groups.rst
Log Message:
-----------
[#2911] New tables
Commit: 588db8c5ebb91eab5bdee6c3b2a559b9c68c7628
https://github.com/okfn/ckan/commit/588db8c5ebb91eab5bdee6c3b2a559b9c68c7628
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-25 (Tue, 25 Sep 2012)
Changed paths:
A ckan/migration/versions/061_org_changes.py
M ckan/model/user.py
Log Message:
-----------
[#2939] Sysadmin field on user table and data migration of sysadmins
Commit: 264f6cc5a07fc120ecf3749cc877c3ef10b848f8
https://github.com/okfn/ckan/commit/264f6cc5a07fc120ecf3749cc877c3ef10b848f8
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-25 (Tue, 25 Sep 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
[#2939] Paster now uses new sysadmin model
Commit: 9448f15d09f121b4726c385223cf34c59ecea65d
https://github.com/okfn/ckan/commit/9448f15d09f121b4726c385223cf34c59ecea65d
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-25 (Tue, 25 Sep 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Logged in sysdmins can do anything
Commit: 6c4ced1f1856c394feccba8d5b47c34a2e86cc90
https://github.com/okfn/ckan/commit/6c4ced1f1856c394feccba8d5b47c34a2e86cc90
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-25 (Tue, 25 Sep 2012)
Changed paths:
M ckan/migration/versions/061_org_changes.py
M ckan/model/package.py
Log Message:
-----------
[#2939] Package table changes
Commit: d5a1a3031bfc2cd28c2577f18aefc8584fd74c03
https://github.com/okfn/ckan/commit/d5a1a3031bfc2cd28c2577f18aefc8584fd74c03
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-25 (Tue, 25 Sep 2012)
Changed paths:
A ckan/controllers/organization.py
Log Message:
-----------
[#2939] Add organization controller
Commit: ca2078a3c0b17bf243dc77e4b1f5ac94ddd5c771
https://github.com/okfn/ckan/commit/ca2078a3c0b17bf243dc77e4b1f5ac94ddd5c771
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-25 (Tue, 25 Sep 2012)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
[#2939] Organization routes added
Commit: d657cec384381d1854d55b4698f899aad570b95d
https://github.com/okfn/ckan/commit/d657cec384381d1854d55b4698f899aad570b95d
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-25 (Tue, 25 Sep 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2939] Group controller now calls org actions for orgs
Commit: 84fa14e4a8e86f2d0ce781d13df6f78a5c8f3687
https://github.com/okfn/ckan/commit/84fa14e4a8e86f2d0ce781d13df6f78a5c8f3687
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-25 (Tue, 25 Sep 2012)
Changed paths:
M ckan/lib/helpers.py
M ckan/templates/header.html
Log Message:
-----------
[#2939] Orgs menu item added to header
Commit: 282aa940d6dd9580b96381773d37f5647df64fcf
https://github.com/okfn/ckan/commit/282aa940d6dd9580b96381773d37f5647df64fcf
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-25 (Tue, 25 Sep 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#2939] Action added organization_list
Commit: 0ab4408f72a6830145fc6d1cdc54a717101116e2
https://github.com/okfn/ckan/commit/0ab4408f72a6830145fc6d1cdc54a717101116e2
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-25 (Tue, 25 Sep 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#2939] Improve organization_list
Commit: 2ecb361738f588404be3a0b3673376c98d403354
https://github.com/okfn/ckan/commit/2ecb361738f588404be3a0b3673376c98d403354
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-25 (Tue, 25 Sep 2012)
Changed paths:
A ckan/templates/organization/base_form_page.html
A ckan/templates/organization/confirm_delete.html
A ckan/templates/organization/edit.html
A ckan/templates/organization/index.html
A ckan/templates/organization/new.html
A ckan/templates/organization/new_organization_form.html
A ckan/templates/organization/read.html
A ckan/templates/organization/snippets/feeds.html
A ckan/templates/organization/snippets/organization_form.html
A ckan/templates/organization/snippets/organization_item.html
A ckan/templates/organization/snippets/organization_list.html
A ckan/templates/snippets/organization.html
A ckan/templates/snippets/organization_item.html
Log Message:
-----------
[#2939] Organization ytemplates added
Commit: a906371fbc5be6977e9dd6bfdaa834b0cdd5bf65
https://github.com/okfn/ckan/commit/a906371fbc5be6977e9dd6bfdaa834b0cdd5bf65
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-25 (Tue, 25 Sep 2012)
Changed paths:
A ckan/public/base/images/placeholder-organization.png
Log Message:
-----------
[#2939] Organization placeholder added
Commit: 3fcdb377f844d5b6ee7e1d87c1dec63111414dc7
https://github.com/okfn/ckan/commit/3fcdb377f844d5b6ee7e1d87c1dec63111414dc7
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-25 (Tue, 25 Sep 2012)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
[#2939] Fix route
Commit: dc1bce402f549ceb2225ecaa1c9e587f6d34be7d
https://github.com/okfn/ckan/commit/dc1bce402f549ceb2225ecaa1c9e587f6d34be7d
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-25 (Tue, 25 Sep 2012)
Changed paths:
M ckan/controllers/organization.py
Log Message:
-----------
[#2939] Use new templates in org controller
Commit: ed69773280907bf4aa11e7e8cd378003487604e7
https://github.com/okfn/ckan/commit/ed69773280907bf4aa11e7e8cd378003487604e7
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-25 (Tue, 25 Sep 2012)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
[#2939] Action organization_create
Commit: 3d5e9952c31218d3e4a702d8cf1ce03b8128726c
https://github.com/okfn/ckan/commit/3d5e9952c31218d3e4a702d8cf1ce03b8128726c
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-25 (Tue, 25 Sep 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#2939] Action organization_show
Commit: f347c06bf4e016762a8a6484f530076637b4e4c5
https://github.com/okfn/ckan/commit/f347c06bf4e016762a8a6484f530076637b4e4c5
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-25 (Tue, 25 Sep 2012)
Changed paths:
M ckan/logic/action/update.py
Log Message:
-----------
[#2939] Action organization_update
Commit: 41bc0c63eda371029a9ee1ec37aa087f53cac98c
https://github.com/okfn/ckan/commit/41bc0c63eda371029a9ee1ec37aa087f53cac98c
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-26 (Wed, 26 Sep 2012)
Changed paths:
M ckan/migration/versions/061_org_changes.py
Log Message:
-----------
[#2939] Upgrade package_revision table
Commit: c46a34ec4e3a9e069fe32dc27d7c67a15e6fa4a2
https://github.com/okfn/ckan/commit/c46a34ec4e3a9e069fe32dc27d7c67a15e6fa4a2
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-27 (Thu, 27 Sep 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2939] Add _replace_group_org controller helper
Commit: eb8be2bd9614caacbe1b00ea2d2ec831fff27993
https://github.com/okfn/ckan/commit/eb8be2bd9614caacbe1b00ea2d2ec831fff27993
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-27 (Thu, 27 Sep 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2939] Update and add wrappers to group controller for org hijacking
Commit: 6c4f6f7f49a8a544bd658b35cc119b6777c7cc8a
https://github.com/okfn/ckan/commit/6c4f6f7f49a8a544bd658b35cc119b6777c7cc8a
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-27 (Thu, 27 Sep 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2939] Update group controller to use wrapper functions
Commit: 16333d9c040f6f604e06c06d3a8697bbf63e5f0a
https://github.com/okfn/ckan/commit/16333d9c040f6f604e06c06d3a8697bbf63e5f0a
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-27 (Thu, 27 Sep 2012)
Changed paths:
M ckan/controllers/organization.py
Log Message:
-----------
[#2939] Update org controller docstring and minor fix
Commit: bffa11044b96c574564f8ae06fe5981788e314b4
https://github.com/okfn/ckan/commit/bffa11044b96c574564f8ae06fe5981788e314b4
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-27 (Thu, 27 Sep 2012)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
[#2939] Update group/org create action
Commit: e482f5a8d60ebba6d77184cd5525b93f511e40ed
https://github.com/okfn/ckan/commit/e482f5a8d60ebba6d77184cd5525b93f511e40ed
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-27 (Thu, 27 Sep 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#2939] Update group/org list action
Commit: 945994316a8943d8f2843cdf7895e58fe48e95d7
https://github.com/okfn/ckan/commit/945994316a8943d8f2843cdf7895e58fe48e95d7
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-27 (Thu, 27 Sep 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#2939] Update group/org show action
Commit: d22b951449b40b32bdd6c7483b08b7edcbdd6178
https://github.com/okfn/ckan/commit/d22b951449b40b32bdd6c7483b08b7edcbdd6178
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-27 (Thu, 27 Sep 2012)
Changed paths:
M ckan/logic/action/update.py
Log Message:
-----------
[#2939] Update group/org update action
Commit: 664aae58a706a77caa44373b93c58bb4e0a3128a
https://github.com/okfn/ckan/commit/664aae58a706a77caa44373b93c58bb4e0a3128a
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-27 (Thu, 27 Sep 2012)
Changed paths:
M ckan/templates/organization/confirm_delete.html
M ckan/templates/organization/snippets/organization_item.html
Log Message:
-----------
[#2939] Organization template updates
Commit: dbf6776602fc42b2d0fc8a1b664854a4ae290682
https://github.com/okfn/ckan/commit/dbf6776602fc42b2d0fc8a1b664854a4ae290682
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-27 (Thu, 27 Sep 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2939] Helper function organization_link added
Commit: e1818f5cf1baa52ede9ba24922f11267c70ce74a
https://github.com/okfn/ckan/commit/e1818f5cf1baa52ede9ba24922f11267c70ce74a
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-27 (Thu, 27 Sep 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/update.py
Log Message:
-----------
[#2939] Helper Organizations activities created
Commit: ccf58e3dffed9e500f5de10c800bbee320933e43
https://github.com/okfn/ckan/commit/ccf58e3dffed9e500f5de10c800bbee320933e43
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-27 (Thu, 27 Sep 2012)
Changed paths:
M ckan/lib/activity_streams.py
M ckan/logic/action/get.py
Log Message:
-----------
[#2939] Add org activity streams display functionality
Commit: 8350e90c4a39b64c0a7a200a5fd2b945d61f8f2a
https://github.com/okfn/ckan/commit/8350e90c4a39b64c0a7a200a5fd2b945d61f8f2a
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-28 (Fri, 28 Sep 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2939] Group controller _check_access helper added
Commit: 08b39a765f7bb745440ccec3f49bb88a9d934c10
https://github.com/okfn/ckan/commit/08b39a765f7bb745440ccec3f49bb88a9d934c10
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-28 (Fri, 28 Sep 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
[#2939] Do not list organization in package group list
Commit: 8b4891d2f9eb845f788f903072d445be2c69b4a2
https://github.com/okfn/ckan/commit/8b4891d2f9eb845f788f903072d445be2c69b4a2
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-28 (Fri, 28 Sep 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2939] Template helper function organizations_available added
Commit: 7744008627600e2a415e69130744882f003393de
https://github.com/okfn/ckan/commit/7744008627600e2a415e69130744882f003393de
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-28 (Fri, 28 Sep 2012)
Changed paths:
M ckan/templates/package/snippets/package_metadata_fields.html
Log Message:
-----------
[#2939] Metadata template uses organizations_available()
Commit: 5727ae82c199bde6197ade5cf2c5d145c493f4b5
https://github.com/okfn/ckan/commit/5727ae82c199bde6197ade5cf2c5d145c493f4b5
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-28 (Fri, 28 Sep 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/get.py
M ckan/logic/schema.py
M ckan/migration/versions/061_org_changes.py
M ckan/model/group.py
Log Message:
-----------
[#2939] Add is_organization boolean to group model
Commit: e7c53b56de2e7cc73eb24adac7412dc0277c3327
https://github.com/okfn/ckan/commit/e7c53b56de2e7cc73eb24adac7412dc0277c3327
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-28 (Fri, 28 Sep 2012)
Changed paths:
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/plugins/interfaces.py
Log Message:
-----------
[#2939] IOrganizationController extension added
Commit: 41e05178f4aebbdce65670469c732610313e13c9
https://github.com/okfn/ckan/commit/41e05178f4aebbdce65670469c732610313e13c9
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-28 (Fri, 28 Sep 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#2939] Add organization_list_for_user action
Commit: bc5db908d9e101e178045f1a0c6911a6c873a777
https://github.com/okfn/ckan/commit/bc5db908d9e101e178045f1a0c6911a6c873a777
Author: tobes <toby.junk at gmail.com>
Date: 2012-09-28 (Fri, 28 Sep 2012)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[#2939] Add new activity types to schema
Commit: 85a7d23ba12e40dd80f923be1b3350af6582046e
https://github.com/okfn/ckan/commit/85a7d23ba12e40dd80f923be1b3350af6582046e
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/logic/action/update.py
Log Message:
-----------
[#2939] New action package_owner_org_update
Commit: 871c5517f9d4532797979b55efe940e238bfab96
https://github.com/okfn/ckan/commit/871c5517f9d4532797979b55efe940e238bfab96
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/update.py
Log Message:
-----------
[#2939] Update the package owner when package updated to allow searches
Commit: 7c0f0a78997290fccaf493f7ebbbcfc34ac45f7c
https://github.com/okfn/ckan/commit/7c0f0a78997290fccaf493f7ebbbcfc34ac45f7c
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/model/group.py
Log Message:
-----------
[#2939] Group.active_packages() fixes
Commit: bd77a472adfb31f25d52167032d758586ca59ddb
https://github.com/okfn/ckan/commit/bd77a472adfb31f25d52167032d758586ca59ddb
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
[#2939] Group list now shows correct packages based on user
Commit: 166b98efc91f74e3ced06e8ded2e2191b1f5e6fb
https://github.com/okfn/ckan/commit/166b98efc91f74e3ced06e8ded2e2191b1f5e6fb
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2939] Group list now shows correct packages based on user part 2
Commit: 7ed975b0364fd3325f73d020145a8ce416b12233
https://github.com/okfn/ckan/commit/7ed975b0364fd3325f73d020145a8ce416b12233
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
[#2939] Organization now part of package dict
Commit: 6be2f36cd0afde46e22a43168f3076c8e9895b45
https://github.com/okfn/ckan/commit/6be2f36cd0afde46e22a43168f3076c8e9895b45
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/lib/dictization/model_save.py
Log Message:
-----------
[#2939] Organization not part of package dict groups
Commit: 9df8370204021c103fc122c17a3d760afb14c101
https://github.com/okfn/ckan/commit/9df8370204021c103fc122c17a3d760afb14c101
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
[#2939] Package schema change - add owner_org
Commit: 85bf807c0cebfdbb609f1f08c4ca20f17da2fb3d
https://github.com/okfn/ckan/commit/85bf807c0cebfdbb609f1f08c4ca20f17da2fb3d
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/templates/package/read.html
Log Message:
-----------
[#2939] Organization added to package read template
Commit: 0f0da1d27292d88fb84c4b2abe2fb2eebc6fd7f4
https://github.com/okfn/ckan/commit/0f0da1d27292d88fb84c4b2abe2fb2eebc6fd7f4
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/templates/package/snippets/package_metadata_fields.html
Log Message:
-----------
[#2939] Organization dropdown improvements
Commit: f458cc80517dc36d120b62cc23588f2ec1c9ef3a
https://github.com/okfn/ckan/commit/f458cc80517dc36d120b62cc23588f2ec1c9ef3a
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/model/__init__.py
Log Message:
-----------
[#2939] group_revision_table available via model
Commit: 63cf7674b649254d983d6ffb1ccd860ef779a69c
https://github.com/okfn/ckan/commit/63cf7674b649254d983d6ffb1ccd860ef779a69c
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/templates/snippets/organization.html
Log Message:
-----------
[#2939] Organization snippet improvement
Commit: 0bf01d9a2397be7f1dddc57997dd3b22afe19bb0
https://github.com/okfn/ckan/commit/0bf01d9a2397be7f1dddc57997dd3b22afe19bb0
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/logic/action/update.py
Log Message:
-----------
[#2939] Minor refactor of package_owner_org_update
Commit: 73284147bb479d3b28f38db308ee0feb49270155
https://github.com/okfn/ckan/commit/73284147bb479d3b28f38db308ee0feb49270155
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/lib/search/index.py
Log Message:
-----------
[#2939] Fixes for solr indexing
Commit: 3c3ce448b40c8ac49dd930e223ededd29ef7109f
https://github.com/okfn/ckan/commit/3c3ce448b40c8ac49dd930e223ededd29ef7109f
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#2939] Get user id helper added
Commit: fa746c056040dcfd3f340960cff38aea25954774
https://github.com/okfn/ckan/commit/fa746c056040dcfd3f340960cff38aea25954774
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
[#2939] Add creator of org/group as admin
Commit: b776839ac5bc9337514580578abfd2a6bf461402
https://github.com/okfn/ckan/commit/b776839ac5bc9337514580578abfd2a6bf461402
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#2939] Action organization_list_for_user uses authz_new helper
Commit: 545d8d61de662cb0ed6775e275e6161bf539d626
https://github.com/okfn/ckan/commit/545d8d61de662cb0ed6775e275e6161bf539d626
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/logic/auth/create.py
Log Message:
-----------
[#2939] Auth create_group updated
Commit: efbef7ddc62d4049b1b041f4ed0a06916c7aa01c
https://github.com/okfn/ckan/commit/efbef7ddc62d4049b1b041f4ed0a06916c7aa01c
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Auth get_user_id_for_username helper function
Commit: b1c03b4ea4487ca40da7d815a75d866b24cffaa0
https://github.com/okfn/ckan/commit/b1c03b4ea4487ca40da7d815a75d866b24cffaa0
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/templates/group/index.html
Log Message:
-----------
[#2939] Add group button permission check
Commit: 53334234ae268fca4ebacc3229384834064958ba
https://github.com/okfn/ckan/commit/53334234ae268fca4ebacc3229384834064958ba
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/logic/auth/create.py
Log Message:
-----------
[#2939] Auth create_org added & create_group fixes
Commit: c0d5b46630a0606e5f3cf2083ba7513dafd63d01
https://github.com/okfn/ckan/commit/c0d5b46630a0606e5f3cf2083ba7513dafd63d01
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/logic/auth/create.py
Log Message:
-----------
[#2939] Name function correctly
Commit: bc8441c95cbd1c78384482de88d6c2be67add880
https://github.com/okfn/ckan/commit/bc8441c95cbd1c78384482de88d6c2be67add880
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/templates/group/index.html
M ckan/templates/organization/index.html
Log Message:
-----------
[#2939] Group/Org index template fixes
Commit: c5969b8c1f83f70ce4c1fa55a63926ebb3e7c789
https://github.com/okfn/ckan/commit/c5969b8c1f83f70ce4c1fa55a63926ebb3e7c789
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-02 (Tue, 02 Oct 2012)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
[#2939] Fix typo
Commit: 2ca6d88011d772d107862e05c89a34ab03ba299c
https://github.com/okfn/ckan/commit/2ca6d88011d772d107862e05c89a34ab03ba299c
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
[#2939] Move the membership adding so that the revision table works
Commit: 5d89021b11be76a687d7527b9c61eacedb423043
https://github.com/okfn/ckan/commit/5d89021b11be76a687d7527b9c61eacedb423043
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/logic/action/update.py
Log Message:
-----------
[#2939] Bugfix None org in package_owner_org_update()
Commit: 064630037ab97820eb8be7089ad7d5b353b01b20
https://github.com/okfn/ckan/commit/064630037ab97820eb8be7089ad7d5b353b01b20
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/logic/auth/delete.py
Log Message:
-----------
[#2939] Auth changes delete group/org
Commit: d451bab0c075fcfde24f33a294a25e98c681a096
https://github.com/okfn/ckan/commit/d451bab0c075fcfde24f33a294a25e98c681a096
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/logic/auth/get.py
Log Message:
-----------
[#2939] Auth org list functions
Commit: 8c026847881800b449fb8ad891eb5a165b490111
https://github.com/okfn/ckan/commit/8c026847881800b449fb8ad891eb5a165b490111
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/logic/auth/get.py
Log Message:
-----------
[#2939] Auth package_show() changes
Commit: a154aab9d434f218af832a1aa72c9e44dc02a6e9
https://github.com/okfn/ckan/commit/a154aab9d434f218af832a1aa72c9e44dc02a6e9
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/logic/auth/get.py
Log Message:
-----------
[#2939] Auth group/org show changes - everyone can see
Commit: 3175db333062bec34d6d6d702ac3fcf784fbaaa8
https://github.com/okfn/ckan/commit/3175db333062bec34d6d6d702ac3fcf784fbaaa8
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/logic/auth/update.py
Log Message:
-----------
[#2939] Auth group/org update
Commit: c540a2eac699ddce43d48a73f1007a6f98523a77
https://github.com/okfn/ckan/commit/c540a2eac699ddce43d48a73f1007a6f98523a77
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[#2939] Boolean validator added
Commit: 69615afa49960e98ef0a36122754ddd41235f523
https://github.com/okfn/ckan/commit/69615afa49960e98ef0a36122754ddd41235f523
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
[#2939] Package schema now allows private field to be set
Commit: 41db0fa2895524e3e4a5046efecf5b168e7cfbbe
https://github.com/okfn/ckan/commit/41db0fa2895524e3e4a5046efecf5b168e7cfbbe
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/templates/package/snippets/package_metadata_fields.html
Log Message:
-----------
[#2939] Template change Organization label
Commit: 1e409b629719bcefb494454f4aae2d54a979db64
https://github.com/okfn/ckan/commit/1e409b629719bcefb494454f4aae2d54a979db64
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Auth functions succeed if ignore_auth context option provided
Commit: 8ecf7127cd985394db77c56c47d622a70a6ca002
https://github.com/okfn/ckan/commit/8ecf7127cd985394db77c56c47d622a70a6ca002
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Auth function has_user_permission_for_group_or_org() added
Commit: c841455edb34d80321575fe53005a9ba3b9172e4
https://github.com/okfn/ckan/commit/c841455edb34d80321575fe53005a9ba3b9172e4
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/templates/package/read.html
A ckan/templates/snippets/private.html
Log Message:
-----------
[#2939] Template show private on package read
Commit: a7c09dee7c7991ce59c6751a5a6c3ff527920d06
https://github.com/okfn/ckan/commit/a7c09dee7c7991ce59c6751a5a6c3ff527920d06
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/lib/search/index.py
Log Message:
-----------
[#2939] Search index privacy info
Commit: ac8e9d8e0f77f3c8635dbe5e01331320591f6423
https://github.com/okfn/ckan/commit/ac8e9d8e0f77f3c8635dbe5e01331320591f6423
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/templates/package/snippets/package_metadata_fields.html
Log Message:
-----------
[#2939] Set privacy for datasets
Commit: 6cb7c1de1fb3ad79494ec5051a5867b95f89ae99
https://github.com/okfn/ckan/commit/6cb7c1de1fb3ad79494ec5051a5867b95f89ae99
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/logic/auth/get.py
Log Message:
-----------
[#2939] Add new sysadmin pseudo access check
Commit: c8415c50c16ca403df56dcf481a479a57948c1d5
https://github.com/okfn/ckan/commit/c8415c50c16ca403df56dcf481a479a57948c1d5
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[#2939] Fix for boolean validator if bool is passed
Commit: 5e403fdd59b5acea011b8be8e17b11f5640046ee
https://github.com/okfn/ckan/commit/5e403fdd59b5acea011b8be8e17b11f5640046ee
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/templates/package/snippets/package_metadata_fields.html
Log Message:
-----------
[#2939] Template fixes for dataset edits
Commit: e0729aba92b92a0473c78dd4a0ccc45525db26db
https://github.com/okfn/ckan/commit/e0729aba92b92a0473c78dd4a0ccc45525db26db
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
[#2939] Plugin extension point additions in dictizations
Commit: 24c539b1cc5e02ebcddf5840815a8daccecafa38
https://github.com/okfn/ckan/commit/24c539b1cc5e02ebcddf5840815a8daccecafa38
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/lib/jinja_extensions.py
Log Message:
-----------
[#2939] Fix bug in jinja2 truncate on None
Commit: 44227682342e5cd9c43944be3ba2e41eea5421ad
https://github.com/okfn/ckan/commit/44227682342e5cd9c43944be3ba2e41eea5421ad
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/templates/package/read.html
Log Message:
-----------
[#2939] Template do not show groups for private dataset
Commit: 70e7d095fbea937945bbb9d5250982e606e48c6e
https://github.com/okfn/ckan/commit/70e7d095fbea937945bbb9d5250982e606e48c6e
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/logic/action/delete.py
Log Message:
-----------
[#2939] Delete group/org action
Commit: 81007ae0484f88437a15b97a692aa2ac86357467
https://github.com/okfn/ckan/commit/81007ae0484f88437a15b97a692aa2ac86357467
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2939] New Template helper function user_in_org_or_group()
Commit: 29541678d6ba8845e8320808ad1de3f17b8b2500
https://github.com/okfn/ckan/commit/29541678d6ba8845e8320808ad1de3f17b8b2500
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/lib/app_globals.py
M ckan/templates/organization/read.html
Log Message:
-----------
[#2939] Show public/private capacity
Commit: 80688532dbd3c4d207a3808941017dd142199c47
https://github.com/okfn/ckan/commit/80688532dbd3c4d207a3808941017dd142199c47
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/controllers/admin.py
Log Message:
-----------
[#2939] Fix for admin controller
Commit: d317b78c584a415cb5e2d7aac5d2348ff9acb4cf
https://github.com/okfn/ckan/commit/d317b78c584a415cb5e2d7aac5d2348ff9acb4cf
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/logic/auth/create.py
Log Message:
-----------
[#2939] Move auth functions to aid code review
Commit: 1452f3265a12c3f5e9ceda7e1344540983b14ed2
https://github.com/okfn/ckan/commit/1452f3265a12c3f5e9ceda7e1344540983b14ed2
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/logic/auth/create.py
Log Message:
-----------
[#2939] Auth create remove sysadmin references
Commit: 0b681da3d20e425ed55ae381a799cd9c1881b3b4
https://github.com/okfn/ckan/commit/0b681da3d20e425ed55ae381a799cd9c1881b3b4
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/logic/auth/delete.py
Log Message:
-----------
[#2939] Auth delete remove sysadmin references
Commit: 3be742b38fbfb3b424192916631d4f1f6129c018
https://github.com/okfn/ckan/commit/3be742b38fbfb3b424192916631d4f1f6129c018
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/logic/auth/update.py
Log Message:
-----------
[#2939] Auth update remove sysadmin references
Commit: e1d172be8814d0e12cec01a42d50f759f89d30c2
https://github.com/okfn/ckan/commit/e1d172be8814d0e12cec01a42d50f759f89d30c2
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-03 (Wed, 03 Oct 2012)
Changed paths:
M ckan/logic/auth/delete.py
Log Message:
-----------
[#2939] remove Authorizer from auth delete
Commit: e4affe7ee8512e914f667e6deb904e81eb2f8533
https://github.com/okfn/ckan/commit/e4affe7ee8512e914f667e6deb904e81eb2f8533
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
M ckan/controllers/admin.py
Log Message:
-----------
[#2939] Fix admin controller for none admin redirect
Commit: e6fbfabf6bedd8f1a5f75a146105c8423ccd08e9
https://github.com/okfn/ckan/commit/e6fbfabf6bedd8f1a5f75a146105c8423ccd08e9
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
[#2939] Fix for create group as non-sysadmin user
Commit: 5b14d0d758661428977c2981ca7e1a354da2b406
https://github.com/okfn/ckan/commit/5b14d0d758661428977c2981ca7e1a354da2b406
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
M ckan/logic/action/delete.py
Log Message:
-----------
[#2939] Fix for delete org action
Commit: b396cbc993949dcb8ef4849bd09199fb8acd2a99
https://github.com/okfn/ckan/commit/b396cbc993949dcb8ef4849bd09199fb8acd2a99
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
M ckan/logic/auth/get.py
Log Message:
-----------
[#2939] Dataset must be active to view
Commit: f3cb0a5aaf03fc88e6767d91d7f194aee61abe0c
https://github.com/okfn/ckan/commit/f3cb0a5aaf03fc88e6767d91d7f194aee61abe0c
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
[#2939] Schema fixes for legacy templates to work
Commit: febe61f00edffb9a979473dc2b267288b2e506f7
https://github.com/okfn/ckan/commit/febe61f00edffb9a979473dc2b267288b2e506f7
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Check user sysadmin status when no c.userobj
Commit: 01617b7ad62867c2801523252f845e7c8eff229c
https://github.com/okfn/ckan/commit/01617b7ad62867c2801523252f845e7c8eff229c
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Auth editors can update
Commit: 86b4826ebf086b7d0554be66f849d6a1d54185fd
https://github.com/okfn/ckan/commit/86b4826ebf086b7d0554be66f849d6a1d54185fd
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2930] Improve get_user_id_for_username()
Commit: 0edd52d6f924fa66e6bb559ddfb9d277e2aef048
https://github.com/okfn/ckan/commit/0edd52d6f924fa66e6bb559ddfb9d277e2aef048
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
M test-core.ini
Log Message:
-----------
[#2930] Allow create group/org for testing
Commit: d99e4e5c0c48b623eb46e61cb54b92062f80af9e
https://github.com/okfn/ckan/commit/d99e4e5c0c48b623eb46e61cb54b92062f80af9e
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
M ckan/tests/functional/api/base.py
Log Message:
-----------
[#2930] Api Tests allow sysadmin when needed
Commit: 337000d3ec2a59d2acfe4541e623f594c97e50ce
https://github.com/okfn/ckan/commit/337000d3ec2a59d2acfe4541e623f594c97e50ce
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
M ckan/tests/functional/api/model/test_group.py
Log Message:
-----------
[#2930] Test fixes fn/api/model/group
Commit: 0a665f3829388d0b111bc521baac53a97ae002a6
https://github.com/okfn/ckan/commit/0a665f3829388d0b111bc521baac53a97ae002a6
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
M ckan/tests/functional/api/model/test_vocabulary.py
Log Message:
-----------
[#2930] Test fixes fn/api/model/vocab
Commit: bdc41dceabf4e1f4a64d995cf7390911de1e12d2
https://github.com/okfn/ckan/commit/bdc41dceabf4e1f4a64d995cf7390911de1e12d2
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
M ckan/tests/functional/test_admin.py
Log Message:
-----------
[#2930] Test fixes fn/admin
Commit: 3afe0a8fbd9ccc4c0aab4a527685a5ab9f6fbb23
https://github.com/okfn/ckan/commit/3afe0a8fbd9ccc4c0aab4a527685a5ab9f6fbb23
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
M ckan/tests/functional/test_authz.py
Log Message:
-----------
[#2930] Test fixes fn/authz
Commit: 9857a67797a930442947673a1a1e412a8bd5a15e
https://github.com/okfn/ckan/commit/9857a67797a930442947673a1a1e412a8bd5a15e
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
M ckan/tests/functional/test_group.py
Log Message:
-----------
[#2930] Test fixes fn/group
Commit: b65fa1f9c0c48a5b2f9c8c76d1f8883ed1f895dd
https://github.com/okfn/ckan/commit/b65fa1f9c0c48a5b2f9c8c76d1f8883ed1f895dd
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
M ckan/tests/functional/test_package.py
Log Message:
-----------
[#2930] Test fixes fn/package
Commit: b350413f8e7c730adf293c4304517da82eae0e42
https://github.com/okfn/ckan/commit/b350413f8e7c730adf293c4304517da82eae0e42
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
M ckan/tests/lib/test_dictization.py
Log Message:
-----------
[#2930] Test fixes lib/dictization
Commit: ae6caba190f8259a87e869ba156fba5a2e203dad
https://github.com/okfn/ckan/commit/ae6caba190f8259a87e869ba156fba5a2e203dad
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
M ckan/tests/lib/test_dictization_schema.py
Log Message:
-----------
[#2930] Test fixes lib/dictization_schema
Commit: 981043c8a9a7e96da392a75d34cd0a6771d31dbb
https://github.com/okfn/ckan/commit/981043c8a9a7e96da392a75d34cd0a6771d31dbb
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-05 (Fri, 05 Oct 2012)
Changed paths:
M ckan/lib/create_test_data.py
Log Message:
-----------
[#2930] Test fixes create sysadmins with new method
Commit: 81adad8af0b9a9a201799abcd60e329e1783ecdc
https://github.com/okfn/ckan/commit/81adad8af0b9a9a201799abcd60e329e1783ecdc
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-08 (Mon, 08 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Move is_sysadmin as a standalone function
Commit: 59ffc6340a6e29da907c3fc5bd7b7a3e765c0971
https://github.com/okfn/ckan/commit/59ffc6340a6e29da907c3fc5bd7b7a3e765c0971
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-08 (Mon, 08 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Clean-up imports in new_authz.py
Commit: b6bd7e7e1249aac7f707c70d2080c13e61d7597e
https://github.com/okfn/ckan/commit/b6bd7e7e1249aac7f707c70d2080c13e61d7597e
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2939] Minor docstring fix
Commit: 6fd440d2825cfc0acc7bfb760650659e2dd8dcef
https://github.com/okfn/ckan/commit/6fd440d2825cfc0acc7bfb760650659e2dd8dcef
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
R ckan/logic/auth/publisher/__init__.py
R ckan/logic/auth/publisher/create.py
R ckan/logic/auth/publisher/delete.py
R ckan/logic/auth/publisher/get.py
R ckan/logic/auth/publisher/update.py
Log Message:
-----------
[#2939] remove publisher auth stuff - Yeah!
Commit: c537cef33fcb409b53fcf3180efab8937cfea796
https://github.com/okfn/ckan/commit/c537cef33fcb409b53fcf3180efab8937cfea796
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
R ckan/tests/misc/test_auth_profiles.py
Log Message:
-----------
[#2939] Remove publisher tests
Commit: 7f75ec982744ed39bf9792a1d9f29d8fd07727e7
https://github.com/okfn/ckan/commit/7f75ec982744ed39bf9792a1d9f29d8fd07727e7
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
R ckan/controllers/group_formalchemy.py
R ckan/controllers/package_formalchemy.py
Log Message:
-----------
[#2939] Remove form_alchemy controllers
Commit: bc3009eca44b958181ccb309ee13aabb6ef497ff
https://github.com/okfn/ckan/commit/bc3009eca44b958181ccb309ee13aabb6ef497ff
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
[#2939] Remove form_alchemy routes
Commit: 92fcd7712eb008c2a9188a5b8d87743ed58e3afa
https://github.com/okfn/ckan/commit/92fcd7712eb008c2a9188a5b8d87743ed58e3afa
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
M ckan/controllers/admin.py
Log Message:
-----------
[#2939] Sysadmins can change revision state in admin controller - removing Authorizer
Commit: 606ea35c9d5e370f1a11fde69a35d457bdd5b88c
https://github.com/okfn/ckan/commit/606ea35c9d5e370f1a11fde69a35d457bdd5b88c
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
M ckan/lib/base.py
Log Message:
-----------
[#2939] Replace get editable groups in base controller
Commit: b9c8ed7b43ed31fc20ee169d4266ed4927e74319
https://github.com/okfn/ckan/commit/b9c8ed7b43ed31fc20ee169d4266ed4927e74319
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] New get admins for group_id function added
Commit: afc618cec335dc8c1a596f17d3b77d37f9e871f6
https://github.com/okfn/ckan/commit/afc618cec335dc8c1a596f17d3b77d37f9e871f6
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2939] Group controller use new admins for group function
Commit: 20d8d7bd30983f9a310bd2b593d139681043b212
https://github.com/okfn/ckan/commit/20d8d7bd30983f9a310bd2b593d139681043b212
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
M ckan/controllers/package.py
M ckan/lib/base.py
Log Message:
-----------
[#2939] Remove autorizer from controllers
Commit: 6302ba1023eb1f4524e32f02d1a4821034b7d498
https://github.com/okfn/ckan/commit/6302ba1023eb1f4524e32f02d1a4821034b7d498
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
M ckan/controllers/user.py
Log Message:
-----------
[#2939] Remove Authorizer from user controller
Commit: 4252601c8fdb98aca35f2eb57b860b9b64637fbe
https://github.com/okfn/ckan/commit/4252601c8fdb98aca35f2eb57b860b9b64637fbe
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2939] Remove am_authorized helper function
Commit: adca61b7741119abfb1696fa4315f608762cd7bf
https://github.com/okfn/ckan/commit/adca61b7741119abfb1696fa4315f608762cd7bf
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
M ckan/logic/auth/delete.py
Log Message:
-----------
[#2939] Package delete auth changes
Commit: 92485596468844f1c5864c76289bd328e70856bc
https://github.com/okfn/ckan/commit/92485596468844f1c5864c76289bd328e70856bc
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
R ckan/tests/functional/test_publisher_auth.py
Log Message:
-----------
[#2939] Remove publisher auth tests
Commit: 5ca4e4f02067dd31fb8fa1eb9f0b520fc5d363d5
https://github.com/okfn/ckan/commit/5ca4e4f02067dd31fb8fa1eb9f0b520fc5d363d5
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
R ckan/forms/__init__.py
R ckan/forms/authorization_group.py
R ckan/forms/authz.py
R ckan/forms/builder.py
R ckan/forms/common.py
R ckan/forms/group.py
R ckan/forms/package.py
R ckan/forms/package_dict.py
R ckan/forms/registry.py
Log Message:
-----------
[#2939] Remove ckan/forms
Commit: a20ac52f7cfef25892cc85ea3d2296101ef0f328
https://github.com/okfn/ckan/commit/a20ac52f7cfef25892cc85ea3d2296101ef0f328
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
M ckan/lib/base.py
Log Message:
-----------
[#2939] Remove forms usage in lib.base
Commit: cf2a4045726e017ab28bd93034e4177559b3bc59
https://github.com/okfn/ckan/commit/cf2a4045726e017ab28bd93034e4177559b3bc59
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
R ckan/tests/forms/__init__.py
R ckan/tests/forms/test_authz.py
R ckan/tests/forms/test_group.py
R ckan/tests/forms/test_package.py
Log Message:
-----------
[#2939] Remove forms tests as no forms
Commit: b3f7d5520eeeb5fbafbb3f1575a9fe6bd852b8eb
https://github.com/okfn/ckan/commit/b3f7d5520eeeb5fbafbb3f1575a9fe6bd852b8eb
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
M ckan/controllers/api.py
Log Message:
-----------
[#2939] Api slugs no forms dependency
Commit: 47f1764b929f6d019e0ce1199e08280d691cdcc3
https://github.com/okfn/ckan/commit/47f1764b929f6d019e0ce1199e08280d691cdcc3
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
M ckan/controllers/group.py
M ckan/controllers/package.py
Log Message:
-----------
[#2939] Remove ckan.forms from controllers
Commit: fcf49ffd9822b98fb9f00c38f751b6673e2c6f3b
https://github.com/okfn/ckan/commit/fcf49ffd9822b98fb9f00c38f751b6673e2c6f3b
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
[#2939] User dictize sysadmin fix
Commit: abc848a6582ffe70b51bd7c832886d1983b7f465
https://github.com/okfn/ckan/commit/abc848a6582ffe70b51bd7c832886d1983b7f465
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
M ckan/tests/lib/test_dictization_schema.py
Log Message:
-----------
[#2939] Dictize schema test fix
Commit: 9d67c144b358cb659bd49497fc3ee3b886f65967
https://github.com/okfn/ckan/commit/9d67c144b358cb659bd49497fc3ee3b886f65967
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-09 (Tue, 09 Oct 2012)
Changed paths:
R ckan/tests/misc/test_package_saver.py
Log Message:
-----------
[#2939] Remove package saver tests
Commit: c83a641cb4342bb7793cb9f1c83f09c817ef40d8
https://github.com/okfn/ckan/commit/c83a641cb4342bb7793cb9f1c83f09c817ef40d8
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/__init__.py
Log Message:
-----------
[#2939] Ignore auth handled earlier in the auth chain so remove
Commit: c6dc49b4128423c94ebd9964f5a4d02a0c71b726
https://github.com/okfn/ckan/commit/c6dc49b4128423c94ebd9964f5a4d02a0c71b726
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#2939] Make site user sysadmin in new auth system
Commit: cf9059f667d926458a6adbcbc4e8e95cc0c1b068
https://github.com/okfn/ckan/commit/cf9059f667d926458a6adbcbc4e8e95cc0c1b068
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/tests/functional/api/model/test_package.py
Log Message:
-----------
[#2939] Fix model package tests re permissions
Commit: 6d0e6903c94124881061e90a2723a1eecf178e41
https://github.com/okfn/ckan/commit/6d0e6903c94124881061e90a2723a1eecf178e41
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/tests/functional/test_activity.py
Log Message:
-----------
[#2939] Fix activity delete test re permissions
Commit: 889b512019958d26dce259ceec949817c499c8f4
https://github.com/okfn/ckan/commit/889b512019958d26dce259ceec949817c499c8f4
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/tests/functional/test_activity.py
Log Message:
-----------
[#2939] Add snarky comment about pointless test
Commit: ee11e9e66af7e4c9d337795c203736720861fbd5
https://github.com/okfn/ckan/commit/ee11e9e66af7e4c9d337795c203736720861fbd5
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/tests/lib/test_solr_search_index.py
Log Message:
-----------
[#2939] Fix solr tests due to package changes
Commit: a6376a8c361a797d4463f78f03d9500a131097a2
https://github.com/okfn/ckan/commit/a6376a8c361a797d4463f78f03d9500a131097a2
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/tests/functional/test_group.py
Log Message:
-----------
[#2939] Fix lack of admin in test
Commit: 42ec232f575a2f007618edc6c0499dcbea5bac2f
https://github.com/okfn/ckan/commit/42ec232f575a2f007618edc6c0499dcbea5bac2f
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
R ckan/tests/lib/test_authztool.py
Log Message:
-----------
[#2939] Remove outdated auth test
Commit: b4baa7e5abca7a70ef958429aa9c4d3612e6f2a4
https://github.com/okfn/ckan/commit/b4baa7e5abca7a70ef958429aa9c4d3612e6f2a4
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/tests/functional/api/model/test_group.py
Log Message:
-----------
[#2939] Fix api group delete test issues
Commit: 819233ade5a61979aa94958d28c8c101c146a4ad
https://github.com/okfn/ckan/commit/819233ade5a61979aa94958d28c8c101c146a4ad
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Add delete_dataset permission
Commit: 80af92f832ff25b6582c4528ae758a06f24cf77a
https://github.com/okfn/ckan/commit/80af92f832ff25b6582c4528ae758a06f24cf77a
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/config/routing.py
M ckan/controllers/package.py
M ckan/lib/cli.py
M ckan/lib/fanstatic_resources.py
M ckan/lib/helpers.py
M ckan/lib/render.py
R ckan/public/base/.gitignore
A ckan/public/base/css/fuchsia.min.css
A ckan/public/base/css/green.min.css
A ckan/public/base/css/main.min.css
A ckan/public/base/css/maroon.min.css
A ckan/public/base/css/red.min.css
R ckan/public/base/datapreview/css/datapreview.css
A ckan/public/base/datapreview/css/json.css
A ckan/public/base/datapreview/css/json.min.css
A ckan/public/base/datapreview/css/pdf.css
A ckan/public/base/datapreview/css/pdf.min.css
A ckan/public/base/datapreview/css/recline.css
A ckan/public/base/datapreview/css/recline.min.css
R ckan/public/base/datapreview/datapreview.js
A ckan/public/base/datapreview/img/ajaxload-circle.gif
A ckan/public/base/datapreview/preview_json.js
A ckan/public/base/datapreview/preview_json.min.js
A ckan/public/base/datapreview/preview_pdf.js
A ckan/public/base/datapreview/preview_pdf.min.js
A ckan/public/base/datapreview/preview_recline.js
A ckan/public/base/datapreview/preview_recline.min.js
M ckan/public/base/datapreview/resource.config
A ckan/public/base/datapreview/vendor/backbone/0.5.1/backbone.min.js
A ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.css
M ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.css
A ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings.png
R ckan/public/base/datapreview/vendor/flot/0.7/excanvas.js
R ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.js
A ckan/public/base/datapreview/vendor/flotr2/excanvas.js
A ckan/public/base/datapreview/vendor/flotr2/excanvas.min.js
A ckan/public/base/datapreview/vendor/flotr2/flotr2.js
A ckan/public/base/datapreview/vendor/flotr2/flotr2.min.js
A ckan/public/base/datapreview/vendor/jquery.mustache/jquery.mustache.min.js
R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/layers.png
R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/marker-shadow.png
R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/marker.png
R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/popup-close.png
R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/zoom-in.png
R ckan/public/base/datapreview/vendor/leaflet/0.3.1/images/zoom-out.png
R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.css
R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.css
R ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.js
A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.css
A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.ie.css
A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.ie.min.css
A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.js
A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.min.css
A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.min.js
A ckan/public/base/datapreview/vendor/leaflet/images/layers.png
A ckan/public/base/datapreview/vendor/leaflet/images/marker-icon.png
A ckan/public/base/datapreview/vendor/leaflet/images/marker-shadow.png
A ckan/public/base/datapreview/vendor/leaflet/images/zoom-in.png
A ckan/public/base/datapreview/vendor/leaflet/images/zoom-out.png
A ckan/public/base/datapreview/vendor/moment/1.6.2/moment.min.js
A ckan/public/base/datapreview/vendor/mustache/0.5.0-dev/mustache.min.js
A ckan/public/base/datapreview/vendor/pdfjs/pdf.js
A ckan/public/base/datapreview/vendor/pdfjs/pdf.min.js
A ckan/public/base/datapreview/vendor/pdfviewer/compatibility.js
A ckan/public/base/datapreview/vendor/pdfviewer/compatibility.min.js
A ckan/public/base/datapreview/vendor/pdfviewer/debugger.js
A ckan/public/base/datapreview/vendor/pdfviewer/debugger.min.js
A ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-check.svg
A ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-comment.svg
A ckan/public/base/datapreview/vendor/pdfviewer/images/annotation-text.svg
A ckan/public/base/datapreview/vendor/pdfviewer/images/loading-icon.gif
A ckan/public/base/datapreview/vendor/pdfviewer/images/texture.png
A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-bookmark.png
A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-download.png
A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-fullscreen.png
A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-menuArrows.png
A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-openFile.png
A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown-rtl.png
A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageDown.png
A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp-rtl.png
A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-pageUp.png
A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-print.png
A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-search.png
A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-sidebarToggle.png
A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewOutline.png
A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-viewThumbnail.png
A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomIn.png
A ckan/public/base/datapreview/vendor/pdfviewer/images/toolbarButton-zoomOut.png
A ckan/public/base/datapreview/vendor/pdfviewer/locale.properties
A ckan/public/base/datapreview/vendor/pdfviewer/viewer.css
A ckan/public/base/datapreview/vendor/pdfviewer/viewer.js
A ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.css
A ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.js
A ckan/public/base/datapreview/vendor/recline/css/recline.min.css
M ckan/public/base/datapreview/vendor/recline/recline.js
A ckan/public/base/datapreview/vendor/recline/recline.min.js
A ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.min.css
A ckan/public/base/datapreview/vendor/underscore/1.1.6/underscore.min.js
A ckan/public/base/datapreview/vendor/webL10n/README.md
A ckan/public/base/datapreview/vendor/webL10n/l10n.js
A ckan/public/base/datapreview/vendor/webL10n/l10n.min.js
A ckan/public/base/i18n/bg.min.js
A ckan/public/base/i18n/ca.min.js
A ckan/public/base/i18n/cs_CZ.min.js
A ckan/public/base/i18n/de.min.js
A ckan/public/base/i18n/el.min.js
A ckan/public/base/i18n/es.min.js
A ckan/public/base/i18n/fi.min.js
A ckan/public/base/i18n/fr.min.js
A ckan/public/base/i18n/hu.min.js
A ckan/public/base/i18n/it.min.js
A ckan/public/base/i18n/lt.min.js
A ckan/public/base/i18n/lv.min.js
A ckan/public/base/i18n/nl.min.js
A ckan/public/base/i18n/no.min.js
A ckan/public/base/i18n/pl.min.js
A ckan/public/base/i18n/pt_BR.min.js
A ckan/public/base/i18n/ro.min.js
A ckan/public/base/i18n/ru.min.js
A ckan/public/base/i18n/sk.min.js
A ckan/public/base/i18n/sl.min.js
A ckan/public/base/i18n/sq.min.js
A ckan/public/base/i18n/sr.min.js
A ckan/public/base/i18n/sr_Latn.min.js
A ckan/public/base/i18n/sv.min.js
A ckan/public/base/i18n/zh_TW.min.js
A ckan/public/base/javascript/client.min.js
A ckan/public/base/javascript/i18n.min.js
A ckan/public/base/javascript/main.min.js
A ckan/public/base/javascript/module.min.js
A ckan/public/base/javascript/modules/api-info.min.js
A ckan/public/base/javascript/modules/autocomplete.min.js
A ckan/public/base/javascript/modules/basic-form.min.js
A ckan/public/base/javascript/modules/confirm-action.min.js
A ckan/public/base/javascript/modules/custom-fields.min.js
A ckan/public/base/javascript/modules/data-viewer.js
A ckan/public/base/javascript/modules/data-viewer.min.js
A ckan/public/base/javascript/modules/related-item.min.js
A ckan/public/base/javascript/modules/resource-form.min.js
A ckan/public/base/javascript/modules/resource-upload-field.min.js
A ckan/public/base/javascript/modules/select-switch.min.js
A ckan/public/base/javascript/modules/slug-preview.min.js
A ckan/public/base/javascript/notify.min.js
A ckan/public/base/javascript/plugins/jquery.date-helpers.min.js
A ckan/public/base/javascript/plugins/jquery.form-warning.min.js
A ckan/public/base/javascript/plugins/jquery.inherit.min.js
A ckan/public/base/javascript/plugins/jquery.proxy-all.min.js
A ckan/public/base/javascript/plugins/jquery.slug-preview.min.js
A ckan/public/base/javascript/plugins/jquery.slug.min.js
A ckan/public/base/javascript/plugins/jquery.truncator.min.js
A ckan/public/base/javascript/plugins/jquery.url-helpers.min.js
A ckan/public/base/javascript/pubsub.min.js
M ckan/public/base/javascript/resource.config
A ckan/public/base/javascript/sandbox.min.js
A ckan/public/base/javascript/tracking.min.js
M ckan/public/base/less/module.less
A ckan/public/base/test/spec/ckan.spec.min.js
A ckan/public/base/test/spec/client.spec.min.js
A ckan/public/base/test/spec/module.spec.min.js
A ckan/public/base/test/spec/modules/autocomplete.spec.min.js
A ckan/public/base/test/spec/modules/basic-form.spec.min.js
A ckan/public/base/test/spec/modules/confirm-action.spec.min.js
A ckan/public/base/test/spec/modules/custom-fields.spec.min.js
A ckan/public/base/test/spec/modules/related-item.spec.min.js
A ckan/public/base/test/spec/modules/resource-form.spec.min.js
A ckan/public/base/test/spec/modules/resource-upload-field.spec.min.js
A ckan/public/base/test/spec/notify.spec.min.js
A ckan/public/base/test/spec/plugins/jquery.date-helpers.spec.min.js
A ckan/public/base/test/spec/plugins/jquery.form-warning.spec.min.js
A ckan/public/base/test/spec/plugins/jquery.inherit.spec.min.js
A ckan/public/base/test/spec/plugins/jquery.proxy-all.spec.min.js
A ckan/public/base/test/spec/plugins/jquery.slug-preview.spec.min.js
A ckan/public/base/test/spec/plugins/jquery.slug.spec.min.js
A ckan/public/base/test/spec/plugins/jquery.url-helpers.spec.min.js
A ckan/public/base/test/spec/pubsub.spec.min.js
A ckan/public/base/test/spec/sandbox.spec.min.js
A ckan/public/base/test/vendor/chai.min.js
A ckan/public/base/test/vendor/less.min.js
A ckan/public/base/test/vendor/mocha.min.css
A ckan/public/base/test/vendor/mocha.min.js
A ckan/public/base/test/vendor/sinon.min.js
A ckan/public/base/vendor/bootstrap.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-alert.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-button.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-collapse.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-modal.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-tab.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-transition.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-typeahead.min.js
A ckan/public/base/vendor/font-awesome/css/font-awesome-ie7.min.css
A ckan/public/base/vendor/html5.min.js
A ckan/public/base/vendor/jed.min.js
A ckan/public/base/vendor/jquery-fileupload/jquery.fileupload-ui.min.js
A ckan/public/base/vendor/jquery-fileupload/jquery.fileupload.min.js
A ckan/public/base/vendor/jquery-fileupload/jquery.iframe-transport.min.js
A ckan/public/base/vendor/jquery.min.js
A ckan/public/base/vendor/jquery.ui.widget.min.js
M ckan/public/base/vendor/resource.config
A ckan/public/base/vendor/select2/select2.min.css
A ckan/public/base/vendor/select2/select2.min.js
M ckan/public/scripts/application.js
A ckan/public/scripts/outside.js
A ckan/public/scripts/vendor/resize/resize.js
M ckan/templates/ajax_snippets/api_info.html
M ckan/templates/base.html
A ckan/templates/dataviewer/base.html
A ckan/templates/dataviewer/json.html
A ckan/templates/dataviewer/pdf.html
A ckan/templates/dataviewer/recline.html
A ckan/templates/dataviewer/snippets/data_preview.html
A ckan/templates/dataviewer/snippets/no_preview.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/snippets/data_api_button.html
R ckan/templates/snippets/recline-extra-footer.html
R ckan/templates/snippets/recline-extra-header.html
M ckan/templates_legacy/package/resource_read.html
A ckan/templates_legacy/package/snippets/data_preview.html
M ckan/tests/wsgi_ckanclient.py
A ckanext/datastore/bin/create_datastore_db_and_read_only_user.sql
A ckanext/datastore/commands.py
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/logic/auth.py
M ckanext/datastore/plugin.py
M ckanext/datastore/tests/test_datastore.py
M doc/apiv3.rst
M doc/datastore.rst
M doc/domain-model-resource.rst
M doc/using-data-api.rst
M setup.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' into 2939-orgs
Commit: 08be7c6f299a275e6317c022d3fcfd6a95f97a7e
https://github.com/okfn/ckan/commit/08be7c6f299a275e6317c022d3fcfd6a95f97a7e
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[#2939] Fix imports in logic validators
Commit: 49f27ca9669e65a6460c9608fc3ea31e78f636a8
https://github.com/okfn/ckan/commit/49f27ca9669e65a6460c9608fc3ea31e78f636a8
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[#2939] Logic validators use new sysadmin check
Commit: 8981838fa8476b743b4f149527920ad22b241c7b
https://github.com/okfn/ckan/commit/8981838fa8476b743b4f149527920ad22b241c7b
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Minor refactor for readability
Commit: 76a7d51c094b3e9fd35887ec2f99774aacf59b29
https://github.com/okfn/ckan/commit/76a7d51c094b3e9fd35887ec2f99774aacf59b29
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
[#2939] remove some authz routes
Commit: d265e12ec6721d6f565cb528d1dd71c07795a816
https://github.com/okfn/ckan/commit/d265e12ec6721d6f565cb528d1dd71c07795a816
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/templates_legacy/admin/index.html
M ckan/templates_legacy/admin/layout.html
M ckan/templates_legacy/group/layout.html
M ckan/templates_legacy/package/layout.html
Log Message:
-----------
[#2939] Remove some authz links from legacy templates
Commit: a0376cea5ff2d2da77420187b7569a83b42483e7
https://github.com/okfn/ckan/commit/a0376cea5ff2d2da77420187b7569a83b42483e7
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/lib/plugins.py
Log Message:
-----------
[#2939] Remove unused import
Commit: 6412b61efe1895ba60f9c420b3cbb78d43cea47f
https://github.com/okfn/ckan/commit/6412b61efe1895ba60f9c420b3cbb78d43cea47f
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/lib/plugins.py
Log Message:
-----------
[#2939] Switch to you sysadmin model for plugins
Commit: 83cadc9cd527712b09ea22c4bda2aa60719188b7
https://github.com/okfn/ckan/commit/83cadc9cd527712b09ea22c4bda2aa60719188b7
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#2939] Update group_list_authz in actions get
Commit: ac1b1b67cc638c96d41d542dadc1836bbc59d738
https://github.com/okfn/ckan/commit/ac1b1b67cc638c96d41d542dadc1836bbc59d738
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] New Authz add is_authorized_boolean() helper function
Commit: 79ac5739332fd19de3b78a2e7ede01a098761545
https://github.com/okfn/ckan/commit/79ac5739332fd19de3b78a2e7ede01a098761545
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] New Authz new permissions
Commit: 043202d87d99d9f77d0a806fa367305227ca759c
https://github.com/okfn/ckan/commit/043202d87d99d9f77d0a806fa367305227ca759c
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] New Authz new permission
Commit: 63a2fdd4e68c1d6fcdbca6a4b3339bcb3acf47e6
https://github.com/okfn/ckan/commit/63a2fdd4e68c1d6fcdbca6a4b3339bcb3acf47e6
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] New Authz new helper has_user_permission_for_some_org()
Commit: ef74b00ed5583b5fe2a615ec58012bdb32225194
https://github.com/okfn/ckan/commit/ef74b00ed5583b5fe2a615ec58012bdb32225194
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#2939] Update get action organization_list_for_user()
Commit: 3ad47274014f5c1c092f62333a73845335c3cb0c
https://github.com/okfn/ckan/commit/3ad47274014f5c1c092f62333a73845335c3cb0c
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#2939] Update get action package_relationships_list()
Commit: fb12eca793bdf7361df24f6511d1cc9344155919
https://github.com/okfn/ckan/commit/fb12eca793bdf7361df24f6511d1cc9344155919
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#2939] Update get no longer uses Authorizer
Commit: cc8395098a94435e45c1cd1c029daca5153d263e
https://github.com/okfn/ckan/commit/cc8395098a94435e45c1cd1c029daca5153d263e
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/auth/create.py
Log Message:
-----------
[#2939] Better importing of _
Commit: b423165da522ae2314ad2154262c2dc03a5dd442
https://github.com/okfn/ckan/commit/b423165da522ae2314ad2154262c2dc03a5dd442
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/auth/create.py
Log Message:
-----------
[#2939] Auth create package_create() changes
Commit: c48c147e4d0b505f272f72a6df37e1bb6a69c22f
https://github.com/okfn/ckan/commit/c48c147e4d0b505f272f72a6df37e1bb6a69c22f
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/auth/create.py
Log Message:
-----------
[#2939] Auth create resource_create() changes
Commit: 38f33ea92538c048c13db201ae28e50443bdc559
https://github.com/okfn/ckan/commit/38f33ea92538c048c13db201ae28e50443bdc559
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/auth/create.py
Log Message:
-----------
[#2939] Auth create package_relationship_create() changes
Commit: bccae61341ba8b889c1ba902d94ec0e9ac958951
https://github.com/okfn/ckan/commit/bccae61341ba8b889c1ba902d94ec0e9ac958951
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/auth/create.py
Log Message:
-----------
[#2939] Auth create user_create() changes
Commit: de9eeaeef74343e37757996f2410a66955dfc4ec
https://github.com/okfn/ckan/commit/de9eeaeef74343e37757996f2410a66955dfc4ec
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/auth/create.py
Log Message:
-----------
[#2939] Auth create _check_group_auth() changes
Commit: 07d4a466fb949caa8390c858ed00f16094c7adb3
https://github.com/okfn/ckan/commit/07d4a466fb949caa8390c858ed00f16094c7adb3
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/auth/create.py
Log Message:
-----------
[#2939] Auth create no longer uses Authorizer
Commit: e7607212dbf1a4d927fd10568d235e3f889e87da
https://github.com/okfn/ckan/commit/e7607212dbf1a4d927fd10568d235e3f889e87da
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/auth/get.py
Log Message:
-----------
[#2939] Auth get site_read() changes
Commit: b587582229ff2d734d863393609567ce31aeebe8
https://github.com/okfn/ckan/commit/b587582229ff2d734d863393609567ce31aeebe8
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/auth/get.py
Log Message:
-----------
[#2939] Auth get package_relationships_list() changes
Commit: 728a76b84acfd9c45a06f9ed856a4755ccd4d266
https://github.com/okfn/ckan/commit/728a76b84acfd9c45a06f9ed856a4755ccd4d266
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/auth/get.py
Log Message:
-----------
[#2939] Auth get no longer uses Authorizer
Commit: a6314365ca427213caf665e148427041713f3bdc
https://github.com/okfn/ckan/commit/a6314365ca427213caf665e148427041713f3bdc
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/auth/update.py
Log Message:
-----------
[#2939] Auth update remove package_edit_permissions()
Commit: 75323df56d29b076666a9e232b46d89f94800ff4
https://github.com/okfn/ckan/commit/75323df56d29b076666a9e232b46d89f94800ff4
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/auth/update.py
Log Message:
-----------
[#2939] Auth update group_edit_permissions() changes
Commit: cfb0097b108417911ebcad9fd4a23e078e2c9538
https://github.com/okfn/ckan/commit/cfb0097b108417911ebcad9fd4a23e078e2c9538
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/auth/update.py
Log Message:
-----------
[#2939] Auth update revision_change_state() changes
Commit: fae330ccf417bd7ed9a04e9b7b19d0804219fa03
https://github.com/okfn/ckan/commit/fae330ccf417bd7ed9a04e9b7b19d0804219fa03
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/auth/update.py
Log Message:
-----------
[#2939] Auth update no longer uses Authorizer
Commit: 469a4c9c9e4e1213e7658f8ed0b231961dcb9888
https://github.com/okfn/ckan/commit/469a4c9c9e4e1213e7658f8ed0b231961dcb9888
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#2939] Improve the org/group list logic functions
Commit: 058d88dcd264e10ea01d069d7ea125e14c002fe0
https://github.com/okfn/ckan/commit/058d88dcd264e10ea01d069d7ea125e14c002fe0
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/auth/create.py
Log Message:
-----------
[#2939] bugfix for logic auth create _check_group_auth()
Commit: a5a537523a49a93136f1fe4b831e00a00aa8b465
https://github.com/okfn/ckan/commit/a5a537523a49a93136f1fe4b831e00a00aa8b465
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Improve has_user_permission_for_some_org()
Commit: 312b57157d140dfe282e2fd3f97d508b4ef062d3
https://github.com/okfn/ckan/commit/312b57157d140dfe282e2fd3f97d508b4ef062d3
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
R ckan/tests/functional/test_authz.py
R ckan/tests/functional/test_package_edit_authz.py
Log Message:
-----------
[#2939] Remove some authz tests
Commit: 910f4b0bde1d92e0a5e4219b6eb7a74baa2f8fd0
https://github.com/okfn/ckan/commit/910f4b0bde1d92e0a5e4219b6eb7a74baa2f8fd0
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
R ckan/tests/functional/test_edit_authz.py
Log Message:
-----------
[#2939] remove another authz test
Commit: 6a559bd83fd82c16d09582c50e1478c3c2048688
https://github.com/okfn/ckan/commit/6a559bd83fd82c16d09582c50e1478c3c2048688
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/auth/get.py
Log Message:
-----------
[#2939] Bugfix in package relationship list
Commit: 559e6d85142c166836397aaa405cd4e3af3347b0
https://github.com/okfn/ckan/commit/559e6d85142c166836397aaa405cd4e3af3347b0
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/tests/functional/api/model/test_package.py
Log Message:
-----------
[#2939] Run package test as admin due to permission changes
Commit: 78ef5d8a2cd81e07e3d05acaca00dbb709772d3d
https://github.com/okfn/ckan/commit/78ef5d8a2cd81e07e3d05acaca00dbb709772d3d
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/action/update.py
Log Message:
-----------
[#2939] Disable part of user_role_update()
Commit: 6f10ad426efc6f859896c46df9b0dcf9c4f06533
https://github.com/okfn/ckan/commit/6f10ad426efc6f859896c46df9b0dcf9c4f06533
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#2939] Sysadmins see all groups available
Commit: bfac4af800062ff8cfd121da700999a64c5f9960
https://github.com/okfn/ckan/commit/bfac4af800062ff8cfd121da700999a64c5f9960
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#2939] Fix error that must have existed for ever
Commit: 0407a5d2207496c840a45e9f49d45ee719d31b4d
https://github.com/okfn/ckan/commit/0407a5d2207496c840a45e9f49d45ee719d31b4d
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-10 (Wed, 10 Oct 2012)
Changed paths:
M ckan/tests/functional/test_package.py
Log Message:
-----------
[#2939] Fix functional package tests for new authz
Commit: a1e5188e049ad087afefc633dd85e193c9c8ab7f
https://github.com/okfn/ckan/commit/a1e5188e049ad087afefc633dd85e193c9c8ab7f
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)
Changed paths:
M ckan/logic/auth/create.py
Log Message:
-----------
[#2939] Change default on create dataset for none org user
Commit: 9b6969c0ff4bab75eff3297ebc19f4d0d24527e0
https://github.com/okfn/ckan/commit/9b6969c0ff4bab75eff3297ebc19f4d0d24527e0
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)
Changed paths:
M ckan/logic/auth/create.py
Log Message:
-----------
[#2939] Change default on create user
Commit: e9a53c3fd90614c48476fdc44050f4c35702e19b
https://github.com/okfn/ckan/commit/e9a53c3fd90614c48476fdc44050f4c35702e19b
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Improve query in has_user_permission_for_some_org()
Commit: c38cd430a766bb843f9d919fa64cbd6c6b53bdb0
https://github.com/okfn/ckan/commit/c38cd430a766bb843f9d919fa64cbd6c6b53bdb0
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)
Changed paths:
M test-core.ini
Log Message:
-----------
[#2939] Add some auths to test-core.ini
Commit: 969e87d8aecce370c0cb209250586e38c5e038f5
https://github.com/okfn/ckan/commit/969e87d8aecce370c0cb209250586e38c5e038f5
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)
Changed paths:
R ckan/tests/models/test_authz.py
Log Message:
-----------
[#2939] remove model authz tests
Commit: c209da512cfd8ccd3863b783a1aedb7680dca51b
https://github.com/okfn/ckan/commit/c209da512cfd8ccd3863b783a1aedb7680dca51b
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)
Changed paths:
R ckan/tests/test_authz.py
Log Message:
-----------
[#2939] remove authz tests
Commit: e775cd69d0eb7fbd34558d27b2c0027fdbcefae6
https://github.com/okfn/ckan/commit/e775cd69d0eb7fbd34558d27b2c0027fdbcefae6
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)
Changed paths:
R ckan/tests/models/test_repo.py
Log Message:
-----------
[#2939] remove model repo tests dueto use of Authorizer
Commit: 4acb856ab2f5c4657dafaa9e68c73585511e251d
https://github.com/okfn/ckan/commit/4acb856ab2f5c4657dafaa9e68c73585511e251d
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)
Changed paths:
M ckan/logic/auth/create.py
M test-core.ini
Log Message:
-----------
[#2939] create user option linked to api usage for tests
Commit: 4fbca24ae8110d2696cbd65ea81efcf013c303c9
https://github.com/okfn/ckan/commit/4fbca24ae8110d2696cbd65ea81efcf013c303c9
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)
Changed paths:
M ckan/plugins/interfaces.py
Log Message:
-----------
[#2939] Remove IAuthorizer interface as no longer valid
Commit: ad2eb8d9a9dc2bf5bf1cae56f7a5412b8b127b29
https://github.com/okfn/ckan/commit/ad2eb8d9a9dc2bf5bf1cae56f7a5412b8b127b29
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)
Changed paths:
M ckan/authz.py
M ckan/plugins/interfaces.py
Log Message:
-----------
[#2939] Remove IAuthorizer interface from authz.py
Commit: cf905d0b647e232cd3bf7ccfa69693797a105b1d
https://github.com/okfn/ckan/commit/cf905d0b647e232cd3bf7ccfa69693797a105b1d
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)
Changed paths:
M ckan/logic/auth/create.py
Log Message:
-----------
[#2939] Add .ini option for anon dataset creation
Commit: b6bb4b4d542fcc69fc823f39dae3bcdc243ad17b
https://github.com/okfn/ckan/commit/b6bb4b4d542fcc69fc823f39dae3bcdc243ad17b
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)
Changed paths:
M ckan/tests/logic/test_action.py
Log Message:
-----------
[#2939] Skip two tests that are causing problems
Commit: b341ec61e71eff4709dcb1334c9d74180643a411
https://github.com/okfn/ckan/commit/b341ec61e71eff4709dcb1334c9d74180643a411
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)
Changed paths:
M test-core.ini
Log Message:
-----------
[#2939] Clean up test-core.ini
Commit: 9566050d24ef9d9722ff53e7e91fbe1aee1b1309
https://github.com/okfn/ckan/commit/9566050d24ef9d9722ff53e7e91fbe1aee1b1309
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)
Changed paths:
M ckan/logic/auth/create.py
Log Message:
-----------
[#2939] Allow create_package auth check to be run directly not via wsgi
Commit: db3b7da4985558370a684425af03e561ab774703
https://github.com/okfn/ckan/commit/db3b7da4985558370a684425af03e561ab774703
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)
Changed paths:
M ckan/logic/auth/delete.py
Log Message:
-----------
[#2939] Delete relationship auth no longer use old auth functions
Commit: 226d7fcbe84925d5a903a71429b8cf857ef67997
https://github.com/okfn/ckan/commit/226d7fcbe84925d5a903a71429b8cf857ef67997
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)
Changed paths:
M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
Log Message:
-----------
[#2939] Remove IAuthorizer from plugins test
Commit: 5057ad9a4db2124cf51f862c0ace8fdc81ca3dd4
https://github.com/okfn/ckan/commit/5057ad9a4db2124cf51f862c0ace8fdc81ca3dd4
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-11 (Thu, 11 Oct 2012)
Changed paths:
M ckan/logic/auth/create.py
Log Message:
-----------
[#2939] Fix logic error in create package auth
Commit: 2e51b56b7d37e032e05d7b950889bab7eb468400
https://github.com/okfn/ckan/commit/2e51b56b7d37e032e05d7b950889bab7eb468400
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/logic/auth/create.py
Log Message:
-----------
[#2939] Add new file_upload auth function
Commit: 780ca23df9cad249c45ec18db07c594d484f45c6
https://github.com/okfn/ckan/commit/780ca23df9cad249c45ec18db07c594d484f45c6
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/controllers/storage.py
Log Message:
-----------
[#2939] Storage controller now uses file_upload auth function
Commit: d24f04a6c11c1f269f9014890f59f9ffb06e536f
https://github.com/okfn/ckan/commit/d24f04a6c11c1f269f9014890f59f9ffb06e536f
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Add new_authz helper functions
Commit: 626c76a6d1ca45c64e7abdd4c68629fee7864996
https://github.com/okfn/ckan/commit/626c76a6d1ca45c64e7abdd4c68629fee7864996
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/logic/auth/create.py
Log Message:
-----------
[#2939] Auth create functions now use new_authz helpers
Commit: ae062e7c156bfa39efcef79c30f2c649da2b3b11
https://github.com/okfn/ckan/commit/ae062e7c156bfa39efcef79c30f2c649da2b3b11
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/logic/auth/delete.py
Log Message:
-----------
[#2939] Remove unused import in logic.auth.delete
Commit: d6768ce1a92396fb8582a28c91dfc7689e624d0a
https://github.com/okfn/ckan/commit/d6768ce1a92396fb8582a28c91dfc7689e624d0a
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/logic/auth/update.py
Log Message:
-----------
[#2939] Replace old Authorizer functions in logic.auth.update
Commit: 64b1bf5bb9182527b62da3db9d3680b7355a224e
https://github.com/okfn/ckan/commit/64b1bf5bb9182527b62da3db9d3680b7355a224e
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Add update dataset permission
Commit: 9aa24638ee20a0bcf3cde477026a011ebaa86752
https://github.com/okfn/ckan/commit/9aa24638ee20a0bcf3cde477026a011ebaa86752
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/logic/__init__.py
Log Message:
-----------
[#2939] remove check_access_old() function
Commit: fbf5a4a83fe96df93e5241a9f0b3bbff3039f07a
https://github.com/okfn/ckan/commit/fbf5a4a83fe96df93e5241a9f0b3bbff3039f07a
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/tests/functional/api/base.py
Log Message:
-----------
[#2939] Fix tests in tests/functional/api/base.py
Commit: acf03bcc94d7271b9c038586fdcbbf19b04a03d9
https://github.com/okfn/ckan/commit/acf03bcc94d7271b9c038586fdcbbf19b04a03d9
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/tests/functional/api/model/test_package.py
Log Message:
-----------
[#2939] Fix tests in tests/functional/api/model/test_package.py
Commit: b292c86740ef08cfe5d24c7fca2a7189cbcca950
https://github.com/okfn/ckan/commit/b292c86740ef08cfe5d24c7fca2a7189cbcca950
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/tests/functional/api/test_activity.py
Log Message:
-----------
[#2939] Fix tests in tests/functional/api/test_activity.py
Commit: ba11d6c0f0bd71e62f20e20ea91d6c406e6de98d
https://github.com/okfn/ckan/commit/ba11d6c0f0bd71e62f20e20ea91d6c406e6de98d
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/tests/functional/test_activity.py
Log Message:
-----------
[#2939] Fix tests in tests/functional/test_activity.py
Commit: 3ab355965a238e88309d8e299f5feb6c5a896b63
https://github.com/okfn/ckan/commit/3ab355965a238e88309d8e299f5feb6c5a896b63
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/tests/functional/test_admin.py
Log Message:
-----------
[#2939] Fix tests in tests/functional/test_admin.py
Commit: 0a1ec62f37924c60c2bedaac8cb271a290da79bf
https://github.com/okfn/ckan/commit/0a1ec62f37924c60c2bedaac8cb271a290da79bf
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/tests/functional/test_tag_vocab.py
Log Message:
-----------
[#2939] Fix tests in tests/functional/test_tag_vocab.p
Commit: 2b19fcfd207b3e616d4daa2a374a6d9f1438ddd4
https://github.com/okfn/ckan/commit/2b19fcfd207b3e616d4daa2a374a6d9f1438ddd4
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/tests/functional/test_upload.py
Log Message:
-----------
[#2939] Fix tests in tests/functional/test_upload.p
Commit: ba4f348a0522bf17f851813e17beebe58f4e6a24
https://github.com/okfn/ckan/commit/ba4f348a0522bf17f851813e17beebe58f4e6a24
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/tests/logic/test_action.py
Log Message:
-----------
[#2939] Fix tests in tests/logic/test_action.py
Commit: 5ba21b908838bc2cadff8e98d1373804d089d1a8
https://github.com/okfn/ckan/commit/5ba21b908838bc2cadff8e98d1373804d089d1a8
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/tests/functional/test_group.py
Log Message:
-----------
[#2939] Remove tests in tests/functional/test_group.py
Commit: 1a6d99b5d3700c651681d66574a04eaa3ed207c4
https://github.com/okfn/ckan/commit/1a6d99b5d3700c651681d66574a04eaa3ed207c4
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/authz.py
Log Message:
-----------
[#2939] Remove Last traces of Authorizer
Commit: ff90a377ce987d6c5079fcf11c20affc3273183c
https://github.com/okfn/ckan/commit/ff90a377ce987d6c5079fcf11c20affc3273183c
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Permission change allow dataset creation for non org user
Commit: e16738ffdb37d1f29d46dbbf622e95407e5fe56e
https://github.com/okfn/ckan/commit/e16738ffdb37d1f29d46dbbf622e95407e5fe56e
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/config/middleware.py
M ckan/controllers/storage.py
M ckan/lib/helpers.py
M ckan/lib/package_saver.py
M ckan/lib/plugins.py
Log Message:
-----------
Merge branch 'master' into 2939-orgs
Conflicts:
ckan/lib/helpers.py
ckan/lib/plugins.py
trivial merge
Commit: f3f5331c6d20006a69d8c9280a8fea52d1877c35
https://github.com/okfn/ckan/commit/f3f5331c6d20006a69d8c9280a8fea52d1877c35
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#2939] Remove unused function
Commit: fc7d0196db9ceee3405ae4549cccca0f2a44cf83
https://github.com/okfn/ckan/commit/fc7d0196db9ceee3405ae4549cccca0f2a44cf83
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Update default .ini permissions
Commit: 992a5bb01ffc5c3dc895cb96c2b98b9e61b458d3
https://github.com/okfn/ckan/commit/992a5bb01ffc5c3dc895cb96c2b98b9e61b458d3
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/tests/functional/test_activity.py
Log Message:
-----------
Fix a broken activity streams test
Commit: 1b48045864a80c5e7d0d4722b824a8ed18bc2897
https://github.com/okfn/ckan/commit/1b48045864a80c5e7d0d4722b824a8ed18bc2897
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
A ckan/templates/organization/members.html
Log Message:
-----------
[#2939] Add org members initial template
Commit: c5d7888e91fa72c8e9f2cbdc5c9ce8811a8dd950
https://github.com/okfn/ckan/commit/c5d7888e91fa72c8e9f2cbdc5c9ce8811a8dd950
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2939] Add members action to group controller
Commit: ffb390d5e88f08d416ea8acdda2301e2e5e49535
https://github.com/okfn/ckan/commit/ffb390d5e88f08d416ea8acdda2301e2e5e49535
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
[#2939] Add members route
Commit: 07600508e1ee8bba812123d97a79994df6a300e6
https://github.com/okfn/ckan/commit/07600508e1ee8bba812123d97a79994df6a300e6
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M CHANGELOG.txt
M ckan/config/deployment.ini_tmpl
M ckan/config/environment.py
M ckan/lib/helpers.py
M ckan/tests/functional/api/test_revision_search.py
M ckan/tests/lib/test_helpers.py
A ckanext/datastore/bin/__init__.py
R ckanext/datastore/bin/create_datastore_db_and_read_only_user.sql
A ckanext/datastore/bin/datastore_setup.py
A ckanext/datastore/bin/set_permissions.sql
M ckanext/datastore/commands.py
M ckanext/datastore/db.py
M ckanext/datastore/logic/action.py
M ckanext/datastore/plugin.py
A ckanext/datastore/tests/helpers.py
A ckanext/datastore/tests/test_create.py
R ckanext/datastore/tests/test_datastore.py
A ckanext/datastore/tests/test_delete.py
A ckanext/datastore/tests/test_search.py
A ckanext/datastore/tests/test_unit.py
A ckanext/datastore/tests/test_upsert.py
M doc/apiv3.rst
M doc/coding-standards.rst
M doc/configuration.rst
A doc/datastore-api.rst
A doc/datastore-setup.rst
M doc/datastore.rst
M doc/index.rst
R doc/using-data-api.rst
M test-core.ini
Log Message:
-----------
Merge branch 'master' into 2939-orgs
Commit: 7dba229eb232f8b2620ccc10aafcc10053605abc
https://github.com/okfn/ckan/commit/7dba229eb232f8b2620ccc10aafcc10053605abc
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/logic/auth/delete.py
M ckan/logic/auth/get.py
M ckan/logic/auth/update.py
M ckan/new_authz.py
Log Message:
-----------
[#2939] Change permission functions to take user name not id
Commit: 1d939420bb4cdb41f13b9828a2acb496ac2ac1bb
https://github.com/okfn/ckan/commit/1d939420bb4cdb41f13b9828a2acb496ac2ac1bb
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-12 (Fri, 12 Oct 2012)
Changed paths:
M ckan/logic/auth/create.py
Log Message:
-----------
[#2939] Add organization_member_create auth function
Commit: 270ffaafd6d638cfe74d58083d5bad7bd143e829
https://github.com/okfn/ckan/commit/270ffaafd6d638cfe74d58083d5bad7bd143e829
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
A ckan/templates/group/confirm_delete_member.html
A ckan/templates/group/member_new.html
A ckan/templates/group/members.html
A ckan/templates/organization/confirm_delete_member.html
A ckan/templates/organization/member_new.html
Log Message:
-----------
[#2939] Add member templates
Commit: c263a852a0909e7e6735f24ef7bd8547b4afbf0e
https://github.com/okfn/ckan/commit/c263a852a0909e7e6735f24ef7bd8547b4afbf0e
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
[#2939] Add new member routes
Commit: adb0c6c65629f1825d62a011cfa5bfed5c4993bd
https://github.com/okfn/ckan/commit/adb0c6c65629f1825d62a011cfa5bfed5c4993bd
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2939] remove unwanted print statments
Commit: 4490829239679083133cd636ba0a5fb55f339720
https://github.com/okfn/ckan/commit/4490829239679083133cd636ba0a5fb55f339720
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2939] Add group/org controller member change actions
Commit: 168cc1551bdbabdcef0eb922e688f4c83bdb50b6
https://github.com/okfn/ckan/commit/168cc1551bdbabdcef0eb922e688f4c83bdb50b6
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
[#2939] Member create auth functions
Commit: 3c41bb5a2f32c7c4020979b43c5b748344254016
https://github.com/okfn/ckan/commit/3c41bb5a2f32c7c4020979b43c5b748344254016
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
M ckan/logic/auth/create.py
Log Message:
-----------
[#2939] Member create auth functions
Commit: d34c4c2b0d3570492fa900a6d24aa552c862f5ba
https://github.com/okfn/ckan/commit/d34c4c2b0d3570492fa900a6d24aa552c862f5ba
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
M ckan/logic/auth/delete.py
Log Message:
-----------
[#2939] Member delete auth functions
Commit: 15f526f6c3017eac550cc7c07f045790357a99dd
https://github.com/okfn/ckan/commit/15f526f6c3017eac550cc7c07f045790357a99dd
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
M ckan/logic/action/delete.py
Log Message:
-----------
[#2939] Member delete action functions
Commit: b315ede4179ca9e1c264495403efcdd9b77fff5f
https://github.com/okfn/ckan/commit/b315ede4179ca9e1c264495403efcdd9b77fff5f
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
M ckan/logic/action/delete.py
Log Message:
-----------
[#2939] Fix revisions for member delete action
Commit: 95fe7d0fff6aa97c83e55b069cd8251419600864
https://github.com/okfn/ckan/commit/95fe7d0fff6aa97c83e55b069cd8251419600864
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
M ckan/logic/action/get.py
Log Message:
-----------
[#2939] Get member roles action added
Commit: 43e95d67478bc98f2b4a03624ecc1c2a91d9246b
https://github.com/okfn/ckan/commit/43e95d67478bc98f2b4a03624ecc1c2a91d9246b
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
M ckan/logic/auth/get.py
Log Message:
-----------
[#2939] Package show auth minor fix
Commit: bcb21c0f2a5f49515c911215c8edb5409caaead4
https://github.com/okfn/ckan/commit/bcb21c0f2a5f49515c911215c8edb5409caaead4
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
M ckan/logic/auth/get.py
Log Message:
-----------
[#2939] Get member roles auth function added
Commit: 96c228e887938a4661c81d85189cec39dac699bf
https://github.com/okfn/ckan/commit/96c228e887938a4661c81d85189cec39dac699bf
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
M ckan/logic/auth/update.py
Log Message:
-----------
[#2939] Fix package update auth function
Commit: e760a092f1d50a3d5a5233d03915f425f20649d8
https://github.com/okfn/ckan/commit/e760a092f1d50a3d5a5233d03915f425f20649d8
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[#2939] Add a couple of new validation functions
Commit: 19b25040a6c5817ade54b52f8f7a11d98531a3f2
https://github.com/okfn/ckan/commit/19b25040a6c5817ade54b52f8f7a11d98531a3f2
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
[#2939] Add member schema
Commit: 68a3d7363389af7a4309e576be49f71b5e6fde9f
https://github.com/okfn/ckan/commit/68a3d7363389af7a4309e576be49f71b5e6fde9f
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Add some role helper functions
Commit: 1820a0285edf254ed53388f90d39271a9ec9aebd
https://github.com/okfn/ckan/commit/1820a0285edf254ed53388f90d39271a9ec9aebd
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] If no group the assume permission ok
Commit: cb7d3d15d5f02747c42368ef47b199fc8227aa55
https://github.com/okfn/ckan/commit/cb7d3d15d5f02747c42368ef47b199fc8227aa55
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
M ckan/templates/organization/members.html
Log Message:
-----------
[#2939] fixes to org members template
Commit: a697cdb9a6a57836dc9505fb04e97cce10b502e0
https://github.com/okfn/ckan/commit/a697cdb9a6a57836dc9505fb04e97cce10b502e0
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
M ckan/logic/action/delete.py
Log Message:
-----------
[#2939] delete member action bugfix
Commit: 1a971cd2173098cc5550017650df5b062f784685
https://github.com/okfn/ckan/commit/1a971cd2173098cc5550017650df5b062f784685
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
M ckan/templates/group/read.html
M ckan/templates/organization/read.html
Log Message:
-----------
[#2939] Add memeber button to group/orgread templates
Commit: f611bd4243aa95e9fbe2ba0008604739dc60c266
https://github.com/okfn/ckan/commit/f611bd4243aa95e9fbe2ba0008604739dc60c266
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Do not assume that people have permissions for none organization owned groups
Commit: c519f4511ded35c9df4214a5ecefec055d3fca3d
https://github.com/okfn/ckan/commit/c519f4511ded35c9df4214a5ecefec055d3fca3d
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
M ckan/tests/functional/api/model/test_package.py
Log Message:
-----------
[#2939] Fix minor whitespace issue
Commit: 1884cd089945b4669b4002663a5bbfabc89a1114
https://github.com/okfn/ckan/commit/1884cd089945b4669b4002663a5bbfabc89a1114
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
M ckan/tests/functional/test_activity.py
Log Message:
-----------
Merge branch '2939-orgs' of github.com:okfn/ckan into 2939-orgs
Commit: 21eabcecf32205775c79f000be9a986e848d950d
https://github.com/okfn/ckan/commit/21eabcecf32205775c79f000be9a986e848d950d
Author: tobes <toby.junk at gmail.com>
Date: 2012-10-14 (Sun, 14 Oct 2012)
Changed paths:
M ckan/lib/formatters.py
Log Message:
-----------
[#2939] Fix filesize issue which will not be found for years
Commit: 430ba1d6474df678b19f8cde44f7523a32fd7d30
https://github.com/okfn/ckan/commit/430ba1d6474df678b19f8cde44f7523a32fd7d30
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-08 (Thu, 08 Nov 2012)
Changed paths:
M .gitignore
M CHANGELOG.txt
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/activity_streams.py
M ckan/lib/authztool.py
M ckan/lib/helpers.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/converters.py
M ckan/logic/schema.py
M ckan/logic/validators.py
M ckan/public/base/css/main.css
M ckan/public/base/datapreview/css/recline.css
M ckan/public/base/datapreview/preview_recline.js
M ckan/public/base/datapreview/resource.config
R ckan/public/base/datapreview/vendor/backbone/0.5.1/backbone.js
R ckan/public/base/datapreview/vendor/backbone/0.5.1/backbone.min.js
A ckan/public/base/datapreview/vendor/backbone/backbone.js
A ckan/public/base/datapreview/vendor/backbone/backbone.min.js
R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.css
R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.js
R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.css
R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/bootstrap.min.js
R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/img/glyphicons-halflings-white.png
R ckan/public/base/datapreview/vendor/bootstrap/2.0.3/img/glyphicons-halflings.png
A ckan/public/base/datapreview/vendor/bootstrap/bootstrap.js
A ckan/public/base/datapreview/vendor/bootstrap/bootstrap.min.js
A ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.css
A ckan/public/base/datapreview/vendor/bootstrap/css/bootstrap.min.css
A ckan/public/base/datapreview/vendor/bootstrap/img/glyphicons-halflings-white.png
M ckan/public/base/datapreview/vendor/flotr2/flotr2.js
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.js
R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.css
R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.ie.css
R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.ie.min.css
R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.js
R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.min.css
R ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet.min.js
A ckan/public/base/datapreview/vendor/leaflet/leaflet.css
A ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.css
A ckan/public/base/datapreview/vendor/leaflet/leaflet.ie.min.css
A ckan/public/base/datapreview/vendor/leaflet/leaflet.js
A ckan/public/base/datapreview/vendor/leaflet/leaflet.min.css
A ckan/public/base/datapreview/vendor/leaflet/leaflet.min.js
R ckan/public/base/datapreview/vendor/moment/1.6.2/moment.js
R ckan/public/base/datapreview/vendor/moment/1.6.2/moment.min.js
A ckan/public/base/datapreview/vendor/moment/moment.js
A ckan/public/base/datapreview/vendor/moment/moment.min.js
R ckan/public/base/datapreview/vendor/mustache/0.5.0-dev/mustache.js
R ckan/public/base/datapreview/vendor/mustache/0.5.0-dev/mustache.min.js
A ckan/public/base/datapreview/vendor/mustache/mustache.js
A ckan/public/base/datapreview/vendor/mustache/mustache.min.js
M ckan/public/base/datapreview/vendor/pdfjs/pdf.js
M ckan/public/base/datapreview/vendor/pdfviewer/viewer.css
M ckan/public/base/datapreview/vendor/pdfviewer/viewer.js
M ckan/public/base/datapreview/vendor/recline/css/recline.css
M ckan/public/base/datapreview/vendor/recline/recline.js
R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/MIT-LICENSE.txt
R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/README.txt
R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/images/sort-asc.gif
R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/images/sort-desc.gif
R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.js
R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery-ui-1.8.16.custom.min.js
R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.js
R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/jquery.event.drag-2.0.min.js
R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.css
R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.js
R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.min.css
R ckan/public/base/datapreview/vendor/slickgrid/2.0.1/slick.grid.min.js
A ckan/public/base/datapreview/vendor/slickgrid/MIT-LICENSE.txt
A ckan/public/base/datapreview/vendor/slickgrid/README.txt
A ckan/public/base/datapreview/vendor/slickgrid/images/sort-asc.gif
A ckan/public/base/datapreview/vendor/slickgrid/images/sort-desc.gif
A ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.js
A ckan/public/base/datapreview/vendor/slickgrid/jquery-ui-1.8.16.custom.min.js
A ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.js
A ckan/public/base/datapreview/vendor/slickgrid/jquery.event.drag-2.0.min.js
A ckan/public/base/datapreview/vendor/slickgrid/slick.grid.css
A ckan/public/base/datapreview/vendor/slickgrid/slick.grid.js
A ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.css
A ckan/public/base/datapreview/vendor/slickgrid/slick.grid.min.js
R ckan/public/base/datapreview/vendor/underscore/1.1.6/underscore.js
R ckan/public/base/datapreview/vendor/underscore/1.1.6/underscore.min.js
A ckan/public/base/datapreview/vendor/underscore/underscore.js
A ckan/public/base/datapreview/vendor/underscore/underscore.min.js
A ckan/public/base/images/dotted.png
M ckan/public/base/javascript/client.js
M ckan/public/base/javascript/module.js
A ckan/public/base/javascript/modules/follow.js
A ckan/public/base/javascript/modules/popover-context.js
M ckan/public/base/javascript/resource.config
A ckan/public/base/less/activity.less
M ckan/public/base/less/ckan.less
A ckan/public/base/less/custom.less
M ckan/public/base/less/dataset.less
R ckan/public/base/less/disqus.less
A ckan/public/base/less/follower-list.less
M ckan/public/base/less/masthead.less
M ckan/public/base/less/module.less
A ckan/public/base/less/popover-context.less
M ckan/public/base/less/profile.less
M ckan/public/base/less/toolbar.less
M ckan/public/base/less/variables.less
A ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-popover.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.js
M ckan/public/base/vendor/resource.config
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/ajax_snippets/api_info.html
A ckan/templates/ajax_snippets/follow_button.html
A ckan/templates/ajax_snippets/popover-context-dataset.html
A ckan/templates/ajax_snippets/popover-context-user.html
M ckan/templates/dataviewer/pdf.html
M ckan/templates/dataviewer/snippets/no_preview.html
A ckan/templates/group/activity_stream.html
M ckan/templates/header.html
M ckan/templates/package/edit.html
M ckan/templates/package/followers.html
M ckan/templates/package/new_resource.html
M ckan/templates/package/read.html
M ckan/templates/package/related_list.html
M ckan/templates/package/resource_edit.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/snippets/back_to_package_action.html
A ckan/templates/package/snippets/info.html
M ckan/templates/package/snippets/resource_item.html
M ckan/templates/package/snippets/resources.html
M ckan/templates/page.html
A ckan/templates/snippets/activity_item.html
M ckan/templates/snippets/follow_button.html
A 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/read.html
A ckan/templates/user/snippets/followers.html
R ckan/templates/user/snippets/things_to_do.html
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_follow.py
M ckanext/datastore/plugin.py
M doc/_themes/sphinx-theme-okfn
M doc/datastore-setup.rst
M doc/extension-templating.rst
R doc/howto-editing-database-ownership.rst
M doc/index.rst
M doc/paster.rst
M doc/resources.rst
Log Message:
-----------
Merge branch 'master' into 2939-orgs
Conflicts:
ckan/config/routing.py
trivial merge
ckan/controllers/group.py
activity list html no longer added to c
ckan/logic/action/delete.py
schema now passed to _unfollow
ckan/templates/package/read.html
help text is now added to sidebar
ckan/tests/functional/api/test_activity.py
fix test to run as sysadmin due to package_show rights
Commit: fddde4300dcc157daa1a9ac6d1e1cf0744cb6ba3
https://github.com/okfn/ckan/commit/fddde4300dcc157daa1a9ac6d1e1cf0744cb6ba3
Author: kindly <kindly at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
A ckan/tests/logic/test_auth.py
Log Message:
-----------
[2939] the start of adding tests
Commit: 22389d96c24dc64dc70fdd00b719a2400f910da4
https://github.com/okfn/ckan/commit/22389d96c24dc64dc70fdd00b719a2400f910da4
Author: kindly <kindly at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[2939] make sure config is updated in tests
Commit: f561cbab8185eb1bcdc720183a1560b4b7699ead
https://github.com/okfn/ckan/commit/f561cbab8185eb1bcdc720183a1560b4b7699ead
Author: John Martin <me at johnmart.in>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/templates/ajax_snippets/popover-context-user.html
M ckan/templates/development/primer.html
A ckan/templates/development/snippets/page_header.html
M ckan/templates/group/read.html
A ckan/templates/group/read_base.html
M ckan/templates/package/followers.html
M ckan/templates/package/read.html
A ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
A ckan/templates/snippets/page_header.html
M ckan/templates/user/read.html
A ckan/templates/user/read_base.html
Log Message:
-----------
Lot's of tweaks to the group, user and package read pages and new snipper for page_header
Commit: cdcc0cbe4c5b96e221b95219fdf815d841f131f0
https://github.com/okfn/ckan/commit/cdcc0cbe4c5b96e221b95219fdf815d841f131f0
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
[#2939] Minor fix up remove is_org=True
Commit: 4a788ead201beff255be23d3a03f57777cd27b6d
https://github.com/okfn/ckan/commit/4a788ead201beff255be23d3a03f57777cd27b6d
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/templates/package/read.html
Log Message:
-----------
[#3012] Fix template broken in merge
Commit: 2754b346fa77c3a08cb432645f7ba5a919fe4304
https://github.com/okfn/ckan/commit/2754b346fa77c3a08cb432645f7ba5a919fe4304
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/logic/action/update.py
M ckan/logic/auth/update.py
Log Message:
-----------
[#2939] add auth check for package_owner_org_update
Commit: d60e11bc289eb3bf1ad365fabfaa5387657e07c1
https://github.com/okfn/ckan/commit/d60e11bc289eb3bf1ad365fabfaa5387657e07c1
Author: kindly <kindly at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[2939] fix so that users can not create dataset if belong to no org
Commit: ba8db22d293813eaec9837558aabd7e1aa94022b
https://github.com/okfn/ckan/commit/ba8db22d293813eaec9837558aabd7e1aa94022b
Author: kindly <kindly at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[2939] clean up tests
Commit: 1d3356d68e9232888687b8444c3a8e26d5f0aad6
https://github.com/okfn/ckan/commit/1d3356d68e9232888687b8444c3a8e26d5f0aad6
Author: kindly <kindly at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[2939] make sure old permissions get reset after test fininsh
Commit: 6daf68c33b4a8e03f7e14291aea603f4974ea76e
https://github.com/okfn/ckan/commit/6daf68c33b4a8e03f7e14291aea603f4974ea76e
Author: John Martin <me at johnmart.in>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/templates/user/read_base.html
Log Message:
-----------
Wrap inner 2ndary content in block
Commit: 950036d3cf5a44f4fe19f7ea926d05716cfa8149
https://github.com/okfn/ckan/commit/950036d3cf5a44f4fe19f7ea926d05716cfa8149
Author: John Martin <me at johnmart.in>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/public/base/javascript/modules/popover-context.js
R ckan/templates/ajax_snippets/popover-context-dataset.html
R ckan/templates/ajax_snippets/popover-context-group.html
R ckan/templates/ajax_snippets/popover-context-user.html
A ckan/templates/ajax_snippets/popover_context_dataset.html
A ckan/templates/ajax_snippets/popover_context_group.html
A ckan/templates/ajax_snippets/popover_context_user.html
Log Message:
-----------
Underscores... not dashes
Commit: 9057a01438fd0eaf708d34808599d4100e123048
https://github.com/okfn/ckan/commit/9057a01438fd0eaf708d34808599d4100e123048
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#3016] Update helpers to allow nicer tab links
Commit: bfdefdd5510307385b38e30fa9bde5d86e91690c
https://github.com/okfn/ckan/commit/bfdefdd5510307385b38e30fa9bde5d86e91690c
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/templates/snippets/page_header.html
M ckan/templates/user/read_base.html
Log Message:
-----------
[#3016] Update templates for new helper
Commit: 674e01d5dcd104fa23021e709a6d64c1c61f4c0f
https://github.com/okfn/ckan/commit/674e01d5dcd104fa23021e709a6d64c1c61f4c0f
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/templates/development/snippets/page_header.html
Log Message:
-----------
[#3016] Fix primer for tabs
Commit: 521607e870ba33ebd8c2932f769066d633f9254e
https://github.com/okfn/ckan/commit/521607e870ba33ebd8c2932f769066d633f9254e
Author: kindly <kindly at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[2939] add tests to check adding of datasets
Commit: e96d97959c942f91fbab69e4849cc5f2ec7ffa0d
https://github.com/okfn/ckan/commit/e96d97959c942f91fbab69e4849cc5f2ec7ffa0d
Author: kindly <kindly at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/logic/action/update.py
M ckan/logic/auth/update.py
M ckan/templates/package/read.html
Log Message:
-----------
Merge branch '2939-orgs' of github.com:okfn/ckan into 2939-orgs
Commit: 5ea6c0192d3e6e53fe56c2f831888a950c115aa9
https://github.com/okfn/ckan/commit/5ea6c0192d3e6e53fe56c2f831888a950c115aa9
Author: kindly <kindly at gmail.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[2939] add more testing
Commit: 9ce1f918a6050dcf7fca29aeb7f8645a1ea2fe1d
https://github.com/okfn/ckan/commit/9ce1f918a6050dcf7fca29aeb7f8645a1ea2fe1d
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-14 (Wed, 14 Nov 2012)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
[#3016] Add custom mapper to catch routes
Commit: 3b8a33e791e6e51884528d4a9f7ea43b4b956de4
https://github.com/okfn/ckan/commit/3b8a33e791e6e51884528d4a9f7ea43b4b956de4
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-14 (Wed, 14 Nov 2012)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
[#3016] Fix routes to allow nav links
Commit: 228d8949e4a7946a9179d5466a5c5122e9501c88
https://github.com/okfn/ckan/commit/228d8949e4a7946a9179d5466a5c5122e9501c88
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-14 (Wed, 14 Nov 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#3016] Changes to helper functions for nav links
Commit: 620e3f37bb9d958d7df662571f569a4653913298
https://github.com/okfn/ckan/commit/620e3f37bb9d958d7df662571f569a4653913298
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-14 (Wed, 14 Nov 2012)
Changed paths:
M ckan/templates/header.html
Log Message:
-----------
[#3016] Fix header nav links to be more readable and sort group_index
Commit: a36817bb6a98643d157270e19d77b72ff158e717
https://github.com/okfn/ckan/commit/a36817bb6a98643d157270e19d77b72ff158e717
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-14 (Wed, 14 Nov 2012)
Changed paths:
M ckan/templates/user/read_base.html
Log Message:
-----------
[#3016] Template user/read_base.html
Commit: 1c47a941298c36b34cf4bbe19aed24daa0430d78
https://github.com/okfn/ckan/commit/1c47a941298c36b34cf4bbe19aed24daa0430d78
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/config/environment.py
M ckan/lib/helpers.py
Log Message:
-----------
[#3016] Bugfix make sure named routes are available
Commit: 1d4cde5d1a8f3d29ff49483068ea1fe4d206648b
https://github.com/okfn/ckan/commit/1d4cde5d1a8f3d29ff49483068ea1fe4d206648b
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/config/routing.py
M ckan/templates/package/read_base.html
Log Message:
-----------
[#3016] Changes to package/read_base.py for new tabs
Commit: e4f6eb814807e4b920d504223cc7faa1ca563741
https://github.com/okfn/ckan/commit/e4f6eb814807e4b920d504223cc7faa1ca563741
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
[#3016] Formatting of config/routing.py
Commit: ce3bade026814e24c612038766e8a56b500a484a
https://github.com/okfn/ckan/commit/ce3bade026814e24c612038766e8a56b500a484a
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/logic/action/create.py
M ckan/new_authz.py
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#2939] Fix test 5
Commit: 9a36d04e17c288f0e546f0286b6b2d6fce3e82fa
https://github.com/okfn/ckan/commit/9a36d04e17c288f0e546f0286b6b2d6fce3e82fa
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/logic/auth/create.py
M ckan/new_authz.py
Log Message:
-----------
[#2939] Fix misnamed function
Commit: 231ec96529d1b462694a25c555302baf7de8defe
https://github.com/okfn/ckan/commit/231ec96529d1b462694a25c555302baf7de8defe
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Fix comment typo
Commit: 50b16cf5fddb2e278ecf8b73eb992c679881a87d
https://github.com/okfn/ckan/commit/50b16cf5fddb2e278ecf8b73eb992c679881a87d
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/logic/schema.py
M ckan/logic/validators.py
Log Message:
-----------
[#2939] Add owner_org validator
Commit: 4009b4af58d46b83c42483dc3a9a4d33b388a313
https://github.com/okfn/ckan/commit/4009b4af58d46b83c42483dc3a9a4d33b388a313
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/logic/validators.py
Log Message:
-----------
[#2939] Fix owner_org validator
Commit: af95d0d1e8041e3c37fd397608e033bced1b9b6e
https://github.com/okfn/ckan/commit/af95d0d1e8041e3c37fd397608e033bced1b9b6e
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/model/user.py
Log Message:
-----------
[#2939] Fix user is in group
Commit: 1f710a90846a238bbb92f04839eee63442e6bef9
https://github.com/okfn/ckan/commit/1f710a90846a238bbb92f04839eee63442e6bef9
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/logic/action/create.py
Log Message:
-----------
[#2939] Need to set user org without admin checks
Commit: 4714acb5d55927869c9061fbfabeac0f745ad435
https://github.com/okfn/ckan/commit/4714acb5d55927869c9061fbfabeac0f745ad435
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/logic/action/update.py
Log Message:
-----------
[#2939] Need to set user org without admin checks in update
Commit: 0f525d4ff5f92c3de2206594727e5431461a1214
https://github.com/okfn/ckan/commit/0f525d4ff5f92c3de2206594727e5431461a1214
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/logic/schema.py
Log Message:
-----------
[#2939] Schema change for update
Commit: 99ac4d762021da6789d32327fe1dbd0ed6795dee
https://github.com/okfn/ckan/commit/99ac4d762021da6789d32327fe1dbd0ed6795dee
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#2939] tests expect 409 not 403
Commit: 893fdd0942cbe7d87a1aee83586e1096035f38e4
https://github.com/okfn/ckan/commit/893fdd0942cbe7d87a1aee83586e1096035f38e4
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/logic/validators.py
M ckan/new_authz.py
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#2939] New config option
Commit: 729ff6464e57c0e7e77017ef194fd4675ec5def2
https://github.com/okfn/ckan/commit/729ff6464e57c0e7e77017ef194fd4675ec5def2
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-15 (Thu, 15 Nov 2012)
Changed paths:
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
Log Message:
-----------
[#2939] Move org chooser to stage one of add dataset
Commit: 1208e1688563b4774d99761e1522baf67f63a82b
https://github.com/okfn/ckan/commit/1208e1688563b4774d99761e1522baf67f63a82b
Author: kindly <kindly at gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#2939] group tests and cleanup
Commit: 14d5f4ca1922f85a8301aec7ee67e80267481c3a
https://github.com/okfn/ckan/commit/14d5f4ca1922f85a8301aec7ee67e80267481c3a
Author: kindly <kindly at gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)
Changed paths:
M ckan/lib/dictization/model_save.py
Log Message:
-----------
[#2939] make sure organizations are not getting indexed within org
Commit: df57f8a05b6aab789061dbf5555528870c527d58
https://github.com/okfn/ckan/commit/df57f8a05b6aab789061dbf5555528870c527d58
Author: kindly <kindly at gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)
Changed paths:
A doc/organizations_and_groups.rst
Log Message:
-----------
Merge branch '2911-internal-doc-of-org-group-auth' into 2939-orgs
Commit: 01343feb9f2844f9d4146374d8882bb211dd8f4e
https://github.com/okfn/ckan/commit/01343feb9f2844f9d4146374d8882bb211dd8f4e
Author: kindly <kindly at gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#2939] merge in user story branch
Commit: 187faa16309dc8f3e1754459204112564338d0d8
https://github.com/okfn/ckan/commit/187faa16309dc8f3e1754459204112564338d0d8
Author: kindly <kindly at gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#2939] test rename org admin
Commit: 9601e41edc7609b70c79bb794c78074c90a96842
https://github.com/okfn/ckan/commit/9601e41edc7609b70c79bb794c78074c90a96842
Author: kindly <kindly at gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
[#2939] make sure user created in sysadmin cli
Commit: d326da5fb42617a6a5282f6ac87bbbb8e8613752
https://github.com/okfn/ckan/commit/d326da5fb42617a6a5282f6ac87bbbb8e8613752
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/lib/activity_streams.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/dictization/model_save.py
M ckan/lib/helpers.py
M ckan/logic/action/create.py
M ckan/logic/action/delete.py
M ckan/logic/action/get.py
M ckan/logic/converters.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/061_add_follower__group_table.py
M ckan/model/__init__.py
M ckan/model/follower.py
M ckan/public/base/javascript/modules/popover-context.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/activity.less
M ckan/public/base/less/iehacks.less
A ckan/templates/ajax_snippets/popover-context-group.html
A ckan/templates/group/about.html
M ckan/templates/group/activity_stream.html
A ckan/templates/group/admins.html
A ckan/templates/group/followers.html
M ckan/templates/group/read.html
M ckan/templates/user/dashboard.html
M ckan/templates/user/read.html
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_activity.py
M doc/common-error-messages.rst
Log Message:
-----------
Merge branch 'master' into 2939-orgs
Conflicts:
ckan/controllers/group.py
ckan/logic/action/create.py
ckan/logic/action/delete.py
ckan/logic/schema.py
ckan/logic/validators.py
ckan/templates/group/read.html
trivial merges
Commit: a58b54fed8bdc57246cc0fae36450cd55b9f6884
https://github.com/okfn/ckan/commit/a58b54fed8bdc57246cc0fae36450cd55b9f6884
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
R ckan/migration/versions/061_org_changes.py
A ckan/migration/versions/062_org_changes.py
Log Message:
-----------
[#2939] rename migrate to avoid conflict with master
Commit: 5c948ff5b81fac18745041626543d30c78798982
https://github.com/okfn/ckan/commit/5c948ff5b81fac18745041626543d30c78798982
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/new_authz.py
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#2939] Fix test test_04_modify_group
Commit: c2361489d47cd4dc927842aa1b0d49b133695e5b
https://github.com/okfn/ckan/commit/c2361489d47cd4dc927842aa1b0d49b133695e5b
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#2939] Fix test test_03_add_dataset_to_group
Commit: f114c2d0b944f5c3e2dc8779ce0af4c9eb0da1c5
https://github.com/okfn/ckan/commit/f114c2d0b944f5c3e2dc8779ce0af4c9eb0da1c5
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/logic/auth/delete.py
M ckan/new_authz.py
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#2939] Fix group/org delete permissions
Commit: 120149b28de737546093b24db6e6b032ee29eae4
https://github.com/okfn/ckan/commit/120149b28de737546093b24db6e6b032ee29eae4
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#2939] Clean logic auth tests
Commit: 27235310947e0849967317c779491556b663d92f
https://github.com/okfn/ckan/commit/27235310947e0849967317c779491556b663d92f
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/tests/logic/test_auth.py
Log Message:
-----------
[#2939] Logic auth_test nicer api call fn name
Commit: a408ed5816164defb60f9dde11fa80871757176f
https://github.com/okfn/ckan/commit/a408ed5816164defb60f9dde11fa80871757176f
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/lib/plugins.py
Log Message:
-----------
[#2939] io not require owner_org in package data
Commit: 293534b408be6eaf800551ee4e42794f8aaaf65c
https://github.com/okfn/ckan/commit/293534b408be6eaf800551ee4e42794f8aaaf65c
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2939] Fix group controller for auth changesw
Commit: 0635ad1bac0feea0dcbd9c7d0a6b7094588036ae
https://github.com/okfn/ckan/commit/0635ad1bac0feea0dcbd9c7d0a6b7094588036ae
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/logic/action/delete.py
M ckan/tests/functional/api/test_follow.py
Log Message:
-----------
[#2939] Fix follow tests
Commit: 391403305cf7d6417a0904605200508806cdf20e
https://github.com/okfn/ckan/commit/391403305cf7d6417a0904605200508806cdf20e
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/controllers/user.py
M ckan/lib/activity_streams.py
M ckan/lib/base.py
M ckan/logic/action/get.py
M ckan/logic/auth/get.py
A ckan/migration/versions/062_add_dashboard_table.py
R ckan/migration/versions/062_org_changes.py
A ckan/migration/versions/063_org_changes.py
M ckan/model/__init__.py
M ckan/model/activity.py
A ckan/model/dashboard.py
A ckan/public/base/javascript/modules/dashboard.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/activity.less
M ckan/public/base/less/ckan.less
A ckan/public/base/less/dashboard.less
M ckan/public/base/less/footer.less
M ckan/public/base/less/iehacks.less
M ckan/public/base/less/masthead.less
M ckan/templates/header.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/user/dashboard.html
M ckan/tests/functional/api/test_activity.py
A ckan/tests/functional/api/test_dashboard.py
Log Message:
-----------
Merge branch 'master' into 2939-orgs
Conflicts:
ckan/logic/auth/get.py
ckan/logic/auth/publisher/get.py
ckan/templates/header.html
ckan/tests/functional/api/test_activity.py
simple enough merge conflicts
Commit: 85be1a7c41f3e0c854eff6e3a925226cc1e6b70a
https://github.com/okfn/ckan/commit/85be1a7c41f3e0c854eff6e3a925226cc1e6b70a
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/lib/activity_streams.py
Log Message:
-----------
[#2939] Fix errors on dashboard re undefined activity icon
Commit: bd6f86612cf657e8dd8a862fa738e49f0bdeec1d
https://github.com/okfn/ckan/commit/bd6f86612cf657e8dd8a862fa738e49f0bdeec1d
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/public/base/css/main.css
Log Message:
-----------
[#2939] update main.css
Commit: c18deb524b6de84925811525da9012c377b71caf
https://github.com/okfn/ckan/commit/c18deb524b6de84925811525da9012c377b71caf
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/lib/activity_streams.py
Log Message:
-----------
[#2939] Proper activity stream fix
Commit: 257a9cb68d1b2e13bc0efeb28a6903c11b195ec4
https://github.com/okfn/ckan/commit/257a9cb68d1b2e13bc0efeb28a6903c11b195ec4
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/public/base/less/activity.less
Log Message:
-----------
[#2939] Undefined activities now neutral colour
Commit: c1cd8fa4989f072513572aa2ee1e571bb54d4ba0
https://github.com/okfn/ckan/commit/c1cd8fa4989f072513572aa2ee1e571bb54d4ba0
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-19 (Mon, 19 Nov 2012)
Changed paths:
M ckan/public/base/css/main.css
Log Message:
-----------
[#2939] Css update
Commit: bcae651ed0d4ba7f78f29a5262dd96db2a18f18e
https://github.com/okfn/ckan/commit/bcae651ed0d4ba7f78f29a5262dd96db2a18f18e
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/fuchsia.min.css
M ckan/public/base/css/green.css
M ckan/public/base/css/green.min.css
M ckan/public/base/css/main.min.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/maroon.min.css
M ckan/public/base/css/red.css
M ckan/public/base/css/red.min.css
M ckan/public/base/datapreview/css/recline.min.css
M ckan/public/base/datapreview/preview_recline.min.js
A ckan/public/base/datapreview/vendor/flot/0.7/excanvas.min.js
A ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.min.js
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.min.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.min.js
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.min.css
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.css
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.js
A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.min.js
M ckan/public/base/datapreview/vendor/leaflet/leaflet.min.css
M ckan/public/base/datapreview/vendor/leaflet/leaflet.min.js
M ckan/public/base/datapreview/vendor/pdfjs/pdf.min.js
M ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.css
M ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.js
M ckan/public/base/datapreview/vendor/recline/css/recline.min.css
M ckan/public/base/datapreview/vendor/recline/recline.min.js
M ckan/public/base/javascript/client.min.js
M ckan/public/base/javascript/module.min.js
A ckan/public/base/javascript/modules/dashboard.min.js
M ckan/public/base/javascript/modules/data-viewer.min.js
A ckan/public/base/javascript/modules/follow.min.js
A ckan/public/base/javascript/modules/popover-context.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-popover.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.min.js
Log Message:
-----------
[#2939] Minified files
Commit: 7875f3e466ba648e57d29884d19f430e849b70d2
https://github.com/okfn/ckan/commit/7875f3e466ba648e57d29884d19f430e849b70d2
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#2939] Improve the markdown_extract function
Commit: 2940296a7ade46f1e533fa9ed4f72030dea083d1
https://github.com/okfn/ckan/commit/2940296a7ade46f1e533fa9ed4f72030dea083d1
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/templates/snippets/group.html
M ckan/templates/snippets/organization.html
Log Message:
-----------
[#2939] template fixes for org/group snippet
Commit: fac6a66b740b6d83732f37a59f6b553b1591c00d
https://github.com/okfn/ckan/commit/fac6a66b740b6d83732f37a59f6b553b1591c00d
Author: John Martin <me at johnmart.in>
Date: 2012-11-20 (Tue, 20 Nov 2012)
Changed paths:
M ckan/public/base/less/masthead.less
Log Message:
-----------
Tweaked header to work with new better header nav
Commit: 4518ddb27b14e94441f182f96925e6b6eed60aba
https://github.com/okfn/ckan/commit/4518ddb27b14e94441f182f96925e6b6eed60aba
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
Process config from config_details
Commit: 0a3ed85e344c50916b97ed22ee7be75237037d43
https://github.com/okfn/ckan/commit/0a3ed85e344c50916b97ed22ee7be75237037d43
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
config.favicon default set in config/environment.py so fix and add comment
Commit: a885db3005964197ae954fffeea16afc49c65ad3
https://github.com/okfn/ckan/commit/a885db3005964197ae954fffeea16afc49c65ad3
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
add extra config options into app_globals
Commit: 944970ab83de9de885bc543eedda20a2ed5f0880
https://github.com/okfn/ckan/commit/944970ab83de9de885bc543eedda20a2ed5f0880
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M ckan/templates/base.html
M ckan/templates/footer.html
M ckan/templates/header.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/page.html
Log Message:
-----------
Change templates to use g not config for settings
Commit: 32a7e6821688ba0445f28d27fe972caeadf141b8
https://github.com/okfn/ckan/commit/32a7e6821688ba0445f28d27fe972caeadf141b8
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M ckan/lib/base.py
Log Message:
-----------
Do not give config to jinja templates
Commit: a1389453a355c5da20060eae44d4ec7a265a48d4
https://github.com/okfn/ckan/commit/a1389453a355c5da20060eae44d4ec7a265a48d4
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M ckan/logic/action/get.py
M ckan/logic/auth/get.py
M ckan/tests/functional/api/test_dashboard.py
M doc/install-from-source.rst
Log Message:
-----------
Merge branch 'master' into clean-config-from-jinja-templates
Commit: 4adbc4ef765e44bf025cc1abd37506b3dc31e6d0
https://github.com/okfn/ckan/commit/4adbc4ef765e44bf025cc1abd37506b3dc31e6d0
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
Fix globals names for recaptcha
Commit: a1f8c1c622a81a611ccd91cbdf6f304f6311967d
https://github.com/okfn/ckan/commit/a1f8c1c622a81a611ccd91cbdf6f304f6311967d
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-21 (Wed, 21 Nov 2012)
Changed paths:
M ckan/lib/cli.py
M ckan/logic/action/get.py
M ckan/logic/auth/get.py
M ckan/tests/functional/api/test_dashboard.py
M ckan_deb/usr/lib/ckan/common.sh
A doc/architecture.rst
R doc/buildbot.rst
R doc/coding-standards.rst
A doc/contributing-docs.rst
A doc/contributing.rst
A doc/css-coding-standards.rst
M doc/datastore-setup.rst
R doc/domain-model-dataset.rst
R doc/domain-model-resource.rst
R doc/domain-model-task-status.rst
R doc/domain-model.rst
A doc/html-coding-standards.rst
M doc/index.rst
M doc/install-from-source.rst
A doc/javascript-coding-standards.rst
A doc/migration.rst
A doc/python-coding-standards.rst
Log Message:
-----------
Merge branch 'master' into 2939-orgs
Conflicts:
ckan/logic/auth/get.py
dashboard authorizations FIXMEs amended otherwise non-issue
Commit: 3c274b9623ed2730011c3adf4d629037a6b4339d
https://github.com/okfn/ckan/commit/3c274b9623ed2730011c3adf4d629037a6b4339d
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-22 (Thu, 22 Nov 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2839] Fix group controller for group display pages
Commit: 091228f605003c868b0e8434e03632b1b80811cb
https://github.com/okfn/ckan/commit/091228f605003c868b0e8434e03632b1b80811cb
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-22 (Thu, 22 Nov 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Allow get_group_or_org_admin_ids() to accept name or id
Commit: 2fb4797bf329a47953db6cfe68f8885d19a4dede
https://github.com/okfn/ckan/commit/2fb4797bf329a47953db6cfe68f8885d19a4dede
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-22 (Thu, 22 Nov 2012)
Changed paths:
M ckan/templates/user/snippets/followers.html
Log Message:
-----------
[#2939] Hack follower snippet for group admins
Commit: 11081aec34fc9d120ffe4b89b58cb61e96bcca2e
https://github.com/okfn/ckan/commit/11081aec34fc9d120ffe4b89b58cb61e96bcca2e
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-22 (Thu, 22 Nov 2012)
Changed paths:
M README.rst
M ckan/config/deployment.ini_tmpl
M ckan/controllers/group.py
M ckan/controllers/user.py
M ckan/lib/activity_streams.py
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/logic/action/get.py
M ckan/logic/auth/get.py
M ckan/logic/auth/publisher/get.py
A ckan/migration/versions/062_add_dashboard_table.py
M ckan/model/__init__.py
M ckan/model/activity.py
A ckan/model/dashboard.py
M ckan/public/base/css/main.css
A ckan/public/base/javascript/modules/dashboard.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/activity.less
M ckan/public/base/less/ckan.less
A ckan/public/base/less/dashboard.less
M ckan/public/base/less/footer.less
M ckan/public/base/less/iehacks.less
M ckan/public/base/less/masthead.less
M ckan/templates/header.html
M ckan/templates/snippets/activity_item.html
M ckan/templates/user/dashboard.html
M ckan/tests/functional/api/test_activity.py
A ckan/tests/functional/api/test_dashboard.py
M ckan_deb/usr/lib/ckan/common.sh
A doc/architecture.rst
R doc/buildbot.rst
R doc/coding-standards.rst
M doc/common-error-messages.rst
A doc/contributing-docs.rst
A doc/contributing.rst
A doc/css-coding-standards.rst
M doc/datastore-setup.rst
R doc/domain-model-dataset.rst
R doc/domain-model-resource.rst
R doc/domain-model-task-status.rst
R doc/domain-model.rst
A doc/html-coding-standards.rst
M doc/index.rst
M doc/install-from-source.rst
A doc/javascript-coding-standards.rst
A doc/migration.rst
A doc/python-coding-standards.rst
Log Message:
-----------
Merge branch 'master' into 3016-template-tweaks
Conflicts:
ckan/public/base/less/masthead.less
ckan/templates/header.html
trivial
Commit: 9b766b6c5255481fc1d1dbc06aea3dfc8094508b
https://github.com/okfn/ckan/commit/9b766b6c5255481fc1d1dbc06aea3dfc8094508b
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-22 (Thu, 22 Nov 2012)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
[#3016] Fix typo
Commit: 6e03d1a0d42a6381d5e80f7b4c21bc3ed41bf473
https://github.com/okfn/ckan/commit/6e03d1a0d42a6381d5e80f7b4c21bc3ed41bf473
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-22 (Thu, 22 Nov 2012)
Changed paths:
M README.rst
M ckan/config/deployment.ini_tmpl
M ckan/lib/app_globals.py
M ckan/public/base/less/masthead.less
M ckan/templates/header.html
Log Message:
-----------
Merge branch 'master' into 2939-orgs
Commit: 2317da3f745753d875a1e4876c045898a7fecb8b
https://github.com/okfn/ckan/commit/2317da3f745753d875a1e4876c045898a7fecb8b
Author: John Martin <me at johnmart.in>
Date: 2012-11-25 (Sun, 25 Nov 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/organization.py
M ckan/lib/plugins.py
A ckan/templates/organization/admins.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read.html
A ckan/templates/organization/read_base.html
M ckan/templates/snippets/organization.html
Log Message:
-----------
Few UX tweaks to the org pages
Commit: 8e07b4cb4e8ddaf0060b73c0e68f01a85a349a7d
https://github.com/okfn/ckan/commit/8e07b4cb4e8ddaf0060b73c0e68f01a85a349a7d
Author: John Martin <me at johnmart.in>
Date: 2012-11-25 (Sun, 25 Nov 2012)
Changed paths:
M ckan/lib/activity_streams.py
M ckan/public/base/less/activity.less
M ckan/public/base/less/variables.less
Log Message:
-----------
Dashboard icons and colors for activity streams
Commit: 4eadae6adfdb683d0596dc0cd01ddde85a56eb46
https://github.com/okfn/ckan/commit/4eadae6adfdb683d0596dc0cd01ddde85a56eb46
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-26 (Mon, 26 Nov 2012)
Changed paths:
M ckan/config/routing.py
M ckan/templates/user/dashboard.html
M ckan/tests/functional/test_user.py
M doc/contributing.rst
A doc/frontend-testing.rst
M doc/python-coding-standards.rst
Log Message:
-----------
Merge branch 'master' into 3016-template-tweaks
Conflicts:
ckan/config/routing.py
icons added and dashboard url changed
Commit: 15bb5058d8fdeb1d8c5922516bee7142f9b6f5fe
https://github.com/okfn/ckan/commit/15bb5058d8fdeb1d8c5922516bee7142f9b6f5fe
Author: John Martin <me at johnmart.in>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/controllers/group.py
A ckan/public/base/images/editing.png
M ckan/public/base/less/profile.less
M ckan/templates/organization/base_form_page.html
M ckan/templates/organization/edit.html
A ckan/templates/organization/edit_base.html
M ckan/templates/organization/member_new.html
M ckan/templates/organization/members.html
M ckan/templates/organization/read_base.html
A ckan/templates/organization/snippets/info.html
M ckan/templates/organization/snippets/organization_form.html
Log Message:
-----------
Tweaks Organizations work-flow
Commit: e51e9146508fd6da27be6d662d603db2295d6c03
https://github.com/okfn/ckan/commit/e51e9146508fd6da27be6d662d603db2295d6c03
Author: John Martin <me at johnmart.in>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/organization.py
M ckan/public/base/less/profile.less
A ckan/templates/organization/about.html
M ckan/templates/organization/read_base.html
M ckan/templates/snippets/organization.html
Log Message:
-----------
Text overflow fix for organization description
Commit: 69bd94d7053cae16b4820f1de65b0305ce78eb38
https://github.com/okfn/ckan/commit/69bd94d7053cae16b4820f1de65b0305ce78eb38
Author: John Martin <me at johnmart.in>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/templates/snippets/facet_list.html
Log Message:
-----------
Fix for allowing the title to be sent through to the facet list
Commit: b4b1eb640b52d37e0d4c03e28b9d8c88b18e45f4
https://github.com/okfn/ckan/commit/b4b1eb640b52d37e0d4c03e28b9d8c88b18e45f4
Author: John Martin <me at johnmart.in>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/public/base/less/forms.less
M ckan/templates/package/snippets/package_basic_fields.html
Log Message:
-----------
Fix for pre-filled organizations in package create form
Commit: bd08b6d093a006546626d2f5237c6fcad42a9e5b
https://github.com/okfn/ckan/commit/bd08b6d093a006546626d2f5237c6fcad42a9e5b
Author: John Martin <me at johnmart.in>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/public/base/css/main.css
Log Message:
-----------
Re-built main.css
Commit: 8bd1579eacf27f8a4e2b3cf1c827fca9bd4a4a41
https://github.com/okfn/ckan/commit/8bd1579eacf27f8a4e2b3cf1c827fca9bd4a4a41
Author: John Martin <me at johnmart.in>
Date: 2012-11-27 (Tue, 27 Nov 2012)
Changed paths:
M ckan/public/base/javascript/client.js
Log Message:
-----------
Fix for user dropdown autocomplete
Commit: 6dea0a8b2ebb87c0ed5cfe0821d9ff6d43644b37
https://github.com/okfn/ckan/commit/6dea0a8b2ebb87c0ed5cfe0821d9ff6d43644b37
Author: John Martin <me at johnmart.in>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M ckan/public/base/less/group.less
M ckan/templates/snippets/group_item.html
Log Message:
-----------
Fix for group images overflowing on the homepage
Commit: ad691fb0316ade5f29296cd0bc10a07f4a097182
https://github.com/okfn/ckan/commit/ad691fb0316ade5f29296cd0bc10a07f4a097182
Author: John Martin <me at johnmart.in>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M ckan/public/base/css/main.css
Log Message:
-----------
Re-compiled main.css
Commit: 5ec66fdab016bdbbedeb3ced0cf6f47329042912
https://github.com/okfn/ckan/commit/5ec66fdab016bdbbedeb3ced0cf6f47329042912
Author: John Martin <me at johnmart.in>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M ckan/public/base/css/main.min.css
M ckan/public/base/javascript/client.min.js
Log Message:
-----------
Added minified files, maybe for the last time ;p
Commit: dcdb61323ace0d31009246a696334d930f62c05e
https://github.com/okfn/ckan/commit/dcdb61323ace0d31009246a696334d930f62c05e
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M ckan/templates/organization/edit_base.html
Log Message:
-----------
[#2939] Fix org template to allow add org
Commit: 03bcbca3205227e325224dca326c4febd12cc268
https://github.com/okfn/ckan/commit/03bcbca3205227e325224dca326c4febd12cc268
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M ckan/public/base/css/main.min.css
M ckan/public/base/javascript/client.min.js
Log Message:
-----------
Merge branch '2939-orgs' of github.com:okfn/ckan into 2939-orgs
Commit: e21dac144c4c172959e3ddbf1eb5fc6728146384
https://github.com/okfn/ckan/commit/e21dac144c4c172959e3ddbf1eb5fc6728146384
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M ckan/templates/organization/edit_base.html
Log Message:
-----------
[#2939] Fix org template to allow org members
Commit: 07b4fa52af35191601b7e7a762aa1ac65ae4e372
https://github.com/okfn/ckan/commit/07b4fa52af35191601b7e7a762aa1ac65ae4e372
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-28 (Wed, 28 Nov 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[#2939] Only show members not orgs in org member list
Commit: 0429cb92b3d9d4676a201412be661d20eab9e2e1
https://github.com/okfn/ckan/commit/0429cb92b3d9d4676a201412be661d20eab9e2e1
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-29 (Thu, 29 Nov 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/lib/dictization/model_dictize.py
M ckan/logic/action/get.py
M ckan/model/activity.py
M ckan/model/group.py
A ckan/templates/package/activity.html
M ckan/templates/package/read.html
M ckan/templates/user/dashboard.html
M ckan/tests/__init__.py
M ckan/tests/functional/api/__init__.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_dashboard.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/mock_publisher_auth.py
M ckan/tests/models/test_group.py
M doc/contributing.rst
A doc/frontend-testing.rst
M doc/python-coding-standards.rst
M pip-requirements-test.txt
M pip-requirements.txt
Log Message:
-----------
Merge branch 'master' into 2939-orgs
Conflicts:
ckan/lib/dictization/model_dictize.py
ckan/model/group.py
ckan/tests/functional/api/test_follow.py
ckan/tests/functional/test_group.py
Commit: 2a756aa62cd8584d35df8b9bad47d72b4693c8df
https://github.com/okfn/ckan/commit/2a756aa62cd8584d35df8b9bad47d72b4693c8df
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-29 (Thu, 29 Nov 2012)
Changed paths:
M ckan/tests/functional/api/test_dashboard.py
Log Message:
-----------
[#2939] Fix tests due to creation rights issue
Commit: 01d1718f2452018fb4e97be93639a81fc8174ae7
https://github.com/okfn/ckan/commit/01d1718f2452018fb4e97be93639a81fc8174ae7
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-30 (Fri, 30 Nov 2012)
Changed paths:
M ckan/templates/package/snippets/package_basic_fields.html
Log Message:
-----------
[#2939] Fix package edit to show org on edit
Commit: e993a52e9aac4d680d00140bccfb73586bd0bb6e
https://github.com/okfn/ckan/commit/e993a52e9aac4d680d00140bccfb73586bd0bb6e
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-30 (Fri, 30 Nov 2012)
Changed paths:
M ckan/lib/dictization/model_save.py
M ckan/logic/action/update.py
M ckan/templates/group/snippets/group_form.html
Log Message:
-----------
[#2939] Do not allow update of group dataset for new templates
Commit: c2269cbbe4aac607229c4d5f25ff90a293adefb8
https://github.com/okfn/ckan/commit/c2269cbbe4aac607229c4d5f25ff90a293adefb8
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-30 (Fri, 30 Nov 2012)
Changed paths:
M ckan/templates/group/snippets/group_form.html
Log Message:
-----------
[#2939] Unbreak group edit template
Commit: 34ae5ff27ad0df2b7be4888704f531ac70c3c057
https://github.com/okfn/ckan/commit/34ae5ff27ad0df2b7be4888704f531ac70c3c057
Author: tobes <toby.junk at gmail.com>
Date: 2012-11-30 (Fri, 30 Nov 2012)
Changed paths:
M ckan/templates_legacy/package/new_package_form.html
Log Message:
-----------
[#2939] Show group memberships in legacy templates
Commit: 0a3ffe0850f8ed290b3f66049b08178dbec9804e
https://github.com/okfn/ckan/commit/0a3ffe0850f8ed290b3f66049b08178dbec9804e
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-01 (Sat, 01 Dec 2012)
Changed paths:
M ckan/lib/dictization/model_save.py
Log Message:
-----------
[#2939] Only update datasets group if we have permission for that group
Commit: df4d4db47996e1b4e4b98a675588e6179d7db01a
https://github.com/okfn/ckan/commit/df4d4db47996e1b4e4b98a675588e6179d7db01a
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-01 (Sat, 01 Dec 2012)
Changed paths:
M ckan/templates/package/snippets/package_metadata_fields.html
Log Message:
-----------
[#2939] Add group info to dataset metadata form
Commit: 7c4ee6bc765b04639403397160702d809bb2f36d
https://github.com/okfn/ckan/commit/7c4ee6bc765b04639403397160702d809bb2f36d
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-01 (Sat, 01 Dec 2012)
Changed paths:
M ckan/model/group.py
Log Message:
-----------
[#2939] Simpler group dataset query
Commit: cdde06872045466048936529b6d87392257ac283
https://github.com/okfn/ckan/commit/cdde06872045466048936529b6d87392257ac283
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-01 (Sat, 01 Dec 2012)
Changed paths:
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/model/activity.py
M ckan/model/group.py
A ckan/templates/package/activity.html
M ckan/templates/package/read.html
M ckan/templates/package/read_base.html
M ckan/tests/__init__.py
M ckan/tests/functional/api/__init__.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_dashboard.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_group.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/mock_publisher_auth.py
M ckan/tests/models/test_group.py
M pip-requirements-test.txt
M pip-requirements.txt
Log Message:
-----------
Merge branch 'master' into 3016-template-tweaks
Conflicts:
ckan/config/routing.py
ckan/templates/package/read.html
dataset follow link added
Commit: 4c608e6959c12e56975bfb1fe3028c44007ed9f6
https://github.com/okfn/ckan/commit/4c608e6959c12e56975bfb1fe3028c44007ed9f6
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-01 (Sat, 01 Dec 2012)
Changed paths:
M ckan/templates/package/activity.html
Log Message:
-----------
Fix activity template
Commit: 60e31d28b0a28c524700d6838356631c6c69e604
https://github.com/okfn/ckan/commit/60e31d28b0a28c524700d6838356631c6c69e604
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-02 (Sun, 02 Dec 2012)
Changed paths:
M README.rst
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/package.py
M ckan/lib/app_globals.py
M ckan/lib/dictization/model_dictize.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/model/activity.py
M ckan/model/group.py
M ckan/public/base/less/masthead.less
M ckan/templates/header.html
A ckan/templates/package/activity.html
M ckan/templates/package/read.html
M ckan/templates/user/dashboard.html
M ckan/tests/__init__.py
M ckan/tests/functional/api/__init__.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_dashboard.py
M ckan/tests/functional/api/test_follow.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_user.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/mock_publisher_auth.py
M ckan/tests/models/test_group.py
M doc/contributing.rst
A doc/frontend-testing.rst
M doc/python-coding-standards.rst
M pip-requirements-test.txt
M pip-requirements.txt
Log Message:
-----------
Merge branch 'master' into clean-config-from-jinja-templates
Conflicts:
ckan/templates/header.html
trivial merge
also lib/app_globals new setting moved to new system
Commit: 347e81ebd45203b7e5b28b7fe783e4f73b6d7483
https://github.com/okfn/ckan/commit/347e81ebd45203b7e5b28b7fe783e4f73b6d7483
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-02 (Sun, 02 Dec 2012)
Changed paths:
M ckan/lib/base.py
Log Message:
-----------
Fix typo in comment
Commit: 7cb4e60459f6210aad2e071e2011a46dea210b8b
https://github.com/okfn/ckan/commit/7cb4e60459f6210aad2e071e2011a46dea210b8b
Author: kindly <kindly at gmail.com>
Date: 2012-12-03 (Mon, 03 Dec 2012)
Changed paths:
M ckan/tests/lib/test_dictization.py
M ckan/tests/logic/test_action.py
Log Message:
-----------
[#2939] fix tests by adding user
Commit: febea16ef01636b01195994365ecb5cd28bbaa4d
https://github.com/okfn/ckan/commit/febea16ef01636b01195994365ecb5cd28bbaa4d
Author: John Martin <me at johnmart.in>
Date: 2012-12-04 (Tue, 04 Dec 2012)
Changed paths:
M ckan/templates/package/activity.html
M ckan/templates/package/read_base.html
M ckan/templates/snippets/page_header.html
Log Message:
-----------
Few small tweaks to templates
Commit: 5fcd88a5ac096d6d651aeab4ec629eb3a2cf42d0
https://github.com/okfn/ckan/commit/5fcd88a5ac096d6d651aeab4ec629eb3a2cf42d0
Author: Ian Murray <ian.c.murray at gmail.com>
Date: 2012-12-04 (Tue, 04 Dec 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
[ec] A very simple tracking stats export.
Paster command to export some very simple tracking stats to a csv file.
(cherry picked from commits 18ca569c3489a170634d2d1dc6ffd5de7c02e338 and
90d1ef68de0d2716a60e5fe730cae650bd43ef69)
Commit: 558b2be6ea35075f72e20518029543fd232e7233
https://github.com/okfn/ckan/commit/558b2be6ea35075f72e20518029543fd232e7233
Author: Ian Murray <ian.c.murray at gmail.com>
Date: 2012-12-04 (Tue, 04 Dec 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
[ec] Paster command, "user add", uses defers to action layer.
Rather than directly creating the User, which as a consequence will bypass
any custom validation.
(cherry picked from commit e664c459f5d78987d3923ec138a3727b474272ea)
Commit: 9fd3f970241c391fa48a89308806d84cfc41e4d9
https://github.com/okfn/ckan/commit/9fd3f970241c391fa48a89308806d84cfc41e4d9
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-06 (Thu, 06 Dec 2012)
Changed paths:
M ckan/controllers/related.py
Log Message:
-----------
[#3016] Do not change c.action in related list
Commit: afbaaf567b256fa37f6affdc79854aad728bc16d
https://github.com/okfn/ckan/commit/afbaaf567b256fa37f6affdc79854aad728bc16d
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-12-06 (Thu, 06 Dec 2012)
Changed paths:
M ckan/config/solr/CHANGELOG.txt
A ckan/config/solr/schema-2.0.xml
M ckan/controllers/home.py
M ckan/lib/search/__init__.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/tests/functional/test_search.py
M ckan/tests/lib/test_solr_package_search.py
M ckan/tests/lib/test_solr_package_search_synchronous_update.py
M ckanext/multilingual/solr/schema.xml
M doc/configuration.rst
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 3016-template-tweaks
Commit: 02481e0dccd92fc6ef5b27a9241031c19ae28e49
https://github.com/okfn/ckan/commit/02481e0dccd92fc6ef5b27a9241031c19ae28e49
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-06 (Thu, 06 Dec 2012)
Changed paths:
M ckan/lib/helpers.py
Log Message:
-----------
[#3016] Improve doc strings
Commit: cdc8ee80543dfe086ca6a2d4aff4cde275fd3e41
https://github.com/okfn/ckan/commit/cdc8ee80543dfe086ca6a2d4aff4cde275fd3e41
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-06 (Thu, 06 Dec 2012)
Changed paths:
M ckan/config/solr/CHANGELOG.txt
A ckan/config/solr/schema-2.0.xml
M ckan/controllers/home.py
M ckan/lib/helpers.py
M ckan/lib/search/__init__.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/tests/functional/test_search.py
M ckan/tests/lib/test_solr_package_search.py
M ckan/tests/lib/test_solr_package_search_synchronous_update.py
M ckan_deb/usr/lib/ckan/common.sh
M ckanext/multilingual/solr/schema.xml
M doc/configuration.rst
Log Message:
-----------
Merge branch 'master' into 2939-orgs
Commit: 21613e1c0578bc223a56d2148d23b440c071eb10
https://github.com/okfn/ckan/commit/21613e1c0578bc223a56d2148d23b440c071eb10
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-12-10 (Mon, 10 Dec 2012)
Changed paths:
M ckan_deb/usr/lib/ckan/common.sh
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 3016-template-tweaks
Commit: b9178f6d68204af931d52069126b7abc3240bf7c
https://github.com/okfn/ckan/commit/b9178f6d68204af931d52069126b7abc3240bf7c
Author: John Martin <me at johnmart.in>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/templates/base.html
Log Message:
-----------
Fixed typo in template. I suspect this never worked.
Commit: 15eb468c2a5faee61608c482c98c04e57e84c85a
https://github.com/okfn/ckan/commit/15eb468c2a5faee61608c482c98c04e57e84c85a
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/activity_streams.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/model/activity.py
M ckan/plugins/interfaces.py
A ckan/public/base/javascript/modules/activity-stream.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/activity.less
M ckan/public/base/less/forms.less
M ckan/templates/activity_streams/activity_stream_items.html
A ckan/templates/package/activity_stream.html
M ckan/tests/functional/test_package.py
M test-core.ini
Log Message:
-----------
Merge branch 'master' into 2939-orgs
Conflicts:
ckan/lib/helpers.py
trivial merge new functions in org branch and
dashboard_activity_stream() has offset param added
Commit: 072ba8152c1d46c0b483b57fbd9df6eaa4740e60
https://github.com/okfn/ckan/commit/072ba8152c1d46c0b483b57fbd9df6eaa4740e60
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/tests/functional/api/test_dashboard.py
Log Message:
-----------
[#2939] Sean's dashboard test shim - Thanks sean
Commit: 88e8532145d521a449d040d8171a5160c49181dc
https://github.com/okfn/ckan/commit/88e8532145d521a449d040d8171a5160c49181dc
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-11 (Tue, 11 Dec 2012)
Changed paths:
M ckan/model/group.py
Log Message:
-----------
[#2939] Fix group pending package test
Commit: a2958bc0bacd239a18c3d7bb49ef7f573419b83f
https://github.com/okfn/ckan/commit/a2958bc0bacd239a18c3d7bb49ef7f573419b83f
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/new_authz.py
Log Message:
-----------
[#2939] Sysadmins have all the permissions
Commit: a7c593473e4b63d9be19c46be7acf03e2e2ec207
https://github.com/okfn/ckan/commit/a7c593473e4b63d9be19c46be7acf03e2e2ec207
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/tests/functional/api/test_dashboard.py
Log Message:
-----------
[#2939] Fix couple of dashboard tests
Commit: 06f79973ff219daeb5c32a1d927addde95c1ea36
https://github.com/okfn/ckan/commit/06f79973ff219daeb5c32a1d927addde95c1ea36
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/activity_streams.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/model/activity.py
M ckan/plugins/interfaces.py
A ckan/public/base/javascript/modules/activity-stream.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/activity.less
M ckan/public/base/less/forms.less
M ckan/templates/activity_streams/activity_stream_items.html
A ckan/templates/package/activity_stream.html
M ckan/tests/functional/test_package.py
M ckan_deb/usr/lib/ckan/common.sh
M test-core.ini
Log Message:
-----------
Merge branch 'master' into 3016-template-tweaks
Conflicts:
ckan/config/routing.py
some extra offset routes added
Commit: 0e760f9b92c2b8af8d80b9212eb80f25bfa11542
https://github.com/okfn/ckan/commit/0e760f9b92c2b8af8d80b9212eb80f25bfa11542
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
[#3016] Imporve docstring and comment
Commit: b21831c3b02e03783b4c6c6d13fa12c60962fc2a
https://github.com/okfn/ckan/commit/b21831c3b02e03783b4c6c6d13fa12c60962fc2a
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/lib/activity_streams.py
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/model/activity.py
M ckan/plugins/interfaces.py
A ckan/public/base/javascript/modules/activity-stream.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/activity.less
M ckan/public/base/less/forms.less
M ckan/templates/activity_streams/activity_stream_items.html
A ckan/templates/package/activity_stream.html
M ckan/tests/functional/test_package.py
M test-core.ini
Log Message:
-----------
Merge branch '3016-template-tweaks' of github.com:okfn/ckan into 3016-template-tweaks
Commit: 624e2a29a1eca93850f6e2f6a94bcb1df835fcfc
https://github.com/okfn/ckan/commit/624e2a29a1eca93850f6e2f6a94bcb1df835fcfc
Author: Stefan Wehrmeyer <mail at stefanwehrmeyer.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/i18n/check_po_files.py
Log Message:
-----------
[3004][s] Move polib import into paster command method
Moving from module level in order to not require polib
for paster commands.
Commit: ca58fd6b30af7d71d93563bc4995d6e748855608
https://github.com/okfn/ckan/commit/ca58fd6b30af7d71d93563bc4995d6e748855608
Author: John Glover <glover.john at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/templates/base.html
M ckan/templates/footer.html
M ckan/templates/header.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/page.html
Log Message:
-----------
Merge pull request #180 from okfn/clean-config-from-jinja-templates
Clean config from jinja templates
Commit: 6aa1dc2726a8eb596d55b03897ef74d51c3545ab
https://github.com/okfn/ckan/commit/6aa1dc2726a8eb596d55b03897ef74d51c3545ab
Author: John Glover <glover.john at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/i18n/check_po_files.py
Log Message:
-----------
Merge pull request #203 from okfn/3004-move-polib-import
[3004][s] Move polib import into paster command method
Commit: de13b37ae56aa8a70f0e89b913d79f754f86d2fd
https://github.com/okfn/ckan/commit/de13b37ae56aa8a70f0e89b913d79f754f86d2fd
Author: John Glover <j at johnglover.net>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/config/deployment.ini_tmpl
M ckan/config/routing.py
M ckan/config/solr/CHANGELOG.txt
A ckan/config/solr/schema-2.0.xml
M ckan/controllers/group.py
M ckan/controllers/home.py
M ckan/controllers/package.py
M ckan/controllers/user.py
M ckan/i18n/check_po_files.py
M ckan/lib/activity_streams.py
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/lib/helpers.py
M ckan/lib/search/__init__.py
M ckan/lib/search/index.py
M ckan/lib/search/query.py
M ckan/logic/action/get.py
M ckan/model/activity.py
M ckan/plugins/interfaces.py
A ckan/public/base/javascript/modules/activity-stream.js
M ckan/public/base/javascript/resource.config
M ckan/public/base/less/activity.less
M ckan/public/base/less/forms.less
M ckan/templates/activity_streams/activity_stream_items.html
M ckan/templates/base.html
M ckan/templates/footer.html
M ckan/templates/header.html
A ckan/templates/package/activity_stream.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/page.html
M ckan/tests/functional/test_package.py
M ckan/tests/functional/test_search.py
M ckan/tests/lib/test_solr_package_search.py
M ckan/tests/lib/test_solr_package_search_synchronous_update.py
M ckan_deb/usr/lib/ckan/common.sh
M ckanext/multilingual/solr/schema.xml
M doc/configuration.rst
M test-core.ini
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into feature-paster-user-add-uses-action-layer
Commit: e9682e66421feef1edde567a33ec646e9f162d3b
https://github.com/okfn/ckan/commit/e9682e66421feef1edde567a33ec646e9f162d3b
Author: John Glover <j at johnglover.net>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
[#196] Update usage for user command.
User add will fail with new logic layer validation
if email address is not supplised. Updated usage
string to note that email can be supplied via the
command line.
Commit: 6e7560bdd9d665b6ff53c29403f5ed8a0d54a68f
https://github.com/okfn/ckan/commit/6e7560bdd9d665b6ff53c29403f5ed8a0d54a68f
Author: John Glover <glover.john at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
Merge pull request #196 from okfn/feature-paster-user-add-uses-action-layer
[ec] Paster command, "user add", uses defers to action layer.
Commit: 16ddee47b187468dbce4b813b87b5d99ed9e89b9
https://github.com/okfn/ckan/commit/16ddee47b187468dbce4b813b87b5d99ed9e89b9
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/i18n/check_po_files.py
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/templates/base.html
M ckan/templates/footer.html
M ckan/templates/header.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/page.html
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1635-feature-email-notifications-for-activity-streams
Commit: f019ca4d93def31f833265aeabeab875e671d37d
https://github.com/okfn/ckan/commit/f019ca4d93def31f833265aeabeab875e671d37d
Author: John Glover <j at johnglover.net>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
[#195] Small whitespace changes
Commit: 058ace89bfc8bcf7daa16feffc1cf98400c5a849
https://github.com/okfn/ckan/commit/058ace89bfc8bcf7daa16feffc1cf98400c5a849
Author: John Glover <glover.john at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/lib/cli.py
Log Message:
-----------
Merge pull request #195 from okfn/feature-improved-tracking-command
[ec] A very simple tracking stats export.
Commit: 463d18420b736dba135ac1f1dd5b26d52aefcc5d
https://github.com/okfn/ckan/commit/463d18420b736dba135ac1f1dd5b26d52aefcc5d
Author: kindly <kindly at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/lib/helpers.py
M ckan/logic/action/get.py
M ckan/templates/package/snippets/package_basic_fields.html
Log Message:
-----------
[2939] fix organization availible helper so can take permission as argument. This was in order to give an org editor the ability to create a dataset
Commit: d6b761e4f6a068f11d05d9ea1e5a9f68f4666da1
https://github.com/okfn/ckan/commit/d6b761e4f6a068f11d05d9ea1e5a9f68f4666da1
Author: kindly <kindly at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/templates/package/snippets/package_basic_fields.html
Log Message:
-----------
[2939] let the new dataset form^Cefault to first org the user belongs to
Commit: 9ef5dab2c2ff332cb2f6eccb6311194c6e7bdc91
https://github.com/okfn/ckan/commit/9ef5dab2c2ff332cb2f6eccb6311194c6e7bdc91
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
[#3016] Docstring improvement - Sean is the docstring king :)
Commit: c0ce7e2f2e6aec7cc6066594bf07adf17a3895cb
https://github.com/okfn/ckan/commit/c0ce7e2f2e6aec7cc6066594bf07adf17a3895cb
Author: kindly <kindly at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[2939] show datasets is search to member of the org
Commit: f629913bda36db054ac5b2c7732da519534673ac
https://github.com/okfn/ckan/commit/f629913bda36db054ac5b2c7732da519534673ac
Author: kindly <kindly at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M test-core.ini
Log Message:
-----------
[2939] add extra params to test-core.ini
Commit: 4c57d8074c49b572dccf19b66a0610c9c4daeadf
https://github.com/okfn/ckan/commit/4c57d8074c49b572dccf19b66a0610c9c4daeadf
Author: kindly <kindly at gmail.com>
Date: 2012-12-12 (Wed, 12 Dec 2012)
Changed paths:
M ckan/controllers/group.py
Log Message:
-----------
[2939] fix error in permission
Commit: 34abccc9cd3d06d8884548cc9be687d0ca030624
https://github.com/okfn/ckan/commit/34abccc9cd3d06d8884548cc9be687d0ca030624
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
Merge branch '3016-template-tweaks' of github.com:okfn/ckan into 3016-template-tweaks
Commit: 3ee993f612022b9ae4af5cc0a5d4c8ba37ee7693
https://github.com/okfn/ckan/commit/3ee993f612022b9ae4af5cc0a5d4c8ba37ee7693
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M ckan/i18n/check_po_files.py
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/templates/base.html
M ckan/templates/footer.html
M ckan/templates/header.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/page.html
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 3016-template-tweaks
Commit: b6dae85e54ccb7e64f32bcacf1507fb9b2c53e34
https://github.com/okfn/ckan/commit/b6dae85e54ccb7e64f32bcacf1507fb9b2c53e34
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M ckan/config/environment.py
M ckan/config/routing.py
M ckan/controllers/related.py
M ckan/lib/helpers.py
M ckan/public/base/javascript/modules/popover-context.js
M ckan/public/base/less/masthead.less
R ckan/templates/ajax_snippets/popover-context-dataset.html
R ckan/templates/ajax_snippets/popover-context-group.html
R ckan/templates/ajax_snippets/popover-context-user.html
A ckan/templates/ajax_snippets/popover_context_dataset.html
A ckan/templates/ajax_snippets/popover_context_group.html
A ckan/templates/ajax_snippets/popover_context_user.html
M ckan/templates/development/primer.html
A ckan/templates/development/snippets/page_header.html
M ckan/templates/group/read.html
A ckan/templates/group/read_base.html
M ckan/templates/header.html
M ckan/templates/package/activity.html
M ckan/templates/package/followers.html
M ckan/templates/package/read.html
A ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
A ckan/templates/snippets/page_header.html
M ckan/templates/user/read.html
A ckan/templates/user/read_base.html
Log Message:
-----------
Merge branch '3016-template-tweaks'
Commit: 61c5d2b23dd4684d2fbb3e0596caae554c177c7f
https://github.com/okfn/ckan/commit/61c5d2b23dd4684d2fbb3e0596caae554c177c7f
Author: John Martin <me at johnmart.in>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M ckan/config/environment.py
M ckan/config/routing.py
M ckan/controllers/related.py
M ckan/i18n/check_po_files.py
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/helpers.py
M ckan/public/base/javascript/modules/popover-context.js
M ckan/public/base/less/masthead.less
R ckan/templates/ajax_snippets/popover-context-dataset.html
R ckan/templates/ajax_snippets/popover-context-group.html
R ckan/templates/ajax_snippets/popover-context-user.html
A ckan/templates/ajax_snippets/popover_context_dataset.html
A ckan/templates/ajax_snippets/popover_context_group.html
A ckan/templates/ajax_snippets/popover_context_user.html
M ckan/templates/base.html
M ckan/templates/development/primer.html
A ckan/templates/development/snippets/page_header.html
M ckan/templates/footer.html
M ckan/templates/group/read.html
A ckan/templates/group/read_base.html
M ckan/templates/header.html
M ckan/templates/organization/new.html
M ckan/templates/package/activity.html
M ckan/templates/package/followers.html
M ckan/templates/package/read.html
A ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/resource_read.html
M ckan/templates/package/search.html
M ckan/templates/page.html
A ckan/templates/snippets/page_header.html
M ckan/templates/user/read.html
A ckan/templates/user/read_base.html
Log Message:
-----------
[#2939] Merged master
Commit: b70ad3d9e43e1b358d6f8dde847fd56d6de5f3ca
https://github.com/okfn/ckan/commit/b70ad3d9e43e1b358d6f8dde847fd56d6de5f3ca
Author: John Martin <me at johnmart.in>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M ckan/lib/app_globals.py
M ckan/templates/activity_streams/activity_stream_items.html
Log Message:
-----------
[#2939] Fix for undefined global within activity stream templates
Commit: c7508658c848ee4c231a755e19ca3286797e13f9
https://github.com/okfn/ckan/commit/c7508658c848ee4c231a755e19ca3286797e13f9
Author: kindly <kindly at gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M ckan/authz.py
M ckan/config/routing.py
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/group.py
R ckan/controllers/group_formalchemy.py
A ckan/controllers/organization.py
M ckan/controllers/package.py
R ckan/controllers/package_formalchemy.py
M ckan/controllers/storage.py
M ckan/controllers/user.py
R ckan/forms/__init__.py
R ckan/forms/authorization_group.py
R ckan/forms/authz.py
R ckan/forms/builder.py
R ckan/forms/common.py
R ckan/forms/group.py
R ckan/forms/package.py
R ckan/forms/package_dict.py
R ckan/forms/registry.py
M ckan/lib/activity_streams.py
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.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/jinja_extensions.py
M ckan/lib/plugins.py
M ckan/lib/search/index.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/delete.py
M ckan/logic/auth/get.py
R ckan/logic/auth/publisher/__init__.py
R ckan/logic/auth/publisher/create.py
R ckan/logic/auth/publisher/delete.py
R ckan/logic/auth/publisher/get.py
R ckan/logic/auth/publisher/update.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
A ckan/migration/versions/063_org_changes.py
M ckan/model/__init__.py
M ckan/model/group.py
M ckan/model/package.py
M ckan/model/user.py
M ckan/new_authz.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/fuchsia.min.css
M ckan/public/base/css/green.css
M ckan/public/base/css/green.min.css
M ckan/public/base/css/main.css
M ckan/public/base/css/main.min.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/maroon.min.css
M ckan/public/base/css/red.css
M ckan/public/base/css/red.min.css
M ckan/public/base/datapreview/css/recline.min.css
M ckan/public/base/datapreview/preview_recline.min.js
A ckan/public/base/datapreview/vendor/flot/0.7/excanvas.min.js
A ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.min.js
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.min.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.min.js
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.min.css
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.css
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.js
A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.min.js
M ckan/public/base/datapreview/vendor/leaflet/leaflet.min.css
M ckan/public/base/datapreview/vendor/leaflet/leaflet.min.js
M ckan/public/base/datapreview/vendor/pdfjs/pdf.min.js
M ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.css
M ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.js
M ckan/public/base/datapreview/vendor/recline/css/recline.min.css
M ckan/public/base/datapreview/vendor/recline/recline.min.js
A ckan/public/base/images/editing.png
A ckan/public/base/images/placeholder-organization.png
M ckan/public/base/javascript/client.js
M ckan/public/base/javascript/client.min.js
M ckan/public/base/javascript/module.min.js
A ckan/public/base/javascript/modules/dashboard.min.js
M ckan/public/base/javascript/modules/data-viewer.min.js
A ckan/public/base/javascript/modules/follow.min.js
A ckan/public/base/javascript/modules/popover-context.min.js
M ckan/public/base/less/activity.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/group.less
M ckan/public/base/less/profile.less
M ckan/public/base/less/variables.less
A ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-popover.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.min.js
M ckan/templates/activity_streams/activity_stream_items.html
A ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/index.html
A ckan/templates/group/member_new.html
A ckan/templates/group/members.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/header.html
A ckan/templates/organization/about.html
A ckan/templates/organization/admins.html
A ckan/templates/organization/base_form_page.html
A ckan/templates/organization/confirm_delete.html
A ckan/templates/organization/confirm_delete_member.html
A ckan/templates/organization/edit.html
A ckan/templates/organization/edit_base.html
A ckan/templates/organization/index.html
A ckan/templates/organization/member_new.html
A ckan/templates/organization/members.html
A ckan/templates/organization/new.html
A ckan/templates/organization/new_organization_form.html
A ckan/templates/organization/read.html
A ckan/templates/organization/read_base.html
A ckan/templates/organization/snippets/feeds.html
A ckan/templates/organization/snippets/info.html
A ckan/templates/organization/snippets/organization_form.html
A ckan/templates/organization/snippets/organization_item.html
A ckan/templates/organization/snippets/organization_list.html
M ckan/templates/package/read.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/snippets/facet_list.html
M ckan/templates/snippets/group.html
M ckan/templates/snippets/group_item.html
A ckan/templates/snippets/organization.html
A ckan/templates/snippets/organization_item.html
A ckan/templates/snippets/private.html
M ckan/templates/user/snippets/followers.html
M ckan/templates_legacy/admin/index.html
M ckan/templates_legacy/admin/layout.html
M ckan/templates_legacy/group/layout.html
M ckan/templates_legacy/package/layout.html
M ckan/templates_legacy/package/new_package_form.html
M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
R ckan/tests/forms/__init__.py
R ckan/tests/forms/test_authz.py
R ckan/tests/forms/test_group.py
R ckan/tests/forms/test_package.py
M ckan/tests/functional/api/base.py
M ckan/tests/functional/api/model/test_group.py
M ckan/tests/functional/api/model/test_package.py
M ckan/tests/functional/api/model/test_vocabulary.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_dashboard.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_admin.py
R ckan/tests/functional/test_authz.py
R ckan/tests/functional/test_edit_authz.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
R ckan/tests/functional/test_package_edit_authz.py
R ckan/tests/functional/test_publisher_auth.py
M ckan/tests/functional/test_tag_vocab.py
M ckan/tests/functional/test_upload.py
R ckan/tests/lib/test_authztool.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_solr_search_index.py
M ckan/tests/logic/test_action.py
A ckan/tests/logic/test_auth.py
R ckan/tests/misc/test_auth_profiles.py
R ckan/tests/misc/test_package_saver.py
R ckan/tests/models/test_authz.py
R ckan/tests/models/test_repo.py
R ckan/tests/test_authz.py
A doc/organizations_and_groups.rst
M test-core.ini
Log Message:
-----------
Merge branch '2939-orgs'
Commit: c8af251922225f8cf2057d1a946e66d4ca898305
https://github.com/okfn/ckan/commit/c8af251922225f8cf2057d1a946e66d4ca898305
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
Remove some lines of code that have somehow crept back in during some merges
Commit: 586e131d488c8bd662befdf82e4ad8db2bc747dc
https://github.com/okfn/ckan/commit/586e131d488c8bd662befdf82e4ad8db2bc747dc
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M doc/organizations_and_groups.rst
Log Message:
-----------
Update the org/group doc to be more acurate
Commit: 331d0586fd0f58abfac65fe3d8fa5778fa0f4a65
https://github.com/okfn/ckan/commit/331d0586fd0f58abfac65fe3d8fa5778fa0f4a65
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M doc/organizations_and_groups.rst
Log Message:
-----------
Further update the org/group docs
Commit: 36fab6afba8a0980e7a18cb76861303ddeadb004
https://github.com/okfn/ckan/commit/36fab6afba8a0980e7a18cb76861303ddeadb004
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M ckan/config/routing.py
Log Message:
-----------
Remove SubMapper in config.routes as we now have a compatable routes version
Commit: 9483817641341262582fd9ce22df309e3973294f
https://github.com/okfn/ckan/commit/9483817641341262582fd9ce22df309e3973294f
Author: tobes <toby.junk at gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
Minor cleanup of model_dictize.py
Commit: fc5ec257232bf9f61e0016ecfd463e343bfe579d
https://github.com/okfn/ckan/commit/fc5ec257232bf9f61e0016ecfd463e343bfe579d
Author: kindly <kindly at gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M ckan/lib/dictization/model_dictize.py
Log Message:
-----------
Merge pull request #211 from okfn/clean-model-dictize
[Trivial] Minor cleanup of model_dictize.py
Commit: fe54ab091331894ff38a584e3a9597e78d119439
https://github.com/okfn/ckan/commit/fe54ab091331894ff38a584e3a9597e78d119439
Author: kindly <kindly at gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M doc/organizations_and_groups.rst
Log Message:
-----------
Merge pull request #208 from okfn/orgs-doc-fix
Orgs doc fix
Commit: b83207b005c2a54dcb477fc32f8bce0eb10a12f1
https://github.com/okfn/ckan/commit/b83207b005c2a54dcb477fc32f8bce0eb10a12f1
Author: kindly <kindly at gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Changed paths:
M ckan/lib/app_globals.py
Log Message:
-----------
Merge pull request #207 from okfn/merge-fix
[Trivial] Remove some lines of code that have somehow crept back in during some merges
Commit: 7868c98dc4ab2519916c46b881eaa21a9b1f29f4
https://github.com/okfn/ckan/commit/7868c98dc4ab2519916c46b881eaa21a9b1f29f4
Author: Sean Hammond <seanhammond at lavabit.com>
Date: 2012-12-14 (Fri, 14 Dec 2012)
Changed paths:
M ckan/authz.py
M ckan/config/environment.py
M ckan/config/routing.py
M ckan/controllers/admin.py
M ckan/controllers/api.py
M ckan/controllers/group.py
R ckan/controllers/group_formalchemy.py
A ckan/controllers/organization.py
M ckan/controllers/package.py
R ckan/controllers/package_formalchemy.py
M ckan/controllers/related.py
M ckan/controllers/storage.py
M ckan/controllers/user.py
R ckan/forms/__init__.py
R ckan/forms/authorization_group.py
R ckan/forms/authz.py
R ckan/forms/builder.py
R ckan/forms/common.py
R ckan/forms/group.py
R ckan/forms/package.py
R ckan/forms/package_dict.py
R ckan/forms/registry.py
M ckan/lib/activity_streams.py
M ckan/lib/app_globals.py
M ckan/lib/base.py
M ckan/lib/cli.py
M ckan/lib/create_test_data.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/jinja_extensions.py
M ckan/lib/plugins.py
M ckan/lib/search/index.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/delete.py
M ckan/logic/auth/get.py
R ckan/logic/auth/publisher/__init__.py
R ckan/logic/auth/publisher/create.py
R ckan/logic/auth/publisher/delete.py
R ckan/logic/auth/publisher/get.py
R ckan/logic/auth/publisher/update.py
M ckan/logic/auth/update.py
M ckan/logic/schema.py
M ckan/logic/validators.py
R ckan/migration/versions/063_add_email_last_sent_column.py
A ckan/migration/versions/063_org_changes.py
A ckan/migration/versions/064_add_email_last_sent_column.py
R ckan/migration/versions/064_add_email_notifications_preference.py
A ckan/migration/versions/065_add_email_notifications_preference.py
M ckan/model/__init__.py
M ckan/model/group.py
M ckan/model/package.py
M ckan/model/user.py
M ckan/new_authz.py
M ckan/plugins/interfaces.py
M ckan/public/base/css/fuchsia.css
M ckan/public/base/css/fuchsia.min.css
M ckan/public/base/css/green.css
M ckan/public/base/css/green.min.css
M ckan/public/base/css/main.css
M ckan/public/base/css/main.min.css
M ckan/public/base/css/maroon.css
M ckan/public/base/css/maroon.min.css
M ckan/public/base/css/red.css
M ckan/public/base/css/red.min.css
M ckan/public/base/datapreview/css/recline.min.css
M ckan/public/base/datapreview/preview_recline.min.js
A ckan/public/base/datapreview/vendor/flot/0.7/excanvas.min.js
A ckan/public/base/datapreview/vendor/flot/0.7/jquery.flot.min.js
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.ie.min.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.Default.min.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/MarkerCluster.min.css
A ckan/public/base/datapreview/vendor/leaflet.markercluster/leaflet.markercluster.min.js
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.ie.min.css
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.css
A ckan/public/base/datapreview/vendor/leaflet/0.3.1/leaflet.min.js
A ckan/public/base/datapreview/vendor/leaflet/0.4.4/leaflet-src.min.js
M ckan/public/base/datapreview/vendor/leaflet/leaflet.min.css
M ckan/public/base/datapreview/vendor/leaflet/leaflet.min.js
M ckan/public/base/datapreview/vendor/pdfjs/pdf.min.js
M ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.css
M ckan/public/base/datapreview/vendor/pdfviewer/viewer.min.js
M ckan/public/base/datapreview/vendor/recline/css/recline.min.css
M ckan/public/base/datapreview/vendor/recline/recline.min.js
A ckan/public/base/images/editing.png
A ckan/public/base/images/placeholder-organization.png
M ckan/public/base/javascript/client.js
M ckan/public/base/javascript/client.min.js
M ckan/public/base/javascript/module.min.js
A ckan/public/base/javascript/modules/dashboard.min.js
M ckan/public/base/javascript/modules/data-viewer.min.js
A ckan/public/base/javascript/modules/follow.min.js
M ckan/public/base/javascript/modules/popover-context.js
A ckan/public/base/javascript/modules/popover-context.min.js
M ckan/public/base/less/activity.less
M ckan/public/base/less/forms.less
M ckan/public/base/less/group.less
M ckan/public/base/less/masthead.less
M ckan/public/base/less/profile.less
M ckan/public/base/less/variables.less
A ckan/public/base/vendor/bootstrap/js/bootstrap-dropdown.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-popover.min.js
A ckan/public/base/vendor/bootstrap/js/bootstrap-tooltip.min.js
M ckan/templates/activity_streams/activity_stream_items.html
R ckan/templates/ajax_snippets/popover-context-dataset.html
R ckan/templates/ajax_snippets/popover-context-group.html
R ckan/templates/ajax_snippets/popover-context-user.html
A ckan/templates/ajax_snippets/popover_context_dataset.html
A ckan/templates/ajax_snippets/popover_context_group.html
A ckan/templates/ajax_snippets/popover_context_user.html
M ckan/templates/development/primer.html
A ckan/templates/development/snippets/page_header.html
A ckan/templates/group/confirm_delete_member.html
M ckan/templates/group/index.html
A ckan/templates/group/member_new.html
A ckan/templates/group/members.html
M ckan/templates/group/read.html
A ckan/templates/group/read_base.html
M ckan/templates/group/snippets/group_form.html
M ckan/templates/header.html
A ckan/templates/organization/about.html
A ckan/templates/organization/admins.html
A ckan/templates/organization/base_form_page.html
A ckan/templates/organization/confirm_delete.html
A ckan/templates/organization/confirm_delete_member.html
A ckan/templates/organization/edit.html
A ckan/templates/organization/edit_base.html
A ckan/templates/organization/index.html
A ckan/templates/organization/member_new.html
A ckan/templates/organization/members.html
A ckan/templates/organization/new.html
A ckan/templates/organization/new_organization_form.html
A ckan/templates/organization/read.html
A ckan/templates/organization/read_base.html
A ckan/templates/organization/snippets/feeds.html
A ckan/templates/organization/snippets/info.html
A ckan/templates/organization/snippets/organization_form.html
A ckan/templates/organization/snippets/organization_item.html
A ckan/templates/organization/snippets/organization_list.html
M ckan/templates/package/activity.html
M ckan/templates/package/followers.html
M ckan/templates/package/read.html
A ckan/templates/package/read_base.html
M ckan/templates/package/related_list.html
M ckan/templates/package/snippets/package_basic_fields.html
M ckan/templates/package/snippets/package_metadata_fields.html
M ckan/templates/snippets/facet_list.html
M ckan/templates/snippets/group.html
M ckan/templates/snippets/group_item.html
A ckan/templates/snippets/organization.html
A ckan/templates/snippets/organization_item.html
A ckan/templates/snippets/page_header.html
A ckan/templates/snippets/private.html
M ckan/templates/user/read.html
A ckan/templates/user/read_base.html
M ckan/templates/user/snippets/followers.html
M ckan/templates_legacy/admin/index.html
M ckan/templates_legacy/admin/layout.html
M ckan/templates_legacy/group/layout.html
M ckan/templates_legacy/package/layout.html
M ckan/templates_legacy/package/new_package_form.html
M ckan/tests/ckantestplugin/ckantestplugin/__init__.py
R ckan/tests/forms/__init__.py
R ckan/tests/forms/test_authz.py
R ckan/tests/forms/test_group.py
R ckan/tests/forms/test_package.py
M ckan/tests/functional/api/base.py
M ckan/tests/functional/api/model/test_group.py
M ckan/tests/functional/api/model/test_package.py
M ckan/tests/functional/api/model/test_vocabulary.py
M ckan/tests/functional/api/test_activity.py
M ckan/tests/functional/api/test_dashboard.py
M ckan/tests/functional/api/test_email_notifications.py
M ckan/tests/functional/test_activity.py
M ckan/tests/functional/test_admin.py
R ckan/tests/functional/test_authz.py
R ckan/tests/functional/test_edit_authz.py
M ckan/tests/functional/test_group.py
M ckan/tests/functional/test_package.py
R ckan/tests/functional/test_package_edit_authz.py
R ckan/tests/functional/test_publisher_auth.py
M ckan/tests/functional/test_tag_vocab.py
M ckan/tests/functional/test_upload.py
R ckan/tests/lib/test_authztool.py
M ckan/tests/lib/test_dictization.py
M ckan/tests/lib/test_dictization_schema.py
M ckan/tests/lib/test_solr_search_index.py
M ckan/tests/logic/test_action.py
A ckan/tests/logic/test_auth.py
R ckan/tests/misc/test_auth_profiles.py
R ckan/tests/misc/test_package_saver.py
R ckan/tests/models/test_authz.py
R ckan/tests/models/test_repo.py
R ckan/tests/test_authz.py
A doc/organizations_and_groups.rst
M test-core.ini
Log Message:
-----------
Merge branch 'master' of github.com:okfn/ckan into 1635-feature-email-notifications-for-activity-streams
Conflicts:
ckan/logic/action/update.py
ckan/logic/auth/get.py
ckan/logic/auth/publisher/get.py
ckan/logic/auth/publisher/update.py
ckan/model/user.py
Compare: https://github.com/okfn/ckan/compare/7bdc62043673...7868c98dc4ab
More information about the ckan-changes
mailing list