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.

Sign up for GitHub

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
Merged

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

Changes from 8 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
55a70a3
Bump Version from 2.1.0 to 2.1.1
Jul 11, 2020
d4b0586
Merge branch 'main' into bumpVersion2.1.1
jywarren Jul 14, 2020
ce55a6d
Merge branch 'main' into bumpVersion2.1.1
jywarren Jul 14, 2020
ec28a21
Merge branch 'main' into bumpVersion2.1.1
jywarren Jul 21, 2020
f861ad5
Merge branch 'main' into bumpVersion2.1.1
jywarren Jul 21, 2020
b7b1f5b
Merge branch 'main' into bumpVersion2.1.1
jywarren Aug 11, 2020
1330aca
v2.1.2
jywarren Aug 11, 2020
d753ddd
Merge branch 'main' into bumpVersion2.1.1
jywarren Aug 11, 2020
08d9ba7
Update package-lock.json
NitinBhasneria Aug 11, 2020
8f03774
Merge branch 'main' into bumpVersion2.1.1
jywarren Aug 11, 2020
eb716e8
Update package-lock.json
NitinBhasneria Aug 12, 2020
49d0534
v2.1.3
NitinBhasneria Aug 12, 2020
bb4b70c
Merge branch 'main' into bumpVersion2.1.1
jywarren Aug 12, 2020
3a27788
Merge branch 'main' into bumpVersion2.1.1
jywarren Aug 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "publiclab-editor",
"version": "2.1.1",
"version": "2.1.2",
Copy link
Member

@jywarren jywarren Aug 11, 2020 •
edited
Loading

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.

"description": "PublicLab.Editor is a general purpose, JavaScript/Bootstrap UI framework for rich text posting, which provides an author-friendly, minimal, mobile/desktop (fluid) interface for creating blog-like content, designed for PublicLab.org",
"main": "dist/PublicLab.Editor.js",
"scripts": {
Expand Down Expand Up @@ -48,7 +48,7 @@
"moment": "~2.27.0",
"resig-class": "~1.0.0",
"typeahead.js-browserify": "~1.0.7",
"woofmark": "git://github.com/jywarren/woofmark.git#xhrOptionsAltBureaucracy",
"woofmark": "git://github.com/jywarren/woofmark.git#plots2",
"xhr": "~2.5.0"
},
"devDependencies": {
Expand Down