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

Bump Version from 2.1.2 to 2.1.3, switch to woofmark plots2 branch #557

Merged
merged 14 commits into from
Aug 14, 2020

Conversation

NitinBhasneria
Copy link
Collaborator

@NitinBhasneria NitinBhasneria commented Jul 11, 2020

Fixes

  1. Repoint woofmark to pull in fixes from latest https://github.com/jywarren/woofmark/
  2. Popup Disappearing problem solved by @NitinBhasneria Popup Disappearing problem solved jywarren/woofmark#3
  3. Feature to change heading back into plain text by @shreyaa-sharmaa Feature to change heading back into plain text jywarren/woofmark#5
  4. Refine drag and drop events to prevent interference by @NitinBhasneria Refine drag and drop events to prevent interference with other drag/drop-sensitive fields in downstream use cases jywarren/woofmark#2
  5. Setup jest-puppeteer for UI tests by @Shulammite-Aso setup jest-puppeteer for UI test jywarren/woofmark#11
  6. Added custom insert module by @keshav234156 Added Custom Insert Module #568
  7. Made history icons consistent in demo editor fixes by @Shulammite-Aso Make history icons consistent in demo editor #571
  8. Main image box padding and background by @NitinBhasneria Main image box padding and background #564
  9. ADDS: Feature to decenter text in wysiwyg and markdown mode by @Shreyaa-s ADDS: Feature to decenter text in wysiwyg and markdown mode #521
  10. Remove file button test added by @NitinBhasneria Added remove file test #574
  11. Adds puppeteer as a dev dependency by @Shreyaa-s Adds puppeteer as a dev dependency #565
  12. Add support for class attribute in links by @Shulammite-Aso Add support for class attribute in links #547
  13. Update dependencies in plots2 branch by @Shulammite-Aso Update dependencies in plots2 branch jywarren/woofmark#17
  14. fix bold texts loosing formatting after converting to markdown and back to wysiwyg by @Shulammite-Aso fix bold texts loosing formatting after converting to markdown and back to wysiwyg jywarren/woofmark#15
  15. Compact Design for main Image Module by @shreyaa-sharmaa Compact Design for main Image Module #594

After publiclab/plots2#8285 merges, we can publish this!

@NitinBhasneria NitinBhasneria mentioned this pull request Jul 11, 2020
5 tasks
@jywarren
Copy link
Member

Hi @NitinBhasneria do you think we could try resolving #553 and #475 to try to make reviewing these releases easier, before publishing this one?

@NitinBhasneria
Copy link
Collaborator Author

Hi @NitinBhasneria do you think we could try resolving #553 and #475 to try to make reviewing these releases easier, before publishing this one?

Yea, this would be great.

@cypherean cypherean mentioned this pull request Jul 13, 2020
5 tasks
@jywarren
Copy link
Member

Ok! I think our checklist for this is now:

However, I think we can push off the second list item to v2.1.2 if it slows us down. Thanks! Who is taking up the issues in publiclab/plots2#8135? @NitinBhasneria @shreyaa-sharmaa @keshav234156 @Shulammite-Aso

Great work, folks!

@gitpod-io
Copy link

gitpod-io bot commented Jul 14, 2020

@keshav234156
Copy link
Member

@jywarren can we also add #519 in this release?

@jywarren
Copy link
Member

@keshav234156 i think so; but let's make the top priority fixing the bugs introduced in v2.1.0 -- thank you!

@jywarren
Copy link
Member

#519 is now merged into main! So, let's add it to the release notes above. Thanks!

@jywarren
Copy link
Member

Let's include #521 !

@jywarren
Copy link
Member

#564 is also merged now!

@jywarren
Copy link
Member

Hi @publiclab/editor folks! How are we doing here? We need to prioritize this in order to publish our first release, and won't that feel great!?

Can you check in on the blocking issues related to my comment above? Thank you so much!

cc @sagarpreet-chadha

@keshav234156
Copy link
Member

ok @jywarren having a look at this.

@jywarren jywarren changed the title Bump Version from 2.1.0 to 2.1.1 Bump Version from 2.1.0 to 2.1.1, switch to woofmark plots2 branch Aug 11, 2020
@jywarren
Copy link
Member

Hi @NitinBhasneria - so after merging #587 I merged #588 which bumped the NPM version. Let's change this one to v2.1.2 as it contains the switch over to the plots2 woofmark branch. Then let's release this ASAP. Thanks a ton!

@jywarren jywarren changed the title Bump Version from 2.1.0 to 2.1.1, switch to woofmark plots2 branch Bump Version from 2.1.1 to 2.1.2, switch to woofmark plots2 branch Aug 11, 2020
package.json Outdated
@@ -1,6 +1,6 @@
{
"name": "publiclab-editor",
"version": "2.1.1",
"version": "2.1.2",
Copy link
Member

@jywarren jywarren Aug 11, 2020

Choose a reason for hiding this comment

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

OK! And once this merges, can you create a new Release with the release notes here? I think we need to add a few more updates from https://github.com/publiclab/PublicLab.Editor/pulse/monthly as well to summarize other changes from folks. @publiclab/editor who else has had changes merged? Can we include #568 @keshav234156 ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

yes, we can include the #568.
Also, I have updated the list have a look.

@sagarpreet-chadha
Copy link
Contributor

Very exciting 🎉
cc @NitinBhasneria @keshav234156 @shreyaa-sharmaa @Shulammite-Aso , make sure you add your changes here so Nitin can make the release note 💯

Copy link
Contributor

@sagarpreet-chadha sagarpreet-chadha left a comment

Choose a reason for hiding this comment

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

@NitinBhasneria can you run npm install by checking into this branch? There should be changes in package-lock.json also I believe.

@NitinBhasneria
Copy link
Collaborator Author

@NitinBhasneria can you run npm install by checking into this branch? There should be changes in package-lock.json also I believe.

yea, sure.

@cypherean
Copy link
Contributor

Looks good!! 🎉 🎉

@@ -13298,10 +13301,11 @@
"dev": true
},
"woofmark": {
"version": "git://github.com/jywarren/woofmark.git#12e2c1d4559268e2de605ad6084d5dce24ea42c6",
"version": "git://github.com/jywarren/woofmark.git#39237b798308e6855acde1a938c18a8e4da62fce",
Copy link
Contributor

Choose a reason for hiding this comment

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

Only this should had changed, everything else should be same.

Copy link
Contributor

Choose a reason for hiding this comment

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

@jywarren jywarren changed the title Bump Version from 2.1.1 to 2.1.2, switch to woofmark plots2 branch Bump Version from 2.1.2 to 2.1.3, switch to woofmark plots2 branch Aug 11, 2020
@jywarren
Copy link
Member

Hi all, thanks! Looks like tests failed, could it be due to the woofmark changes?

@jywarren
Copy link
Member

Huh. The error is: https://travis-ci.com/github/publiclab/PublicLab.Editor/jobs/370789599#L211

I'll restart it but is there any possibility of an issue in woofmark?

npm ERR! Unexpected string in JSON at position 516656

@jywarren
Copy link
Member

And noting we had forgotten to build dist files in v2.1.1 so we had to release v2.1.2 here: publiclab/plots2#8286

So this now becomes v2.1.3 -- thanks!!!

@Shulammite-Aso
Copy link
Collaborator

Hi all, i think these should be added here too:
fix bold&emphasized texts loosing formatting after converting to markdown and back to wysiwyg jywarren/woofmark#15
Update dependencies in plots2 branch jywarren/woofmark#17
Add support for class attribute in links #547

@jywarren
Copy link
Member

Resolved a conflict in package-lock.json - can folks confirm that this is correct by testing it in GitPod? Thanks!

@jywarren
Copy link
Member

Ah, let's resolve this critical main image upload bug first, then this should be good for final approval and publication! #593

@jywarren
Copy link
Member

As well as this formatting issue to try to get the main image module a little more compact - that would be really awesome! #592 -- any volunteers?

@jywarren
Copy link
Member

Having tested #593 in gitpod, it seems to work there. Can anyone else confirm this locally, installed on plots2? I think that may mean we are OK to move forward with this release, although I'd love it if someone stepped up to do a little refining in #592 first. Thank you!

@jywarren
Copy link
Member

Thanks @shreyaa-sharmaa for submitting this PR for the button styling!!! #594 Awesome, almost there!!

@jywarren
Copy link
Member

Hi all! With Compact Design for main Image Module #594 by @shreyaa-sharmaa, we are ready to publish this!!!! 🎉 🎉 🎉 🎉

@jywarren
Copy link
Member

I'm going to merge this and publish it! 🎉 🎉 🎉 🎉 🎉

@jywarren jywarren merged commit 06e212d into publiclab:main Aug 14, 2020
@jywarren
Copy link
Member

Technically upon review this would be a minor version number bump of v2.2.0 according to semantic versioning! So, I'm going to bump it up one more time to that, then release.

jywarren added a commit that referenced this pull request Aug 14, 2020
@jywarren
Copy link
Member

And running plots2 tests here! publiclab/plots2#8297

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants