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

Fixes amendments #166

Merged
merged 51 commits into from
Feb 23, 2024
Merged
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
7863fa0
Merge branch 'limit-amendments' into staging
microstudi Feb 7, 2024
f5858ab
update gemfile
microstudi Feb 7, 2024
3b38149
fix translator config
microstudi Feb 8, 2024
b85429d
fix translator config
microstudi Feb 8, 2024
fb7135a
update decidim
microstudi Feb 8, 2024
d440c65
Merge branch 'staging'
microstudi Feb 8, 2024
a757201
update amendments lang on accepting
microstudi Feb 19, 2024
22399ed
update amendments lang on accepting
microstudi Feb 19, 2024
3695ad1
add test for user current locale
microstudi Feb 19, 2024
a3e142c
add test for user current locale
microstudi Feb 19, 2024
ff6c065
block chrome version
microstudi Feb 19, 2024
2663374
block chrome version
microstudi Feb 19, 2024
2a76022
fix browser
microstudi Feb 19, 2024
575ac87
fix browser
microstudi Feb 19, 2024
1171097
fix browser
microstudi Feb 19, 2024
590c789
fix browser
microstudi Feb 19, 2024
1e92830
rename interpolations
microstudi Feb 19, 2024
6e62465
rename interpolations
microstudi Feb 19, 2024
0ba95da
fix locale amendment forcing conf
microstudi Feb 20, 2024
fb6860f
fix locale amendment forcing conf
microstudi Feb 20, 2024
e29f569
fix modal login window
microstudi Feb 20, 2024
c972fa9
fix modal login window
microstudi Feb 20, 2024
cfd7544
use html formatting for deepl
microstudi Feb 20, 2024
9ab4043
use html formatting for deepl
microstudi Feb 20, 2024
c1f1ede
use split view by default in amendments
microstudi Feb 20, 2024
5c84f48
use split view by default in amendments
microstudi Feb 20, 2024
dca7550
dont html escape titles
microstudi Feb 20, 2024
53b929f
dont html escape titles
microstudi Feb 20, 2024
b2699ae
default type in proposal filtering
microstudi Feb 20, 2024
dd84b4d
default type in proposal filtering
microstudi Feb 20, 2024
0be38e5
use around action instead of redirects
microstudi Feb 21, 2024
7168960
use around action instead of redirects
microstudi Feb 21, 2024
d119615
ensure reivew process uses original language too
microstudi Feb 21, 2024
ed3c8a0
ensure reivew process uses original language too
microstudi Feb 21, 2024
adff413
overrride extende menu items
microstudi Feb 21, 2024
d9984a9
overrride extende menu items
microstudi Feb 21, 2024
587b91c
allow official proposals to be amended in any language
microstudi Feb 22, 2024
5e5ea01
allow official proposals to be amended in any language
microstudi Feb 22, 2024
a0919b3
update amendment date
microstudi Feb 22, 2024
f2ee44f
update amendment date
microstudi Feb 22, 2024
419381f
Merge branch 'main' into fixes-amendments
microstudi Feb 22, 2024
2eee3f9
Merge branch 'fixes-amendments' of github.com:Green-Party-of-Canada-M…
microstudi Feb 22, 2024
8d944c3
fix amendments acceptation
microstudi Feb 22, 2024
f2364ed
fix override md5
microstudi Feb 22, 2024
b9ca78b
fix decidim branch
microstudi Feb 22, 2024
1677233
fix decidim branch
microstudi Feb 22, 2024
0cb6605
fix decidim branch
microstudi Feb 22, 2024
c7ee15e
fix test
microstudi Feb 22, 2024
554b764
skip hidden emendations
microstudi Feb 23, 2024
3f6171d
update awesome
microstudi Feb 23, 2024
7d280ed
Merge branch 'main' into fixes-amendments
microstudi Feb 23, 2024
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
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ GIT

GIT
remote: https://github.com/decidim-ice/decidim-module-decidim_awesome.git
revision: c182090ea9b09629b014b9e6625f62201651ffc8
revision: 32164f7853713634b4172bf15389969591e90c18
branch: limit-amendments
specs:
decidim-decidim_awesome (0.10.2)
Expand Down Expand Up @@ -47,7 +47,7 @@ GIT

GIT
remote: https://github.com/openpoke/decidim.git
revision: aee1e1488187f0af8713d6686fac819f9b9d2f33
revision: b69120dcd096bb761aa5ca0ac8ad4798d8c16739
branch: 0.27-canada
specs:
decidim (0.27.5)
Expand Down
Loading