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

Upgrade 0.28 #78

Merged
merged 228 commits into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
228 commits
Select commit Hold shift + click to select a range
a6f5f03
add census type radio buttons
antopalidi Nov 2, 2023
ec6ad16
fix lint
antopalidi Nov 2, 2023
6fd71fa
fix transformLocales
antopalidi Nov 2, 2023
2bf8658
createion elections with cencus permissions
antopalidi Nov 6, 2023
cc24956
add batch queue
antopalidi Nov 8, 2023
c80d217
add verification methods for voting
antopalidi Nov 8, 2023
3c4fa6d
remove whenever, add info to readme
antopalidi Nov 10, 2023
1e682d1
update the vocdoni census after delete authorization
antopalidi Nov 10, 2023
30ad6b9
add internal_census field
antopalidi Nov 10, 2023
b9679de
change readme
antopalidi Nov 10, 2023
d4ad2f9
change views vote
antopalidi Nov 10, 2023
ea90440
add helper method
antopalidi Nov 10, 2023
1000ce0
add modal window, add internal census logic to voting
antopalidi Nov 16, 2023
976b419
add loginModal
antopalidi Nov 16, 2023
429df0f
fix login modal, fix wallet generation
antopalidi Nov 16, 2023
861c6c0
create election without verification_types
antopalidi Nov 17, 2023
ba92b70
create election without voters
antopalidi Nov 17, 2023
0bc546e
fix erb linter
antopalidi Nov 17, 2023
f0594a3
refactoring, add system tests for internsl census
antopalidi Nov 17, 2023
56430b3
change titles in census form
antopalidi Nov 20, 2023
7a9c326
fix preview, fix tests
antopalidi Nov 20, 2023
a3d5ffb
fix missink keys
antopalidi Nov 20, 2023
d45f0d1
fix use doublequote quotes
antopalidi Nov 20, 2023
6e0bbe3
add spec for job
antopalidi Nov 21, 2023
ebbd5dd
fic create internal command, add tests
antopalidi Nov 21, 2023
d5659c0
add spec for cell
antopalidi Nov 21, 2023
bac6ed3
add spec for form
antopalidi Nov 21, 2023
9048e4b
add spec for controller
antopalidi Nov 21, 2023
b854fe4
add spec for AuthorizationsData model
antopalidi Nov 22, 2023
e710d27
add spec for AuthorizationExtensions
antopalidi Nov 22, 2023
0f80604
add system test for vote online
antopalidi Nov 22, 2023
81ebfb6
fix lint
antopalidi Nov 22, 2023
ede33a4
add spec for voter model
antopalidi Nov 22, 2023
bdadfd6
remove the unnecessary method
antopalidi Nov 22, 2023
6022720
fix new-vote.js
antopalidi Nov 22, 2023
77847da
fix CensusPermissionsForm
antopalidi Nov 23, 2023
ec9df9e
update ruby
microstudi Nov 23, 2023
ed05175
Merge branch 'feature/internal-census-system' of github.com:decidim-v…
microstudi Nov 23, 2023
8a48472
add wrapper for node
microstudi Nov 23, 2023
203e6df
Use a Sdk service for running sdk actions
microstudi Nov 24, 2023
6229a10
clean js
microstudi Nov 24, 2023
a40ff0d
add election to sdk runner
microstudi Nov 25, 2023
acafb2f
fix create wallet test
microstudi Nov 27, 2023
306239a
update create census test
microstudi Nov 27, 2023
a864142
create an election from the backend
microstudi Nov 27, 2023
1084f30
Create the election using node
microstudi Nov 28, 2023
f9fd111
normalize locales
microstudi Nov 28, 2023
ff938dc
fix wizard test
microstudi Nov 28, 2023
3f27ed9
make tests deterministic
microstudi Nov 28, 2023
ff06503
fix factories
microstudi Nov 28, 2023
daac4ad
start elections
microstudi Nov 29, 2023
b531d4d
use values for results
microstudi Nov 30, 2023
7babfff
remove unused test
microstudi Nov 30, 2023
17c4d6c
fix erb file
microstudi Nov 30, 2023
3458a71
fix unit tests
microstudi Nov 30, 2023
ebbf0d3
fix syntac error
microstudi Nov 30, 2023
7d3f7f0
fix more tests
microstudi Nov 30, 2023
cd9f814
fix tests
microstudi Nov 30, 2023
74a440e
fix tests
microstudi Nov 30, 2023
b62d0e9
fix tests
microstudi Nov 30, 2023
e797c4d
fix wrong method for translated
microstudi Nov 30, 2023
3830ae0
avoid external library
microstudi Nov 30, 2023
45c2c3f
better management of the case auto_start
microstudi Nov 30, 2023
baab264
fix test
microstudi Nov 30, 2023
b43c928
debug sdk
microstudi Nov 30, 2023
80e0777
prevent comunitaction with api
microstudi Nov 30, 2023
74759f4
add the test log to artifacts
microstudi Dec 1, 2023
752c768
use expect to wait for ajax
microstudi Dec 1, 2023
20cad49
handle & update results
microstudi Dec 1, 2023
d819935
message acording election start mode
microstudi Dec 1, 2023
65c331c
linting
microstudi Dec 1, 2023
ef6b18c
Merge node-wrapper branch
microstudi Dec 1, 2023
7442b2b
Merge branch 'node-backend' into feature/internal-census-system
microstudi Dec 1, 2023
719da20
remove js
microstudi Dec 1, 2023
d59d58c
Resolved merge conflicts
antopalidi Jan 16, 2024
02e3bce
fix npm lint
antopalidi Jan 16, 2024
9d6010b
fix rubocop
antopalidi Jan 16, 2024
db706c3
fix census controller
antopalidi Jan 16, 2024
ada6f9f
fix test
antopalidi Jan 16, 2024
3f0661e
change census view
antopalidi Jan 17, 2024
f523ee1
change voter_verified?
antopalidi Jan 19, 2024
26e5684
change voter_verified?
antopalidi Jan 19, 2024
80983e6
fix voter_verified? for empty required_authorizations
antopalidi Jan 19, 2024
46c5b86
update sdk
antopalidi Jan 22, 2024
e4f7ef1
Refactor deterministicWallet method to align with JS implementation a…
antopalidi Jan 22, 2024
c564a15
fix tests
antopalidi Jan 22, 2024
bf19f10
fix test
antopalidi Jan 22, 2024
a7ec191
fix updating of voting statistics
antopalidi Jan 22, 2024
79144a3
change logic: creating technical_voter when no one is authorized for …
antopalidi Jan 24, 2024
809fa48
fix test
antopalidi Jan 24, 2024
3f1d132
Update README.md
antopalidi Jan 24, 2024
69679d3
Update README.md
antopalidi Jan 24, 2024
d2a95e7
fix translata of authorizations handler_name
antopalidi Jan 24, 2024
ebe92aa
Save the census wallet for later use. Allow to send updated census
microstudi Jan 25, 2024
ae663d2
test script for census change
microstudi Jan 26, 2024
6112dee
fix test using mjs for node wrapper
microstudi Jan 26, 2024
2f62529
fix script
microstudi Jan 29, 2024
843525b
script working
microstudi Jan 29, 2024
7d164f6
update census job, add information on the need to update the census
antopalidi Jan 31, 2024
efd5baf
add census traking
antopalidi Jan 31, 2024
45b72d6
fix non_voters method, fix job
antopalidi Feb 1, 2024
85401d0
fix job
antopalidi Feb 1, 2024
65b3919
refactor the job, add new services
antopalidi Feb 2, 2024
5fd168b
fix rubocop, locale
antopalidi Feb 2, 2024
cad7d0c
npm update, fix BigInt
antopalidi Feb 2, 2024
a712bb7
fix erblint
antopalidi Feb 2, 2024
506abdb
refactor steps controller, add flash, permissions
antopalidi Feb 2, 2024
f40c99b
change chrome version for test
antopalidi Feb 2, 2024
200ee32
change chrome version for test
antopalidi Feb 2, 2024
d593ff5
change chrome version for test
antopalidi Feb 2, 2024
0387b3b
change chrome version for test
antopalidi Feb 2, 2024
3a072d2
change chromedriver version for test
antopalidi Feb 2, 2024
f2bf4ff
change chromedriver version 121 for test
antopalidi Feb 2, 2024
756587a
change chromedriver version 121 for test
antopalidi Feb 2, 2024
7b50174
fix tests
antopalidi Feb 6, 2024
0c3adc4
add tests
antopalidi Feb 7, 2024
445a77a
fix locale keys
antopalidi Feb 7, 2024
0894184
update chromedriver config
antopalidi Feb 7, 2024
60d1668
add ajax for update census info
antopalidi Feb 12, 2024
ae4378a
Add text to the voting page when the voter is not yet listed in the c…
antopalidi Feb 13, 2024
5677b08
fix translate missing
antopalidi Feb 13, 2024
4483bb7
fix tests
antopalidi Feb 13, 2024
bf1099d
delete test
antopalidi Feb 13, 2024
7afa808
fix erb lint
antopalidi Feb 13, 2024
e2363ad
remove the code
antopalidi Feb 13, 2024
259b9da
fix ajax
antopalidi Feb 13, 2024
ca806b1
add tests
antopalidi Feb 13, 2024
371a443
improve census view
antopalidi Feb 13, 2024
5ec92fc
fix tests
antopalidi Feb 14, 2024
b09ed7e
fix tests
antopalidi Feb 14, 2024
0231b42
change massage in the setup form for internal census
antopalidi Feb 14, 2024
b2228d9
improve the census update view
antopalidi Feb 14, 2024
f1ba731
replace flash message to ajax
antopalidi Feb 16, 2024
0cec7f0
change texts for check census
antopalidi Feb 20, 2024
4e13af9
add helpers
antopalidi Feb 20, 2024
2f59ce3
add helper methods
antopalidi Feb 20, 2024
f065381
remove code
antopalidi Feb 20, 2024
4a2d44d
remove code
antopalidi Feb 20, 2024
daf31d9
remove migration, remove AuthorizationsData
antopalidi Feb 21, 2024
8f6d7e1
delete override
antopalidi Feb 21, 2024
b07b0d8
destroy tech voter after census update
antopalidi Feb 21, 2024
6061113
fix test
antopalidi Feb 21, 2024
0461273
fix ajax: update census
antopalidi Feb 21, 2024
14142e2
fix erb linter
antopalidi Feb 21, 2024
3e73ef4
ensure user is redirected to where the action started
microstudi Feb 21, 2024
3d1f550
change the users context for the internal census form
antopalidi Feb 21, 2024
25ed50d
refactoring VotesController
antopalidi Feb 21, 2024
d407c70
Merge remote-tracking branch 'origin/feature/internal-census-system' …
antopalidi Feb 21, 2024
6df8f90
change text for update census result
antopalidi Feb 21, 2024
90f621b
remove cron task
antopalidi Feb 21, 2024
aeef909
Update README.md
antopalidi Feb 21, 2024
69e56d8
add DECIDIM_COMPAT_VERSION
antopalidi Feb 21, 2024
b6c3a91
update gemspec
antopalidi Feb 21, 2024
2565697
refactoring: dynamic_census attribute is not used
antopalidi Feb 21, 2024
bdcc00a
add custom version number, add info to readme
antopalidi Feb 22, 2024
8b9ff71
bundle
antopalidi Feb 22, 2024
6f08b60
add credit renewal flow, add tests
antopalidi Feb 23, 2024
7a19603
add comments
antopalidi Feb 23, 2024
c74113e
fix erb linter, fix test
antopalidi Feb 23, 2024
e65239b
add test
antopalidi Feb 23, 2024
80dca74
initial upgrade
antopalidi Feb 27, 2024
7df6eca
fix icons: elections index page
antopalidi Feb 27, 2024
57fbe63
register new icons, change buttons, titles
antopalidi Feb 27, 2024
08bbc21
redesign the setup election page
antopalidi Feb 27, 2024
6c662bd
tabs, tables
antopalidi Feb 28, 2024
b6bf8b7
change styles for elections, questions, answers
antopalidi Feb 29, 2024
16b6246
shange census page
antopalidi Feb 29, 2024
fe3e09d
change calendar page
antopalidi Feb 29, 2024
c27c692
change publish page, forms
antopalidi Feb 29, 2024
7fb5162
fix buttons for steps
antopalidi Apr 17, 2024
e3527f0
change cells, elections index public page (processing)
antopalidi Apr 19, 2024
2de510f
merge main, resolve conflicts
antopalidi Apr 22, 2024
327c8aa
MOMerge remote-tracking branch 'origin/main' into upgrade-0.28
antopalidi Apr 22, 2024
9a14094
chanfe show election page
antopalidi Apr 23, 2024
543f04e
change election show page - questions
antopalidi Apr 24, 2024
6cf81f1
change election results
antopalidi Apr 24, 2024
e4cb944
fix babel error: remove webpacker override from Rakefile
antopalidi Apr 24, 2024
7f5c634
cp babel.config.json
antopalidi Apr 24, 2024
9fe14d9
change census-authorization-modal
antopalidi Apr 25, 2024
43c6ec6
change check census, new question
antopalidi Apr 25, 2024
bd31358
change elections -> new vote
antopalidi May 1, 2024
acc3f18
change Real-time voting results
antopalidi May 1, 2024
234d5ea
change preview
antopalidi May 2, 2024
b0b0ffb
change results table
antopalidi May 2, 2024
b5138f8
change vote statistics
antopalidi May 2, 2024
3701204
change published results
antopalidi May 2, 2024
86fb69e
fix rubocop
antopalidi May 2, 2024
babd9bc
fix erblint
antopalidi May 2, 2024
0ee21ff
fix some tests
antopalidi May 6, 2024
4062943
fix admin tests
antopalidi May 6, 2024
3613104
fix cells, tests
antopalidi May 6, 2024
e45b4c0
fix rubocop
antopalidi May 6, 2024
7d0f9a5
upgrade vocdoni version to 0.8
antopalidi May 13, 2024
ba423f3
fix serching, fix filtering
antopalidi May 13, 2024
90789ba
fis tabs styles
antopalidi May 13, 2024
cbe3e10
Merge main into upgrade-0.28
antopalidi May 13, 2024
80144b0
update lock file
antopalidi May 13, 2024
d66a51a
update lock file
antopalidi May 13, 2024
703ade8
Add Linux platform to Gemfile.lock
antopalidi May 13, 2024
91b727c
fix rubocop
antopalidi May 13, 2024
f40af22
fix results online spec
antopalidi May 13, 2024
2af01e9
fix append_stylesheet_pack_tag
antopalidi May 15, 2024
e9d9243
fix selected answers
antopalidi May 15, 2024
7be06ca
add ContentSecurityPolicy
antopalidi May 15, 2024
ccf2351
fix tests
antopalidi May 15, 2024
f2c4939
fix versions
microstudi May 16, 2024
6578ef6
fix vote without a user
antopalidi May 16, 2024
d6448af
fix bullet errors
antopalidi May 16, 2024
221fef2
fix rubocop
antopalidi May 16, 2024
49a0839
fix i18n
antopalidi May 16, 2024
df1d996
fix test
antopalidi May 16, 2024
579ed5f
fix wallet inpet
antopalidi May 16, 2024
0c766b8
fix time format in the test
antopalidi May 17, 2024
1b38595
fix button text
antopalidi May 17, 2024
4e6d134
fix test
antopalidi May 17, 2024
190118d
fix accordion
antopalidi May 17, 2024
8d58ceb
fix npm lint
antopalidi May 17, 2024
712f1d7
fix erb lint
antopalidi May 17, 2024
1e59408
Update README.md
antopalidi May 22, 2024
f95d56a
Update package.json
antopalidi May 22, 2024
d444cf0
styles for election aside
antopalidi May 22, 2024
1cc6f5d
i18n-tasks
antopalidi May 22, 2024
d4cb044
remove extra code
antopalidi May 22, 2024
0299817
fix tests
antopalidi May 22, 2024
f987b05
remove empty link
antopalidi May 22, 2024
98abc43
add comment to Rakefile
antopalidi May 22, 2024
fb5913f
fix rubocop
antopalidi May 22, 2024
1f5963b
add null: false to migration
antopalidi May 22, 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
6 changes: 3 additions & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ on:
pull_request:

env:
RUBY_VERSION: 3.0.6
NODE_VERSION: 16.9.1
RUBY_VERSION: 3.1.1
NODE_VERSION: 18.17.1

jobs:
lint-report:
Expand Down Expand Up @@ -49,4 +49,4 @@ jobs:
name: Lint Ruby files

- run: bundle exec erblint app/**/*.erb
name: Lint ERB files
name: Lint ERB files
4 changes: 2 additions & 2 deletions .github/workflows/test-rails.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ on:

env:
CI: "true"
RUBY_VERSION: 3.0.6
NODE_VERSION: 16.9.1
RUBY_VERSION: 3.1.1
NODE_VERSION: 18.17.1
CODECOV_TOKEN: 3dc89116-a8ed-4df4-bf06-812fc0d8854d

jobs:
Expand Down
3 changes: 1 addition & 2 deletions .rubocop_ruby.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ AllCops:
# If a value is specified for TargetRubyVersion then it is used.
# Else if .ruby-version exists and it contains an MRI version it is used.
# Otherwise we fallback to the oldest officially supported Ruby version (2.0).
TargetRubyVersion: 3.0
TargetRubyVersion: 3.1

# RSpec:
# Patterns:
Expand Down Expand Up @@ -1762,4 +1762,3 @@ Faker/DeprecatedArguments:
questions:
- number
- supplemental

2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.6
3.1.1
19 changes: 14 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,32 @@ source "https://rubygems.org"

ruby RUBY_VERSION

DECIDIM_VERSION = "0.27.6"
# Inside the development app, the relative require has to be one level up, as
# the Gemfile is copied to the development_app folder (almost) as is.
base_path = ""
base_path = "../" if File.basename(__dir__) == "development_app"
require_relative "#{base_path}lib/decidim/vocdoni/version"

DECIDIM_VERSION = Decidim::Vocdoni::DECIDIM_VERSION

gem "decidim", DECIDIM_VERSION
gem "decidim-vocdoni", path: "."

gem "bootsnap", "~> 1.7"
gem "faker", "~> 2.14"
gem "puma", "~> 5.6.2"
gem "faker", "~> 3.2"
gem "puma", "~> 6.3.1"

group :development, :test do
gem "byebug", "~> 11.0", platform: :mri

# se if we can skip this version lock in the future, related to this
# https://github.com/decidim/decidim/pull/12629
gem "bullet", "~> 7.0", "< 7.1.0"
gem "decidim-dev", DECIDIM_VERSION
end

group :development do
gem "i18n-tasks", "~> 0.9.37"
gem "i18n-tasks", "~> 1.0"
gem "letter_opener_web", "~> 2.0"
gem "listen", "~> 3.1"
gem "rubocop-faker", "~> 1.1"
Expand All @@ -30,5 +39,5 @@ group :development do
end

group :test do
gem "codecov", "~> 0.6.0", require: false
gem "codecov", require: false
end
Loading
Loading