Skip to content

Commit

Permalink
Update voting & ui fixes (#122)
Browse files Browse the repository at this point in the history
* fix modal login window (#75)

* update awesome

* update dockerfile

* update awesome

* latest voteing

* update votes

* update vote design

* update design

* fix cache

* proposal conf fixes

* update design

* customizations
microstudi authored Nov 2, 2023
1 parent ab423fd commit f36f7f6
Showing 26 changed files with 800 additions and 623 deletions.
1 change: 1 addition & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@ on:
push:
branches:
- main
- staging
pull_request:

env:
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@ on:
push:
branches:
- main
- staging
pull_request:

env:
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.6
2.7.7
7 changes: 5 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
FROM ruby:2.7 AS builder

RUN apt-get update && apt-get upgrade -y && apt-get install gnupg2 && \
curl -sL https://deb.nodesource.com/setup_16.x | bash - && \
RUN NODE_MAJOR=16 && \
apt-get update && apt-get upgrade -y && apt-get install -y ca-certificates curl gnupg && \
mkdir -p /etc/apt/keyrings && \
curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg && \
echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list && \
curl -sL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \
apt-get update && apt-get install -y nodejs yarn \
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -10,10 +10,10 @@ DECIDIM_VERSION = { github: "openpoke/decidim", tag: "0.26-canada" }.freeze
gem "decidim", DECIDIM_VERSION
# gem "decidim-consultations", DECIDIM_VERSION
# gem "decidim-initiatives", DECIDIM_VERSION
gem "decidim-calendar", github: "openpoke/decidim-module-calendar"
gem "decidim-calendar", github: "decidim-ice/decidim-module-calendar", tag: "54b486c84f1c65b69b0aab66160c32bafc4fe376"
gem "decidim-civicrm", github: "openpoke/decidim-module-civicrm", branch: "release/0.26-stable"
gem "decidim-conferences", DECIDIM_VERSION
gem "decidim-decidim_awesome", github: "decidim-ice/decidim-module-decidim_awesome"
gem "decidim-decidim_awesome", github: "openpoke/decidim-module-decidim_awesome", branch: "graded_voting/final-fixes"
gem "decidim-direct_verifications"
gem "decidim-templates", DECIDIM_VERSION
gem "decidim-term_customizer", github: "mainio/decidim-module-term_customizer", branch: "release/0.26-stable"
Loading

0 comments on commit f36f7f6

Please sign in to comment.