Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2eb26a4

Browse files
joetsoijoetsoi
committed
Merge branch 'master' into 2206-group-org-show-exclude-datasets
Conflicts: CHANGELOG.rst ckan/tests/logic/action/test_get.py
2 parents 8bde0b3 + e2e1970 commit 2eb26a4

577 files changed

Lines changed: 125639 additions & 186225 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.coveragerc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[run]
2-
omit = */migration/*, /tests/*, */new_tests/*
2+
omit = */migration/*, /tests/*
33
source = ckan, ckanext

‎CHANGELOG.rst‎

Lines changed: 293 additions & 36 deletions
Large diffs are not rendered by default.

‎MANIFEST.in‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ recursive-include ckanext/*/public *
1212
recursive-include ckanext/*/templates *
1313
recursive-include ckanext/*/theme/public *
1414
recursive-include ckanext/*/theme/templates *
15+
include ckanext/datastore/set_permissions.sql
1516

1617
prune .git
1718
include CHANGELOG.txt

‎ckan/__init__.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
__version__ = '2.3a'
1+
__version__ = '2.4a'
22

33
__description__ = 'CKAN Software'
44
__long_description__ = \
5-
'''CKAN software provides a hub for datasets. The flagship site running CKAN
5+
'''CKAN software provides a hub for datasets. The flagship site running CKAN
66
is theDataHub.org but it is also used for dozens of other open data websites
77
run by governments, agencies and citizens.
88
9-
CKAN provides a place to search for open knowledge resources as well as
10-
register your own - be that a set of Shakespeare's works, a global
11-
population density database, the voting records of MPs, or 30 years of
9+
CKAN provides a place to search for open knowledge resources as well as
10+
register your own - be that a set of Shakespeare's works, a global
11+
population density database, the voting records of MPs, or 30 years of
1212
US patents.
1313
1414
Those familiar with Freshmeat or CPAN can think of CKAN as providing an
15-
analogous service for open data and knowledge.
15+
analogous service for open data and knowledge.
1616
'''
1717
__license__ = 'AGPL'
1818

0 commit comments

Comments
 (0)