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

Improve custom html formatter for diff views #115

Open
wants to merge 74 commits into
base: temp/0.24
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
b2c5d8a
(wip) improve custom html formatter for diff views
microstudi May 12, 2021
60f8b02
Diff by language
microstudi May 13, 2021
8851e32
fix return
microstudi May 13, 2021
832d91e
ensure html blocks are separated by lines
microstudi May 13, 2021
859b887
break only <p>
microstudi May 14, 2021
b43ff2a
Remove proposals filters cache (#8032) (#8038)
leio10 May 24, 2021
5545dc2
Include resources on maps only when the geocoding got valid coords (#…
leio10 May 24, 2021
822d1f4
Bump gems versions to fix dependendabot alerts (#8041)
leio10 May 24, 2021
b58b78a
New Crowdin updates (#8009)
decidim-bot May 24, 2021
a971270
Fix attachment title migration generating possibly invalid values (#8…
ahukkanen May 24, 2021
30bd6da
New Crowdin updates (#8046)
decidim-bot May 25, 2021
13a0d86
Backport #7999 to 0.24 (#8024)
lahdeero May 25, 2021
659c628
Avoid failing when adding a comment for a consultation question (#8062)
leio10 May 27, 2021
9ceb157
Use symbols for polymorphic route arguments (#8060)
tramuntanal May 27, 2021
f51dd81
refactor diff cell
microstudi May 27, 2021
9805400
lint
microstudi May 28, 2021
df1655b
remove debug
microstudi May 28, 2021
a2a747c
prevent comparison on nil objects
microstudi May 31, 2021
bfe66aa
Fix boolean fields for .reported? and .hidden? which is nil if no rep…
leio10 May 31, 2021
5d4bbf1
Merge branch 'release/0.24-stable' into fix/comparisons
microstudi May 31, 2021
250c92f
Fix redirects broken by Terms and Conditions redirect (#8083)
leio10 May 31, 2021
a3f129b
Use correct newsletter cell for web view (#8081)
leio10 Jun 1, 2021
76ed5c7
Bump bundle version for security reasons (#8084)
leio10 Jun 1, 2021
eceae9e
Prepare 0.24.3 release
leio10 Jun 1, 2021
85691fa
Make surveys matrix tables to scroll when needed (#8086)
leio10 Jun 1, 2021
3593e3f
New Crowdin updates (#8057)
decidim-bot Jun 1, 2021
7bc56a2
Fix question preview when no questions published (#8110)
sauloperez Jun 7, 2021
bccb99f
New Crowdin updates (#8089)
decidim-bot Jun 11, 2021
03643e4
Backport "Add missing templates translations" to 0.24 (#8135)
tramuntanal Jun 15, 2021
2761124
Backport "Add missing translation for authorization_modals" to 0.24 (…
tramuntanal Jun 15, 2021
200bfd2
New Crowdin updates (#8125)
decidim-bot Jun 21, 2021
5ed3691
Fix user report notification reported user name (#8157)
ahukkanen Jun 25, 2021
fb8a58b
Fix proposal map for on release/0.24-stable (#8160)
Quentinchampenois Jun 25, 2021
f0ba413
New Crowdin updates (#8151)
decidim-bot Jun 28, 2021
f441c3b
Backport fix dont save timeout path to session (#8170)
lahdeero Jun 29, 2021
da53697
Backport/timeout conflicting remember me (#8171)
lahdeero Jun 29, 2021
b820897
Backport proposal picker click on span (#8175)
lahdeero Jun 30, 2021
94ad32d
Backport "Fix access to import CSV results in accountability" to 0.24…
tramuntanal Jul 1, 2021
32bf6a5
Backport "Fix admin log blocked user name" to 0.24 (#8176)
ahukkanen Jul 2, 2021
3a92993
New Crowdin updates (#8166)
decidim-bot Jul 13, 2021
4148325
Backport "Fix create questionnaire from template when no template is …
tramuntanal Jul 13, 2021
d2c3f74
Backport "Fix ordering of question matrix_rows in templates" to 0.24 …
tramuntanal Jul 13, 2021
560cec3
New Crowdin updates (#8207)
decidim-bot Jul 19, 2021
35c2560
Backport "Fix status search on projects page" (#8211)
leio10 Jul 19, 2021
5cee819
Backport "Use comments counter cache instead of additional query" to …
ahukkanen Jul 19, 2021
691194e
Backport "Fully copy question's display_conditions from template" to …
tramuntanal Jul 19, 2021
6edf34c
Backport "Fix joining a meetings that the user already follows" to 0.…
ahukkanen Jul 19, 2021
cd350cf
Backport "Fix performance issue in notification settings page" (#8222)
leio10 Jul 20, 2021
67532f0
Fix don't require inactive authorization handlers (#8122) (#8223)
ahukkanen Jul 21, 2021
ceb22d5
Set current_component as commentable when commentable is a participat…
entantoencuanto Jul 21, 2021
ddb3982
Backport part of "Fix broken tests after problematic PRs" (#8232)
leio10 Jul 22, 2021
1b16080
New Crowdin updates (#8216)
decidim-bot Jul 28, 2021
19511d4
Merge branch 'release/0.24-stable' into fix/comparisons
aitorlb Aug 6, 2021
da0cf9c
Fix machine translation fields job enqueued with wrong argument (#118)
aitorlb Aug 8, 2021
27c3c15
New Crowdin updates (#8246)
decidim-bot Sep 1, 2021
0e92059
Backport "Fix Luxembourgish locale" to v0.24 (#8283)
andreslucena Sep 6, 2021
6fad6b3
Fix accountability notifications proposal title (#8240) (#8288)
ahukkanen Sep 6, 2021
8e449a1
New Crowdin updates (#8274)
decidim-bot Sep 6, 2021
087a9f4
Backport "Fix invalid i18n values for diff changeset" to v0.24 (#8306)
ahukkanen Sep 8, 2021
44dd6d6
New Crowdin updates (#8301)
decidim-bot Sep 21, 2021
a610ad4
New Crowdin updates (#8348)
decidim-bot Sep 27, 2021
999ce75
New Crowdin updates (#8356)
decidim-bot Oct 4, 2021
95b5ca1
New Crowdin updates (#8375)
decidim-bot Oct 13, 2021
1e170a3
New Crowdin updates (#8404)
decidim-bot Oct 18, 2021
bd81f74
New Crowdin updates (#8419)
decidim-bot Oct 25, 2021
91f9643
New Crowdin updates (#8434)
decidim-bot Nov 2, 2021
79fb3bf
New Crowdin updates (#8460)
decidim-bot Nov 16, 2021
44fb937
New Crowdin updates (#8526)
decidim-bot Nov 23, 2021
c058a9d
New Crowdin updates (#8571)
decidim-bot Dec 14, 2021
b8432eb
New Crowdin updates (#8615)
decidim-bot Dec 21, 2021
1c93317
New Crowdin updates (#8637)
decidim-bot Dec 23, 2021
3b7f165
Merge remote-tracking branch 'upstream/release/0.24-stable' into fix/…
microstudi Mar 17, 2022
83b4a96
fix machintranslation detecionts on amendments
microstudi Mar 17, 2022
5312bb9
do not apply diff for machine translations against official translations
microstudi Mar 21, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .decidim-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.24.2
0.24.3
31 changes: 31 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,36 @@
# Change Log

## [v0.24.3](https://github.com/decidim/decidim/releases/tag/v0.24.3)

### Added

Nothing.

### Changed

Nothing.

### Fixed

- **decidim-participatory processes**: Fix attachment title migration generating possibly invalid values [\#8044](https://github.com/decidim/decidim/pull/8044)
- **decidim-comments**, **decidim-consultations**: Fix for commenting in consultation questions [\#8062](https://github.com/decidim/decidim/pull/8062)
- **decidim-core**: Fix boolean fields for .reported? and .hidden? which is nil if no report exists [\#8082](https://github.com/decidim/decidim/pull/8082)
- **decidim-core**: Fix redirects broken by Terms and Conditions redirect [\#8083](https://github.com/decidim/decidim/pull/8083)
- **decidim-core**: Use correct newsletter cell for web view [\#8081](https://github.com/decidim/decidim/pull/8081)
- **decidim-core**, **decidim-proposals**: Remove proposals filters cache [\#8038](https://github.com/decidim/decidim/pull/8038)
- **decidim-core**, **decidim-meetings**: Include resources on maps only when the geocoding got valid coords [\#8039](https://github.com/decidim/decidim/pull/8039)
- **decidim-core**: Fix editor when formatting starts with a linebreak [\#8024](https://github.com/decidim/decidim/pull/8024)
- **decidim-admin**: Use symbols for polymorphic route arguments [\#8060](https://github.com/decidim/decidim/pull/8060)

### Removed

Nothing.

### Developer improvements

- Bump gems versions to fix dependendabot alerts [\#8041](https://github.com/decidim/decidim/pull/8041)
- Bump bundle version for security reasons [\#8084](https://github.com/decidim/decidim/pull/8084)

## [v0.24.2](https://github.com/decidim/decidim/releases/tag/v0.24.2)

### Added
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.design
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN curl -sL https://deb.nodesource.com/setup_10.x | bash - \

RUN npm install -g [email protected]

RUN gem install bundler --version '>= 2.1.4'
RUN gem install bundler --version '>= 2.2.18'

WORKDIR /code
COPY . .
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ gem "decidim-templates", path: "."

gem "bootsnap", "~> 1.4"

gem "puma", ">= 5.0.0"
gem "puma", ">= 5.3.1"
gem "uglifier", "~> 4.1"

gem "faker", "~> 2.14"
Expand Down
Loading