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

Jump to bottom

fix: staging rebase from master #137

Closed
wants to merge 19 commits into from
Closed

fix: staging rebase from master #137

wants to merge 19 commits into from

Conversation

yamilmedina
Copy link
Collaborator

What's new in this PR?

Rebased from master to staging. to update branch

PR Post Submission Checklist for internal contributors (Optional)

  • Wire's Github Workflow has automatically linked the PR to a JIRA issue

PR Post Merge Checklist for internal contributors

  • If any soft of configuration variable was introduced by this PR, it has been added to the relevant documents and the CI jobs have been updated.
References
  1. https://sparkbox.com/foundry/semantic_commit_messages
  2. https://github.com/wireapp/.github#usage
  3. E.g. feat(conversation-list): Sort conversations by most emojis in the title #SQPIT-764.

dkovacevic and others added 18 commits February 11, 2021 14:08
@dkovacevic
Merge pull request #35 from wireapp/staging
0beb877 
Release
@dkovacevic
Merge pull request #36 from wireapp/staging
9b55a8f 
Release
@dkovacevic
Release (#38)
2e72147 
* Lithium 3.0.4

* Check for entity

* Catch ProcessingException when posting IncomingMessage back to conv
@dkovacevic
merge
d191a65
@dkovacevic
Merge pull request #41 from wireapp/staging
e1ef393 
Add calling
@dkovacevic
Merge pull request #46 from wireapp/staging
ca98ae2 
Release
@dkovacevic
Merge pull request #53 from wireapp/staging
efb3fca 
Release
@dkovacevic
Merge pull request #72 from wireapp/staging
b2a1a3e 
Release
@dkovacevic
Merge pull request #82 from wireapp/staging
f6f81c7 
Release 1.15.0
@dkovacevic
Merge pull request #87 from wireapp/staging
dac676f 
Release
@LukasForst
Merge pull request #89 from wireapp/staging
cbc3d7d 
Release 1.18.0
@dkovacevic
Merge pull request #95 from wireapp/staging
d9bf46e 
Release
@LukasForst
Merge pull request #97 from wireapp/staging
2120df7 
1.18.2
@LukasForst
Merge pull request #99 from wireapp/staging
ca1c5fb 
Release 1.18.3
@dkovacevic
Merge pull request #101 from wireapp/staging
665330a 
Jetty Websocket update for Dropwizard (#100)
@dkovacevic
Merge pull request #115 from wireapp/staging
52ad420 
Release
@dkovacevic @yamilmedina @dependabot
Release/1.19.0 (#134)
bec3ea6 
* Update README.md

* Sender: images. Preview and AssetData

* Sender: images. Preview and AssetData

* xenon 1.5.2

* minor changes

* lithium 3.5.2

* updated dependancies

* trace more

* trace more

* Lithium 3.5.4

* Lithium 3.6.0

* fix: migrate jakarta deps to comply with lithium 3.6.x (pt1) (#119)

* Lithium 3.6.0

* WebsocketBundle

* chore: cleanup depedencies

* chore: cleanup depedencies to jakarta

* chore: fixing tests

* chore: fixing tests

* chore: comments - [skip-ci]

* feat: fixing tests and dependencies

* feat: fixing tests and dependencies

* chore: fixing ws config to jakarta

* chore: removing local fix docker image platform

---------

Co-authored-by: Dejan <[email protected]>

* fix: frontend config with new assetbundle aproach dropwizard4 (#129)

* fix: frontend config with new assetbundle aproach dropwizard4

* fix: frontend config with new assetbundle aproach dropwizard4

* check for empty payload.url (#130)

* check for empty payload.url

* more logging

* more logging

* Skip the enable service

* More logging

* Dont send Enable=false in UpdateService

* Use single WebTarge in ProviderClient

* .accept(MediaType.TEXT_PLAIN)

* .accept(MediaType.TEXT_PLAIN)

* .request(MediaType.TEXT_PLAIN)

* .request(MediaType.TEXT_PLAIN)

* fixed the build

* Bump word-wrap from 1.2.3 to 1.2.5 in /frontend (#123)

Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.5.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](jonschlinkert/word-wrap@1.2.3...1.2.5)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @adobe/css-tools from 4.2.0 to 4.3.2 in /frontend (#122)

Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.2.0 to 4.3.2.
- [Changelog](https://github.com/adobe/css-tools/blob/main/History.md)
- [Commits](https://github.com/adobe/css-tools/commits)

---
updated-dependencies:
- dependency-name: "@adobe/css-tools"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump browserify-sign from 4.2.1 to 4.2.2 in /frontend (#125)

Bumps [browserify-sign](https://github.com/crypto-browserify/browserify-sign) from 4.2.1 to 4.2.2.
- [Changelog](https://github.com/browserify/browserify-sign/blob/main/CHANGELOG.md)
- [Commits](browserify/browserify-sign@v4.2.1...v4.2.2)

---
updated-dependencies:
- dependency-name: browserify-sign
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump semver from 5.7.1 to 5.7.2 in /frontend (#124)

Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
- [Commits](npm/node-semver@v5.7.1...v5.7.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @babel/traverse from 7.21.2 to 7.23.5 in /frontend (#126)

Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.21.2 to 7.23.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.5/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump tough-cookie from 4.1.2 to 4.1.3 in /frontend (#128)

Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/salesforce/tough-cookie/releases)
- [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md)
- [Commits](salesforce/tough-cookie@v4.1.2...v4.1.3)

---
updated-dependencies:
- dependency-name: tough-cookie
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore: cancel concurrent builds to avoid multiple runs and only run last (#132)

* chore: cancel concurrent builds to avoid multiple runs and only run last

* Empty-Commit test

* chore: configure new swagger version for roman in dropwizard4 (WPB-5816) (#133)

* chore: configure new swagger version for roman

* chore: configure new swagger version for roman

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Yamil Medina <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@yamilmedina
Merge branch 'master' into fix/staging
73751f1
@CLAassistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
2 out of 3 committers have signed the CLA.

✅ dkovacevic
✅ yamilmedina
❌ LukasForst
You have signed the CLA already but the status is still pending? Let us recheck it.

@yamilmedina yamilmedina self-assigned this Dec 11, 2023
@yamilmedina yamilmedina deleted the fix/staging branch December 11, 2023 14:08
@yamilmedina yamilmedina restored the fix/staging branch December 11, 2023 14:20
@yamilmedina yamilmedina deleted the fix/staging branch December 11, 2023 15:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dkovacevic dkovacevic Awaiting requested review from dkovacevic

Assignees

@yamilmedina yamilmedina

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@yamilmedina @CLAassistant @dkovacevic @LukasForst