Skip to content

Commit

Permalink
Upgrade 0.28 (#25)
Browse files Browse the repository at this point in the history
* Triplicate conferences hacking the hashtag (#7)

* add custom menu items

* controller override, add routes

* change add item menu

* Apply suggestions from code review

Co-authored-by: Ivan Vergés <ivan@pokecode.net>

* add options if to add_item

* add rspec, refactoring

* fix lint

* promoted conferences override, add tests

* remove global config from secret, refactoring controller's methods

* change tests

* add controller spec

* fix robocop

* move initializers and overrides to initializers folder

* refactoring model and tests

* Update config/locales/en.yml

Co-authored-by: Ivan Vergés <ivan@pokecode.net>

* fix initializers

* fix initialize

* gitignore

* add actions

* add config

---------

Co-authored-by: Ivan Vergés <ivan@pokecode.net>

* change color pallete in the css (#13)

* remove additional logo (#12)

* Filter conferences by colors (#14)

* Replace hashtags, Remove menu "triplication"

* Replace hashtags

* show buttons for existing conferences

* refactoring

* add original to deface

* cells override

* use a query string

* add tests

* add controller spec

* add spec checksums

* change default links color

* active links

* styles

* add promo video content block (#15)

* add promo video content block

* fix active processes cell

* fix var css

* update newsletter. add translations

* Create a new home content block with partner logos (#16)

* add content block

* add logos

* add logos

---------

Co-authored-by: Ivan Vergés <ivan@pokecode.net>

* add partners to dockerfile

* fix dockerfile

* rebuild 1st partner

* filter order & small fixes

* filter order

* fix promoted conferences (#17)

* fix promoted conferences

* css corrections

* fix specs

* fix logos

* fix apostrophes

* add premsa i programa

* new program

* copy fix

* prevent non conferences to use hashtag hack

* add omniauth decidim

* update mailer styles

* update pwa

* latests fixes

* add missing envs

* Sort conferences (#19)

* sort conferences

* refactoring

* fix order

---------

Co-authored-by: Ivan Vergés <ivan@pokecode.net>

* fix order again

* override image size media

* update agenda

* update newsletter & logos

* fix logos

* Add datetime in conferences cards (#24)

* fix test

* add datetime

* add start_time and start_date method

* fix overrides spec

* add chromedriver-version

* use start and end date

* add date format

* remove start and end time methods

* add system test

* pass rubocop

* add spec system test

* modify system test date fotmat

* modify system test date format

* update newsletter

* update news

* change decidim version

* remove social share button

* update package.json dependencies

* add tailwind.config to .gitignore

* update rubocop.yml

* update migrations code

* add missing mixin

* remove _decidim-settings.scss

* enable Custom HTML Header snippets

* include conference Override

* add Module Paginable to conference controllerOverride

* fix lib and system specs

* fix controller specs

* remove PR#24 changes

* assign main-footer color

* apply styles to active-processes section

* apply styles to newsletter button

* style sub_hero text description

* add styles to sub_hero button

* replace mini-footer with deface

* adjust mini-footer styles

* fix styles loader error

* replace main-footer with deface

* fix styles

* fix test

* add homepage footer spec

* add final newline to spec

* modify chromedriver setup

* add chromedriver-version

* set up chromedriver

* pass rubocop

* update newletter

* modify some content_blocks styles

* fix partner_logos content_blocks styles

* fix conferences filter

* remove participatory space floting help

* fix filter conferences bg class

* setup chromedriver

* bundle gems

* change chromedriver version

* change chromedriver version

* add chrome version to workflow

* fix test

* add cards filter-conferences border-color

* remove few old partners logo

* add locales_languages to mobile menu

* set partner logos size

* fix dockerfile

* fix dockerfile

* fix migrations

* fix migrations

* add awesome preview

* add margn bottom to navbar

* add .rspec-failures to gitignore

* remove cta-buttom override

* fix hero content-block-button

* change color menu

* modify item color menu

* design fixes

* update texts

* fix fonts and cells

* newsletter template

* logos sizes

* standarize footer

* prevent sql files to be commited

* add scripts with cookie conf

* update logo

* fix logos

---------

Co-authored-by: Ivan Vergés <ivan@pokecode.net>
Co-authored-by: Anna Topalidi <60363870+antopalidi@users.noreply.github.com>
  • Loading branch information
3 people committed Mar 6, 2024
1 parent 14d15b1 commit f155e10
Show file tree
Hide file tree
Showing 7,784 changed files with 161,029 additions and 326,437 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
16 changes: 13 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,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:
test:
Expand All @@ -34,7 +34,17 @@ jobs:
- uses: nanasess/setup-chromedriver@v2
with:
chromedriver-version: 119.0.6045.105


- name: List Chrome
run: apt list --installed | grep chrome

- name: Remove Chrome
run: sudo apt remove google-chrome-stable

- uses: browser-actions/setup-chrome@v1
with:
chrome-version: 119.0.6045.105

- uses: ruby/setup-ruby@v1
with:
ruby-version: ${{ env.RUBY_VERSION }}
Expand Down
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@
/public/assets
.byebug_history

.rubocop-*
tailwind.config.js
.rspec-failures

# Ignore master key for decrypting credentials and more.
/config/master.key

Expand All @@ -45,4 +49,4 @@ yarn-debug.log*
public/decidim-packs
public/sw.js*
coverage/*
.rspec-*
*.sql
8 changes: 5 additions & 3 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
inherit_from:
- .rubocop_ruby.yml
- .rubocop_rails.yml
inherit_from:
- https://raw.githubusercontent.com/decidim/decidim/release/0.28-stable/.rubocop.yml

Rails/BulkChangeTable:
Enabled: false
87 changes: 0 additions & 87 deletions .rubocop_rails.yml

This file was deleted.

Loading

0 comments on commit f155e10

Please sign in to comment.