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

Resolve merge conflicts / Fix CI builds #1472

Merged
merged 32 commits into from
Jan 29, 2021
Merged

Resolve merge conflicts / Fix CI builds #1472

merged 32 commits into from
Jan 29, 2021

Conversation

Confectrician
Copy link
Contributor

@ghys may you have a short look?

This should sync the branches again and resolve the existing merge conflicts.

Confectrician and others added 30 commits January 10, 2021 13:50
@Confectrician
Apply bulk automated corrections. 🔧(openhab#1433)
d509fe5 
Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
@Confectrician
Added sidebar links. (openhab#1434)
41a3efd 
* Added sidebar links.
* Introduce openhabian placeholder page.
* Remove local version of openhabian doc page.

Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
@Confectrician
Fix linter errors 🔧(openhab#1435)
e737d71 
* Fix errros for the addon folder.
* Fix errros for the administration folder.
* Fix errros for the concepts folder.
* Fix errros for the configuration folder.
* Improved and synced markdown linting rules.

Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
@Confectrician
Revert openhab#1428 (openhab#1436)
c1903fe 
Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
@Confectrician
Fix linter errors. 🔧(openhab#1437)
a326030 
Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
@Confectrician
Bulk edit linter errors. (openhab#1438)
82c751d 
* Bulk edit linter errors.

Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
@Confectrician
Fix linter style
92dcbd9 
Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
@Confectrician
Fix linter errors (openhab#1439)
d2d2c44 
* Some leftover linting error fixes.
* Adapt rules and enble markdownlint for pull requests.

Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
@Confectrician
Fix markdownlint workflow
41a4af6 
Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
@Confectrician
Fixes for linter errors and markdown configuration. (openhab#1440)
f5b9f0a 
Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
@coop-git
Update guidelines.md (openhab#1441)
a128dba 
Only a maintainer told me how to tackle a DTO properly as a class. As I did not see this anywhere, I decide to make this change.
@Confectrician
Add fixes from markdownlint-cli (openhab#1442)
ec6c80d 
Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
@Confectrician
Switch to markdown cli action (openhab#1443)
a69863c 
* Fix left markdownlint errors.

Signed-off-by: Jerome Luckenbach <github@luckenba.ch>

* Change to markdownlint-cli action.

Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
@Confectrician
Update markdownlint.yml
b9a6a97 
Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
@Confectrician
Move trigger order
6adb359 
Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
@Confectrician
Make pr check available for markdownlint 📝 (openhab#1446)
e3bcef1 
* Make pr check available for markdownlint (hopefully).
Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
@Confectrician
Add link check action. (openhab#1449)
5cfab1a 
* Add link check action.

Signed-off-by: Jerome Luckenbach <github@luckenba.ch>

* Add blank line.

Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
@Confectrician
Replace local urls with inline code. Change one occurence to openhabi…
8e18bc0 
…an. (openhab#1450)

Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
@J-N-K
remove uncessary instructions f. contribution guide (openhab#1454)
51a4d3a
@sancho-sumy
Update items.md (openhab#1455)
99f084e 
Example with item Switch Kitchen_Light in the example is not correct for current binding version.
@lampy2 @Confectrician
Created API token docs (openhab#1453)
1d4a5d8 
* Created API token docs

Signed-off-by: Gerwin Lammers <gerwinlammers@gmail.com>

* Update after review session

Signed-off-by: Gerwin Lammers <gerwinlammers@gmail.com>

* Add new page to sidebar navigation.

Signed-off-by: Jerome Luckenbach <github@luckenba.ch>

Co-authored-by: Jerome Luckenbach <github@luckenba.ch>
@dathbe @Confectrician
Update rules-dsl.md (openhab#1456)
e550bc0 
* Update rules-dsl.md

Corrected the "system started" section to reflect that the trigger will no longer execute on loading the rules file in OH v.3.

* Adapt inline codeblock design.

Signed-off-by: Jerome Luckenbach <github@luckenba.ch>

Co-authored-by: Jerome Luckenbach <github@luckenba.ch>
@Confectrician
Remove paper ui references. (openhab#1457)
e3e0e36 
* Remove paper uii references.

Signed-off-by: Jerome Luckenbach <github@luckenba.ch>

* Fix Markdown errors.

Signed-off-by: Jerome Luckenbach <github@luckenba.ch>

* Remove target param from markdownlint pr trigger.

Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
@thefechner
Update items.md (openhab#1458)
01eccdc 
There is one comma too much in the sample for profile hysteresis. The profile must be related to the channel. The comma will lead also to an error message in log.
Switch Low_Battery { channel="serialbutton:button:mybutton:battery-level" [profile="hysteresis", lower=15, inverted=true] }
@felixschndr
Remove cronmaker since it doesn't support HTTPS (openhab#1459)
d77e85d 
1. When trying to reach https://www.cronmaker.com/ the website refuses the connection. You can only reach it using HTTP (without HTTPS). 
You could leave cronmaker in there but I think leading users to web pages that aren't using HTTPS might be not be best idea.

2. Fix Typo in url for quartz-scheduler.org
@wborn
Update links to target "main" branches (openhab#1460)
6bf5bf0 
* Update links to target "main" branches

Signed-off-by: Wouter Born <github@maindrain.net>

* Update process_file.rb

Signed-off-by: Wouter Born <github@maindrain.net>

* Update for all other repos too

Signed-off-by: Wouter Born <github@maindrain.net>
@BertramVielsack @Confectrician
Add hint that /etc/default/openhab2 is not considered by the upgrade (o…
3a54d1f 
…penhab#1461)

* Add hint that /etc/default/openhab2 is not considered by the upgrade 

When you use a raspberry you may have used the file /etc/default/openhab2 to changed JAVA options.
After upgrade to openHAB 3.0 this file is no longer used. Instead the file /etc/default/openhab must be used.

* Small modifications to original pull request.

Signed-off-by: Jerome Luckenbach <github@luckenba.ch>

Co-authored-by: Jerome Luckenbach <github@luckenba.ch>
@mueller-ma
Fix typo in restdocs (openhab#1463)
4db5920
@lukiep
Update rules-dsl.md (openhab#1465)
e37a224 
Updated the rule example "Start wake up light on sunrise" to use the new formatting of the receivedEvent implicit variable
@cweitkamp
Update list of system default channel types (openhab#1467)
454cdd9 
Related to openhab/openhab-core#2069
Related to openhab/openhab-core#2157

Signed-off-by: Christoph Weitkamp <github@christophweitkamp.de>
@Confectrician
Delete habpanel.md (openhab#1471)
6d118db 
* Delete habpanel.md

This file is gathered from its code repository for a long time already.
Signed-off-by: Jerome Luckenbach <github@luckenba.ch>

* Add habpanel placeholder for preview

Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
@Confectrician
Merge branch 'main' into final
9918ea3 
Signed-off-by: Jerome Luckenbach <github@luckenba.ch>
@Confectrician Confectrician requested a review from ghys January 27, 2021 21:50
@ghys
Copy link
Member

ghys commented Jan 28, 2021

@Confectrician I suppose?
What caused the conflicts?
When merging I think you should rebase & merge in this case.

@Confectrician
Copy link
Contributor Author

What caused the conflicts?

I have removed paper ui, openhabian and habpanel pages.

First one is deprecated for oh3 and had only been removed from the sidebar so far.
Both of the other pages are being maintained in their code repos for a longer time.
Seems that this caused some conflicts, since the pages are getting gathered from ci too.

We have to do a manual merge for the gathering part too probably.

@Confectrician
Copy link
Contributor Author

When merging I think you should rebase & merge in this case.

Rebase and merge is not possible in this case
image

Since we have the history available in the main branch, squash should be suitable to.
Wdyt?

@ghys
Copy link
Member

ghys commented Jan 29, 2021

I think the last time I made it with the git command line. If you want I can try again.

ghys
ghys approved these changes Jan 29, 2021
View reviewed changes
Copy link
Member

@ghys ghys left a comment

Choose a reason for hiding this comment

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

Ah, you know what, let's squash, the history's on main anyway as you said.

@ghys ghys merged commit a7ef087 into openhab:final Jan 29, 2021
@Confectrician Confectrician deleted the final branch December 12, 2021 15:12
@Confectrician Confectrician added this to the 3.1 milestone Nov 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ghys ghys ghys approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
3.1
Development

Successfully merging this pull request may close these issues.