Skip to content

Redesign: collaborative drafts#10729

Merged
ferblape merged 74 commits intofeature/redesignfrom
feature/redesign-collaborative-drafts
Jun 7, 2023
Merged

Redesign: collaborative drafts#10729
ferblape merged 74 commits intofeature/redesignfrom
feature/redesign-collaborative-drafts

Conversation

@Crashillo
Copy link
Copy Markdown
Contributor

@Crashillo Crashillo commented Apr 18, 2023

@Crashillo Crashillo added the project: redesign Barcelona City Council contract label Apr 18, 2023
@Crashillo Crashillo marked this pull request as ready for review April 19, 2023 16:02
@Crashillo Crashillo requested review from ferblape and furilo April 19, 2023 16:08
@Crashillo Crashillo linked an issue Apr 20, 2023 that may be closed by this pull request
3 tasks
@Crashillo Crashillo force-pushed the feature/redesign-collaborative-drafts branch from 0518aec to 936061e Compare April 26, 2023 16:15
@ferblape
Copy link
Copy Markdown
Contributor

@Crashillo could you lint the code?

@Crashillo Crashillo force-pushed the feature/redesign-collaborative-drafts branch from 2cf6773 to 936061e Compare April 27, 2023 09:45
@Crashillo
Copy link
Copy Markdown
Contributor Author

I've removed the last commit since the compilation fails.
As we internally agreed, there's an assets dependency between this PR and #10555. In order to make it work the assets compilation, the SCSS linter will fail due to an empty file, but we'll ignore that check meanwhile. Once both PR are properly merged the linter won't fail anymore

@alecslupu
Copy link
Copy Markdown
Contributor

@Crashillo since #10765 is already approved, maybe you could merge that one, so we can remove also other skipped tests ?

Copy link
Copy Markdown
Contributor

@alecslupu alecslupu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#10765 has been merged, let's enable the tests as well.

@alecslupu
Copy link
Copy Markdown
Contributor

@Crashillo before i get another look at this, could you have a look on the proposal spec that is currently failing ?

@entantoencuanto
Copy link
Copy Markdown
Contributor

@Crashillo before i get another look at this, could you have a look on the proposal spec that is currently failing ?

This test for some reason fails on GitHub almost every time, but on local it works fine. I'm looking for an alternative

@entantoencuanto entantoencuanto force-pushed the feature/redesign-collaborative-drafts branch from f8b05d5 to fa94bc5 Compare June 6, 2023 10:45
@entantoencuanto
Copy link
Copy Markdown
Contributor

Hi, @alecslupu , I've skipped 2 tests and open an issue to fix it (#10961). I've tried some things but the tests seems to be be resistant in its rebellion :(

Copy link
Copy Markdown
Contributor

@alecslupu alecslupu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One small change to do, and we are good to go.

…afts/_edit_form_fields.html.erb

Co-authored-by: Alexandru Emil Lupu <contact@alecslupu.ro>
Copy link
Copy Markdown
Contributor

@alecslupu alecslupu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for changes. LGTM.

@ferblape ferblape merged commit 64bfa25 into feature/redesign Jun 7, 2023
@ferblape ferblape deleted the feature/redesign-collaborative-drafts branch June 7, 2023 08:33
entantoencuanto added a commit that referenced this pull request Jun 8, 2023
* feature/redesign: (70 commits)
  Fix failing specs
  Redesign sortitions (#10831)
  Redesign: data toggle (#10886)
  Redesign: collaborative drafts (#10729)
  Redesign: pending pages (#10944)
  Redesign: my account (#10904)
  use foundation classes instead of default html validation (#10921)
  Fix failings redesign specs
  Add gitpod support (#10641)
  Fix pipeline after #10409 (#10670)
  Upgrade webpack and other javascript libraries (#10643)
  New Crowdin updates (#10409)
  Refactor attachment title (#10103)
  Fix for exporting hidden moderated proposals (#10630)
  Fix Exception as admin on a Proposal with meeting author (#10628)
  Fix: Deleted and hidden comments are exported (#10629)
  Rename "terms and conditions" to "terms of service" (#10614)
  Upgrade Graphql to 2.0.19 and Graphql-Api to 3.0.1 (#10606)
  Standardize the format of the words "they will" (#10617)
  Fix the spec after word standardization (#10624)
  ...
entantoencuanto added a commit that referenced this pull request Jun 12, 2023
…blies-details-page

* feature/redesign: (71 commits)
  Unskip tests (#10951)
  Fix failing specs
  Redesign sortitions (#10831)
  Redesign: data toggle (#10886)
  Redesign: collaborative drafts (#10729)
  Redesign: pending pages (#10944)
  Redesign: my account (#10904)
  use foundation classes instead of default html validation (#10921)
  Fix failings redesign specs
  Add gitpod support (#10641)
  Fix pipeline after #10409 (#10670)
  Upgrade webpack and other javascript libraries (#10643)
  New Crowdin updates (#10409)
  Refactor attachment title (#10103)
  Fix for exporting hidden moderated proposals (#10630)
  Fix Exception as admin on a Proposal with meeting author (#10628)
  Fix: Deleted and hidden comments are exported (#10629)
  Rename "terms and conditions" to "terms of service" (#10614)
  Upgrade Graphql to 2.0.19 and Graphql-Api to 3.0.1 (#10606)
  Standardize the format of the words "they will" (#10617)
  ...
entantoencuanto added a commit that referenced this pull request Jun 15, 2023
…ations

* feature/redesign: (78 commits)
  Redesign: initiatives (#10646)
  Redesign: surveys (#10922)
  Redesign: coauthors (#10954)
  remove font-bold from breadcrumb (#10990)
  Redesign: participatory texts (#10941)
  Redesign: budgets (#10195)
  Redesign: fix buttons & geocoder (#10975)
  Unskip tests (#10951)
  Fix failing specs
  Redesign sortitions (#10831)
  Redesign: data toggle (#10886)
  Redesign: collaborative drafts (#10729)
  Redesign: pending pages (#10944)
  Redesign: my account (#10904)
  use foundation classes instead of default html validation (#10921)
  Fix failings redesign specs
  Add gitpod support (#10641)
  Fix pipeline after #10409 (#10670)
  Upgrade webpack and other javascript libraries (#10643)
  New Crowdin updates (#10409)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

project: redesign Barcelona City Council contract

Projects

No open projects
Status: Done

Development

Successfully merging this pull request may close these issues.

Redesign / Proposals Collaborative

6 participants