Skip to content

Commit 8f6a13c

Browse files
fblupifblupi
committed
Merge branch 'release/0.29-stable' of github.com:AjuntamentdeBarcelona/decidim into release/0.29-stable-bcn
2 parents c794cb4 + c8535da commit 8f6a13c

170 files changed

Lines changed: 742 additions & 365 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.

‎.decidim-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.29.6
1+
0.29.7

‎CHANGELOG.md‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,41 @@
22

33
# Changelog
44

5+
## [0.29.7](https://github.com/decidim/decidim/tree/0.29.7)
6+
7+
### Added
8+
9+
Nothing.
10+
11+
### Changed
12+
13+
Nothing.
14+
15+
### Fixed
16+
17+
- Backport 'Lock graphql-ws to stable version' to v0.29 [\#15476](https://github.com/decidim/decidim/pull/15476)
18+
- **decidim-core**: Backport 'Add local `app/views` to `Cell::ViewModel` view paths' to v0.29 [\#15482](https://github.com/decidim/decidim/pull/15482)
19+
- **decidim-core**: Backport 'Prevent shakapacker related flakys in CI' to v0.29 [\#15515](https://github.com/decidim/decidim/pull/15515)
20+
- **decidim-blogs**: Backport 'Order posts by publication date' to v0.29 [\#15523](https://github.com/decidim/decidim/pull/15523)
21+
- **decidim-core**: Backport 'Fix markers displayed in meeting page' to v0.29 [\#15518](https://github.com/decidim/decidim/pull/15518)
22+
- **decidim-meetings**: Backport 'Use same card for Meeting always' to v0.29 [\#15547](https://github.com/decidim/decidim/pull/15547)
23+
- **decidim-core**: Backport 'Fix links in footer when using the organizations' description' to v0.29 [\#15544](https://github.com/decidim/decidim/pull/15544)
24+
- **decidim-conferences**: Backport 'Add missing i18n string in Conference program page' to v0.29 [\#15555](https://github.com/decidim/decidim/pull/15555)
25+
- **decidim-core**: Backport 'Fix strong tags color in footer organization description' to v0.29 [\#15561](https://github.com/decidim/decidim/pull/15561)
26+
27+
### Removed
28+
29+
Nothing.
30+
31+
### Developer improvements
32+
33+
Nothing.
34+
35+
### Internal
36+
37+
- **decidim-forms**, **decidim-surveys**: Revert "Backport 'Fix drag and drop sorting for questionnaires' to v0.29" [\#15467](https://github.com/decidim/decidim/pull/15467)
38+
- **decidim-core**: Backport 'Prevent shakapacker related flakys in CI' to v0.29 [\#15515](https://github.com/decidim/decidim/pull/15515)
39+
540
## [0.29.6](https://github.com/decidim/decidim/tree/0.29.6)
641

742
### Added

‎Gemfile.lock‎

Lines changed: 84 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
11
PATH
22
remote: .
33
specs:
4-
decidim (0.29.6)
5-
decidim-accountability (= 0.29.6)
6-
decidim-admin (= 0.29.6)
7-
decidim-api (= 0.29.6)
8-
decidim-assemblies (= 0.29.6)
9-
decidim-blogs (= 0.29.6)
10-
decidim-budgets (= 0.29.6)
11-
decidim-comments (= 0.29.6)
12-
decidim-core (= 0.29.6)
13-
decidim-debates (= 0.29.6)
14-
decidim-forms (= 0.29.6)
15-
decidim-generators (= 0.29.6)
16-
decidim-meetings (= 0.29.6)
17-
decidim-pages (= 0.29.6)
18-
decidim-participatory_processes (= 0.29.6)
19-
decidim-proposals (= 0.29.6)
20-
decidim-sortitions (= 0.29.6)
21-
decidim-surveys (= 0.29.6)
22-
decidim-system (= 0.29.6)
23-
decidim-verifications (= 0.29.6)
24-
decidim-accountability (0.29.6)
25-
decidim-comments (= 0.29.6)
26-
decidim-core (= 0.29.6)
27-
decidim-admin (0.29.6)
4+
decidim (0.29.7)
5+
decidim-accountability (= 0.29.7)
6+
decidim-admin (= 0.29.7)
7+
decidim-api (= 0.29.7)
8+
decidim-assemblies (= 0.29.7)
9+
decidim-blogs (= 0.29.7)
10+
decidim-budgets (= 0.29.7)
11+
decidim-comments (= 0.29.7)
12+
decidim-core (= 0.29.7)
13+
decidim-debates (= 0.29.7)
14+
decidim-forms (= 0.29.7)
15+
decidim-generators (= 0.29.7)
16+
decidim-meetings (= 0.29.7)
17+
decidim-pages (= 0.29.7)
18+
decidim-participatory_processes (= 0.29.7)
19+
decidim-proposals (= 0.29.7)
20+
decidim-sortitions (= 0.29.7)
21+
decidim-surveys (= 0.29.7)
22+
decidim-system (= 0.29.7)
23+
decidim-verifications (= 0.29.7)
24+
decidim-accountability (0.29.7)
25+
decidim-comments (= 0.29.7)
26+
decidim-core (= 0.29.7)
27+
decidim-admin (0.29.7)
2828
active_link_to (~> 1.0)
29-
decidim-core (= 0.29.6)
29+
decidim-core (= 0.29.7)
3030
devise (~> 4.7)
3131
devise-i18n (~> 1.2)
3232
devise_invitable (~> 2.0, >= 2.0.9)
33-
decidim-api (0.29.6)
34-
decidim-core (= 0.29.6)
33+
decidim-api (0.29.7)
34+
decidim-core (= 0.29.7)
3535
graphql (~> 2.2.6)
3636
graphql-docs (~> 4.0)
3737
rack-cors (~> 1.0)
38-
decidim-assemblies (0.29.6)
39-
decidim-core (= 0.29.6)
40-
decidim-blogs (0.29.6)
41-
decidim-admin (= 0.29.6)
42-
decidim-comments (= 0.29.6)
43-
decidim-core (= 0.29.6)
44-
decidim-budgets (0.29.6)
45-
decidim-comments (= 0.29.6)
46-
decidim-core (= 0.29.6)
47-
decidim-comments (0.29.6)
48-
decidim-core (= 0.29.6)
38+
decidim-assemblies (0.29.7)
39+
decidim-core (= 0.29.7)
40+
decidim-blogs (0.29.7)
41+
decidim-admin (= 0.29.7)
42+
decidim-comments (= 0.29.7)
43+
decidim-core (= 0.29.7)
44+
decidim-budgets (0.29.7)
45+
decidim-comments (= 0.29.7)
46+
decidim-core (= 0.29.7)
47+
decidim-comments (0.29.7)
48+
decidim-core (= 0.29.7)
4949
redcarpet (~> 3.5, >= 3.5.1)
50-
decidim-conferences (0.29.6)
51-
decidim-core (= 0.29.6)
52-
decidim-meetings (= 0.29.6)
50+
decidim-conferences (0.29.7)
51+
decidim-core (= 0.29.7)
52+
decidim-meetings (= 0.29.7)
5353
wicked_pdf (~> 2.7)
54-
decidim-core (0.29.6)
54+
decidim-core (0.29.7)
5555
active_link_to (~> 1.0)
5656
acts_as_list (~> 1.0)
5757
batch-loader (~> 1.2)
@@ -103,16 +103,16 @@ PATH
103103
valid_email2 (~> 4.0)
104104
web-push (~> 3.0)
105105
wisper (~> 2.0)
106-
decidim-debates (0.29.6)
107-
decidim-comments (= 0.29.6)
108-
decidim-core (= 0.29.6)
109-
decidim-design (0.29.6)
110-
decidim-core (= 0.29.6)
111-
decidim-dev (0.29.6)
106+
decidim-debates (0.29.7)
107+
decidim-comments (= 0.29.7)
108+
decidim-core (= 0.29.7)
109+
decidim-design (0.29.7)
110+
decidim-core (= 0.29.7)
111+
decidim-dev (0.29.7)
112112
bullet (~> 7.1.6)
113113
byebug (~> 11.0)
114114
capybara (~> 3.39)
115-
decidim (= 0.29.6)
115+
decidim (= 0.29.7)
116116
erb_lint (~> 0.4.0)
117117
factory_bot_rails (~> 6.2)
118118
faker (~> 3.2)
@@ -144,49 +144,50 @@ PATH
144144
w3c_rspec_validators (~> 0.3.0)
145145
webmock (~> 3.18)
146146
wisper-rspec (~> 1.0)
147-
decidim-forms (0.29.6)
148-
decidim-core (= 0.29.6)
147+
decidim-forms (0.29.7)
148+
decidim-core (= 0.29.7)
149149
wicked_pdf (~> 2.1)
150-
decidim-generators (0.29.6)
151-
decidim-core (= 0.29.6)
152-
decidim-initiatives (0.29.6)
153-
decidim-admin (= 0.29.6)
154-
decidim-comments (= 0.29.6)
155-
decidim-core (= 0.29.6)
156-
decidim-verifications (= 0.29.6)
150+
decidim-generators (0.29.7)
151+
decidim-core (= 0.29.7)
152+
decidim-initiatives (0.29.7)
153+
decidim-admin (= 0.29.7)
154+
decidim-comments (= 0.29.7)
155+
decidim-core (= 0.29.7)
156+
decidim-verifications (= 0.29.7)
157+
hexapdf (~> 0.32.0)
157158
wicked_pdf (~> 2.1)
158-
decidim-meetings (0.29.6)
159-
decidim-core (= 0.29.6)
160-
decidim-forms (= 0.29.6)
159+
decidim-meetings (0.29.7)
160+
decidim-core (= 0.29.7)
161+
decidim-forms (= 0.29.7)
161162
icalendar (~> 2.5)
162-
decidim-pages (0.29.6)
163-
decidim-core (= 0.29.6)
164-
decidim-participatory_processes (0.29.6)
165-
decidim-core (= 0.29.6)
166-
decidim-proposals (0.29.6)
167-
decidim-comments (= 0.29.6)
168-
decidim-core (= 0.29.6)
163+
decidim-pages (0.29.7)
164+
decidim-core (= 0.29.7)
165+
decidim-participatory_processes (0.29.7)
166+
decidim-core (= 0.29.7)
167+
decidim-proposals (0.29.7)
168+
decidim-comments (= 0.29.7)
169+
decidim-core (= 0.29.7)
169170
doc2text (~> 0.4.7)
170171
redcarpet (~> 3.5, >= 3.5.1)
171-
decidim-sortitions (0.29.6)
172-
decidim-admin (= 0.29.6)
173-
decidim-comments (= 0.29.6)
174-
decidim-core (= 0.29.6)
175-
decidim-proposals (= 0.29.6)
176-
decidim-surveys (0.29.6)
177-
decidim-core (= 0.29.6)
178-
decidim-forms (= 0.29.6)
179-
decidim-system (0.29.6)
172+
decidim-sortitions (0.29.7)
173+
decidim-admin (= 0.29.7)
174+
decidim-comments (= 0.29.7)
175+
decidim-core (= 0.29.7)
176+
decidim-proposals (= 0.29.7)
177+
decidim-surveys (0.29.7)
178+
decidim-core (= 0.29.7)
179+
decidim-forms (= 0.29.7)
180+
decidim-system (0.29.7)
180181
active_link_to (~> 1.0)
181-
decidim-core (= 0.29.6)
182+
decidim-core (= 0.29.7)
182183
devise (~> 4.7)
183184
devise-i18n (~> 1.2)
184185
devise_invitable (~> 2.0, >= 2.0.9)
185-
decidim-templates (0.29.6)
186-
decidim-core (= 0.29.6)
187-
decidim-forms (= 0.29.6)
188-
decidim-verifications (0.29.6)
189-
decidim-core (= 0.29.6)
186+
decidim-templates (0.29.7)
187+
decidim-core (= 0.29.7)
188+
decidim-forms (= 0.29.7)
189+
decidim-verifications (0.29.7)
190+
decidim-core (= 0.29.7)
190191

191192
GEM
192193
remote: https://rubygems.org/

‎decidim-accountability/config/locales/eu.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ eu:
228228
empty_filters: Ez dago emaitzarik irizpide honekin.
229229
subcategories_label: Azpikategoriak
230230
home_header:
231-
global_status: Exekuzio-egoera orokorra
231+
global_status: Helburuen betetze-maila
232232
nav_breadcrumb:
233233
global: Gauzatze osoa
234234
no_results: Ez dago proiekturik

‎decidim-accountability/config/locales/fi.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ fi:
233233
global: Yleinen toteutus
234234
no_results: Projekteja ei ole saatavilla
235235
search:
236-
search: Hae toimintoja
236+
search: Hae toimenpiteitä
237237
show:
238238
stats:
239239
back_to_resource: Palaa tulokseen

‎decidim-accountability/config/locales/sr-CS.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ sr:
4343
admin:
4444
exports:
4545
results: Rezultati
46+
import_results:
47+
new:
48+
title: Uvezi rezultate iz CSV datoteke
4649
models:
4750
result:
4851
name: Rezultat

‎decidim-accountability/config/locales/tr-TR.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ tr:
2323
progress: İlerleme
2424
timeline_entry:
2525
description: Açıklama
26+
entry_date: Tarih
2627
title: Başlık
2728
models:
2829
decidim/accountability/proposal_linked_event: Teklif bir sonuca dahil edildi
@@ -182,6 +183,9 @@ tr:
182183
success: Sonuçların içe aktarılması başarılı. Sonuçları yönetim arayüzünde inceleyebilirsiniz.
183184
import_projects_mailer:
184185
import:
186+
added_projects:
187+
one: Projelerden bir sonuç içe aktarıldı.
188+
other: "%{count} sonuç projelerden içe aktarıldı."
185189
subject: Projeler başarıyla aktarılmıştır
186190
success: '%{component_name} bileşenindekiprojeler başarıyla aktarılmıştır. Sonuçları yönetim arayüzünde inceleyebilirsiniz.'
187191
last_activity:
@@ -206,6 +210,7 @@ tr:
206210
progress: İlerleme
207211
timeline_entry:
208212
fields:
213+
entry_date: Tarih
209214
title: Başlık
210215
results:
211216
count:

‎decidim-accountability/lib/decidim/accountability/version.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module Decidim
44
# This holds decidim-accountability version.
55
module Accountability
66
def self.version
7-
"0.29.6"
7+
"0.29.7"
88
end
99
end
1010
end

‎decidim-admin/config/locales/ca-IT.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ ca-IT:
327327
error: S'ha produït un error en eliminar aquest component.
328328
success: El component s'ha eliminat correctament.
329329
edit:
330-
title: Edita el component
330+
title: Configura el component
331331
update: Actualitzar
332332
form:
333333
default_step_settings: Configuració per defecte

‎decidim-admin/config/locales/ca.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,7 @@ ca:
327327
error: S'ha produït un error en eliminar aquest component.
328328
success: El component s'ha eliminat correctament.
329329
edit:
330-
title: Edita el component
330+
title: Configura el component
331331
update: Actualitzar
332332
form:
333333
default_step_settings: Configuració per defecte

0 commit comments

Comments
 (0)