Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync upstream 2.6 latest #4

Open
wants to merge 86 commits into
base: dia
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
86 commits
Select commit Hold shift + click to select a range
d3b4a7f
Update version number for 2.6.1b
amercader Nov 29, 2016
6205381
[#3327] Fix French locale
amercader Nov 29, 2016
2b33801
[#3354] Migrate table is kept during tests when the rows of all the o…
Dec 6, 2016
5468044
3260 removed idle connection
smotornyuk Nov 21, 2016
1f2ebed
3245 datastore_active race condition
smotornyuk Nov 24, 2016
dfe7b36
\#3189 Datastore doesn't add site_url to resource created via API
smotornyuk Nov 29, 2016
db260d0
ckan datastore: convert data error to unicode instead of str to avoid…
fanderegg Nov 15, 2016
06a9b4d
check group name and id during package creation
smotornyuk Dec 5, 2016
54e7827
normal user added to "roger" group in order to pass auth checks
smotornyuk Dec 8, 2016
32ebf41
inside `_create_package` user becomes admin of group
smotornyuk Dec 12, 2016
4000de5
Change order of Solr filters
amercader Feb 14, 2017
0ca17cb
[#3373]Dashboard_mark_activities_old is set to utcnow() format
Dec 20, 2016
421f036
Clean language url
amercader Feb 14, 2017
99d9181
Updated value for `ckan.auth.user_create_groups
smotornyuk Dec 12, 2016
f8e423a
`render_markdown` breaks links with ampersands
smotornyuk Dec 12, 2016
df5a5d6
added some tests and src attr to img
smotornyuk Dec 16, 2016
760ecdf
Pull translations from Transifex before 2.6.1
amercader Feb 14, 2017
1283061
Compile translations before 2.6.1
amercader Feb 14, 2017
c0ec95d
[#3447] Resource creation date use datetime.utcnow()
Feb 20, 2017
d30c9b1
Use the url_for() helper for datapusher URLs
jheino Feb 17, 2017
0c671af
Update CHANGELOG ahead of 2.6.1
amercader Feb 22, 2017
6069805
Update version number for 2.6.1
amercader Feb 22, 2017
cf154f3
Merge branch 'dev-v2.6' into release-v2.6-latest
amercader Feb 22, 2017
890afc7
Minor change in CHANGELOG
amercader Feb 22, 2017
6c3a613
Change version number for 2.6.2
smotornyuk Mar 22, 2017
61eaff6
Use h.url_for and qualified=True for reset mails
Zharktas Mar 15, 2017
1989eed
Setting of datastore_active flag moved to separate function
janaslo Mar 14, 2017
84a8033
fix edit resource of draft dataset
fanjinfei Mar 13, 2017
dbbc48b
Fix tags on org/group read pages
Feb 24, 2017
4340736
auth check in revision controller
smotornyuk Mar 22, 2017
682bae6
Updated changelog
smotornyuk Mar 22, 2017
7e2430a
Use json.dumps for nested fields in datastore_dump
smotornyuk Mar 16, 2017
a6fc309
updated _dump_nested
smotornyuk Apr 3, 2017
ae6129b
Merge pull request #3532 from ckan/release-v2.6-latest
TkTech Apr 5, 2017
d68be29
Merge pull request #3533 from ckan/dev-v2.6
TkTech Apr 5, 2017
e26fb01
Update version number for 2.6.3b
amercader Jun 21, 2017
5a4ef01
[#3457]Create new resource view if resource format changed
Feb 26, 2017
aacee8f
Added test and modification to logic
May 22, 2017
51b19d3
Added logic fix and test fix
May 22, 2017
dec9d4f
Restrict access to `members` and `bulk_actions`
smotornyuk May 2, 2017
6fc4bab
test fixes
smotornyuk May 2, 2017
b392ab2
fixes in controller tests
smotornyuk May 2, 2017
1cdf0fd
Fixed typo in "16. enable PostGIS on the main database"
May 23, 2017
67bc928
fix broken language toggle url when there is params in current url
fanjinfei Jun 7, 2017
11b6e0d
[#3528] Allow underscore chars in URL slug preview
Jun 17, 2017
cd458c6
[#3528] Add additional test for slugify
Jun 17, 2017
259dcab
[#3593] Fix filter results button not working for organization/group
Jun 20, 2017
5abcc91
Fix PEP8
amercader Jun 21, 2017
74fdd78
[#2501] Allow slug preview to work with autocomplete fields
Jun 18, 2017
e9000f0
[#3644] Fix activity test to use utcnow
amercader Jun 27, 2017
b499f8a
Changed required permission from 'update' to 'manage_group'
Jun 23, 2017
afd03e4
Catch invalid sort param exception
amercader Jun 23, 2017
1a442a4
pep8 fix
amercader Jun 23, 2017
0dbe056
Choose direction of recreated relationship depending on its type
smotornyuk Jun 21, 2017
04e25b8
[#2228] Fix render_datetime error for year before 1900
Jun 16, 2017
a9771c0
[#2228] Add additional test for render_datetime
Jun 16, 2017
a65c56b
[#2228] Use regexp to replace year
Jun 28, 2017
760aaca
[#2228] Add additional test for render_datetime
Jun 28, 2017
209dd7c
Don't a 500 when printing the validation errors.
CarlQLange May 18, 2016
1dbe89e
Updated changelog
smotornyuk Jun 29, 2017
6f1c3a1
Fix if incorrect behaviour of mail_to helper
smotornyuk Jul 4, 2017
439bbca
Fix of incorrect output of datapusher logs
smotornyuk Jul 4, 2017
08e7d48
[#3661] Fix issue upon creating new org/group through UI form
Jul 1, 2017
25f696f
Update changelog
amercader Jul 5, 2017
92ebe31
add proper name to `clean_html` helper
smotornyuk Jul 6, 2017
28dcc92
fix radio button PR
tino097 Jul 6, 2017
6321b49
clean Package::get from openid
smotornyuk Jul 12, 2017
5caa198
fixed legacy test after openid removal
smotornyuk Jul 12, 2017
b63298e
Merge branch 'dev-v2.6' of github.com:ckan/ckan into dev-v2.6
amercader Jul 13, 2017
21d2370
Update translations from Transifex
amercader Jul 13, 2017
4e4878b
Compile translations after update from Transifex
amercader Jul 13, 2017
548ddc6
fix the relationship_create auth method
zyxbest Jul 15, 2017
ee91052
Fix dataset count display for groups
kmbn Jul 20, 2017
7aaaa32
Make autocomplete more responsive
kmbn Jul 20, 2017
4117515
[#3694] Restrict access to resource edit form to anon users
amercader Jul 12, 2017
b473ef1
[#3694] Restrict access to add member form to anon users
amercader Jul 12, 2017
aa44f77
[#3684] Fix old test env, pep8
amercader Jul 12, 2017
52b65df
Updated CHANGELOG
smotornyuk Jul 21, 2017
bca10cf
Update translations from Transifex
smotornyuk Jul 26, 2017
b915399
Fixed error
ggcatu Jul 25, 2017
ec69cd9
Backport #3366 for ckan 2.6
Zharktas Jul 28, 2017
09bcd54
Merge pull request #3735 from Zharktas/3366-backport-to-2.6
smotornyuk Jul 28, 2017
c11828c
[#3539] Fix call to pylons.set_lang
amercader Jul 27, 2017
0eac613
Rebuild front-end
smotornyuk Aug 1, 2017
531aa69
Merge branch 'dev-v2.6' into release-v2.6-latest
smotornyuk Aug 2, 2017
9557af0
Merge remote-tracking branch 'upstream/release-v2.6-latest' into sync…
catalyst-joe-guo Aug 3, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update translations from Transifex
smotornyuk committed Jul 26, 2017
commit bca10cf9b119c3bae16f2020f478e768c41286c6
47 changes: 26 additions & 21 deletions ckan/i18n/lv/LC_MESSAGES/ckan.po
Original file line number Diff line number Diff line change
@@ -391,12 +391,12 @@ msgstr "Šī vietne pašlaik atrodas bezsaistē. Notiek databāzes inicializāci
msgid "Please <a href=\"%s\">update your profile</a> and add your email address. "
msgstr ""
"Lūdzu <a href=\"%s\">atjaunojiet savu profilu</a> un pievienojiet savu "
"epasta adresi."
"e-pasta adresi."

#: ckan/controllers/home.py:83
#, python-format
msgid "%s uses your email address if you need to reset your password."
msgstr "%s izmanto savu epastu, ja nepieciešams atiestatīt savu paroli."
msgstr "%s izmanto savu e-pastu, ja nepieciešams atiestatīt savu paroli."

#: ckan/controllers/package.py:290
msgid "Invalid search query: {error_message}"
@@ -1027,7 +1027,7 @@ msgstr "%s <%s>"

#: ckan/lib/mailer.py:109
msgid "No recipient email address available!"
msgstr "Nav pieejama saņēmēja epasta adrese!"
msgstr "Nav pieejama saņēmēja e-pasta adrese!"

#: ckan/lib/mailer.py:127 ckan/templates/home/snippets/stats.html:17
msgid "organization"
@@ -1370,7 +1370,7 @@ msgstr "Vērtējumam jābūt starp %i un %i."

#: ckan/logic/action/create.py:1052
msgid "Error sending the invite email, the user was not created: {0}"
msgstr "Kļūda nosūtot uzaicinājuma epastu. Lietotājs netika izveidots: {0}"
msgstr "Kļūda nosūtot uzaicinājuma e-pastu. Lietotājs netika izveidots: {0}"

#: ckan/logic/action/create.py:1265 ckan/logic/action/create.py:1272
msgid "You must be logged in to follow users"
@@ -2534,7 +2534,7 @@ msgstr "Jauns lietotājs"
#: ckan/templates/group/member_new.html:45
#: ckan/templates/organization/member_new.html:47
msgid "If you wish to invite a new user, enter their email address."
msgstr "Ja vēlaties uzaicināt jaunu lietotāju, ievadiet tā epasta adresi."
msgstr "Ja vēlaties uzaicināt jaunu lietotāju, ievadiet tā e-pasta adresi."

#: ckan/templates/group/member_new.html:55
#: ckan/templates/group/members.html:18
@@ -2974,7 +2974,7 @@ msgstr "Lietotājvārds"

#: ckan/templates/organization/member_new.html:50
msgid "Email address"
msgstr "Epasta adrese"
msgstr "E-pasta adrese"

#: ckan/templates/organization/member_new.html:62
msgid "Update Member"
@@ -3049,9 +3049,10 @@ msgid ""
"datasets. Users can have different roles within an Organization, depending "
"on their level of authorisation to create, edit and publish. "
msgstr ""
"CKAN organizācijas tiek izmantoti, lai izveidotu, pārvaldītu un publicētu "
"datu kopu kolekcijas. Lietotāji var būt ar dažādām lomām organizācijā, "
"atkarībā piešķirtajām tiesībām tie var izveidot, rediģēt un publicēt datus."
"Organizācijas, kas atbilst Informācijas atklātības likuma 1. pantā "
"noteiktajai iestādes definīcijai (ikviena iestāde, kā arī persona, kas "
"īsteno pārvaldes funkcijas un uzdevumus, ja šī persona informācijas apritē "
"ir saistīta ar attiecīgo funkciju un uzdevumu izpildi)."

#: ckan/templates/organization/snippets/organization_form.html:10
msgid "My Organization"
@@ -3571,7 +3572,7 @@ msgstr "Joe Bloggs"

#: ckan/templates/package/snippets/package_metadata_fields.html:16
msgid "Author Email"
msgstr "Autora epasts"
msgstr "Autora e-pasts"

#: ckan/templates/package/snippets/package_metadata_fields.html:16
#: ckan/templates/package/snippets/package_metadata_fields.html:22
@@ -3581,7 +3582,7 @@ msgstr "joe@example.com"

#: ckan/templates/package/snippets/package_metadata_fields.html:22
msgid "Maintainer Email"
msgstr "Uzturētāja epasts"
msgstr "Uzturētāja e-pasts"

#: ckan/templates/package/snippets/resource_edit_form.html:12
msgid "Update Resource"
@@ -3901,9 +3902,9 @@ msgstr ""
#: ckan/templates/snippets/search_result_text.html:15
msgid "{number} dataset found for \"{query}\""
msgid_plural "{number} datasets found for \"{query}\""
msgstr[0] "{number} datu kopas meklējot \"{query}\""
msgstr[0] "{number} datu kopa meklējot \"{query}\""
msgstr[1] "{number} datu kopas meklējot \"{query}\""
msgstr[2] "{number} datu kopa meklējot \"{query}\""
msgstr[2] "{number} datu kopas meklējot \"{query}\""

#: ckan/templates/snippets/search_result_text.html:16
msgid "No datasets found for \"{query}\""
@@ -3912,9 +3913,9 @@ msgstr "Nav atrastas datu kopas meklējot \"{query}\""
#: ckan/templates/snippets/search_result_text.html:17
msgid "{number} dataset found"
msgid_plural "{number} datasets found"
msgstr[0] "atrastas {number} datu kopas"
msgstr[0] "atrasta {number} datu kopa"
msgstr[1] "atrastas {number} datu kopas"
msgstr[2] "atrasta {number} datu kopa"
msgstr[2] "atrastas {number} datu kopas"

#: ckan/templates/snippets/search_result_text.html:18
msgid "No datasets found"
@@ -3977,7 +3978,7 @@ msgstr "Pierakstīties"
#: ckan/templates/user/new_user_form.html:7
#: ckan/templates/user/read_base.html:82
msgid "Email"
msgstr "Epasts"
msgstr "E-pasts"

#: ckan/templates/snippets/subscribe.html:5
msgid "RSS"
@@ -4059,7 +4060,7 @@ msgstr "Mainīt detaļas"

#: ckan/templates/user/edit_user_form.html:10
msgid "Full name"
msgstr "Pilnais vārds"
msgstr "Attēlojamais vārds (alias)"

#: ckan/templates/user/edit_user_form.html:10
msgid "eg. Joe Bloggs"
@@ -4075,7 +4076,7 @@ msgstr "Nedaudz informācijas par sevi"

#: ckan/templates/user/edit_user_form.html:17
msgid "Subscribe to notification emails"
msgstr "Abonēt epasta paziņojumus"
msgstr "Abonēt e-pasta paziņojumus"

#: ckan/templates/user/edit_user_form.html:26
msgid "Change password"
@@ -4193,19 +4194,23 @@ msgstr "Konta reģistrācija"

#: ckan/templates/user/new.html:26
msgid "Why Sign Up?"
msgstr "Kāpēc reģistrēties?"
msgstr "Iespējas un ierobežojumi"

#: ckan/templates/user/new.html:28
msgid "Create datasets, groups and other exciting things"
msgstr "Izveidot datu kopas, kategorijas un citas aizraujošas lietas"
msgstr ""
"Reģistrēti lietotāji var sekot līdzi konkrētam datu kopām. Publicēt datu "
"kopas ir iespējams tikai pēc tam, kad administrators ir piešķīris lietotājam"
" šādas tiesības. Lai publicētu datu kopas lūdzam iepazīties ar informāciju "
"portāla sadaļā “Publicētājiem\"."

#: ckan/templates/user/new_user_form.html:5
msgid "username"
msgstr "lietotājvārds"

#: ckan/templates/user/new_user_form.html:6
msgid "Full Name"
msgstr "PIlns vārds"
msgstr "Attēlojamais vārds (alias)"

#: ckan/templates/user/new_user_form.html:17
msgid "Create Account"