FSFE/fsfe-website
25
31
Fork 91
Code Issues 66 Pull Requests 4 Wiki Activity

spellcheck #1511

Closed
egnun wants to merge 3 commits from egnun/fsfe-website:spellcheck into master
pull from: egnun/fsfe-website:spellcheck
merge into: FSFE:master
Conversation 2 Commits 3 Files Changed 12 +19 -19
egnun commented 2020-07-22 13:01:17 +00:00
Member
Copy Link
No description provided.
max.mehl requested changes 2020-07-22 17:13:05 +00:00
about/mission.el.xhtml
@ -18,3 +18,3 @@
<p>Το λογισμικό επηρεάζει σε βάθος όλες τις πτυχές της ζωής μας. Είναι
σημαντικό η τεχνολογία αυτή να μας ενισχύει αντί να μας περιορίζει.
Το Ελεύθερο Λογισμικό δίνει σε όλους τα δικαιώματα να χρησιμοποιούν,
Το <a href="/about/basics/freesoftware.html">Ελεύθερο Λογισμικό</a> δίνει σε όλους τα δικαιώματα να χρησιμοποιούν,
max.mehl commented 2020-07-22 17:12:16 +00:00
Owner
Copy Link

-> /freesoftware/freesoftware.html

Please also for all other files in this PR.

-> `/freesoftware/freesoftware.html` Please also for all other files in this PR.
egnun commented 2020-07-23 09:15:45 +00:00
Author
Member
Copy Link

See my comment in #1510.

By the way, if it is possible, you can remove the commit 579d65851b from this pull request (#1511) here.

See my comment in [#1510](https://git.fsfe.org/FSFE/fsfe-website/issues/1510#issuecomment-9315). By the way, if it is possible, you can remove the commit 579d65851b from this pull request (#1511) here.
max.mehl commented 2020-07-23 09:28:41 +00:00
Owner
Copy Link

No, I cannot delete commits here because it is a branch in your fork. If you want others to be able to work in your branch/PR, do it like described here.

No, I cannot delete commits here because it is a branch in your fork. If you want others to be able to work in your branch/PR, do it like described [here](https://wiki.fsfe.org/TechDocs/Git/Workflow#Sharing_your_changes_and_allowing_contributions).
max.mehl marked this conversation as resolved
contribute/spreadtheword.en.xhtml
@ -18,13 +18,6 @@
<h1 id="spread-the-word">Spread the word!</h1>
<p class="alert alert-danger">
max.mehl commented 2020-07-22 17:12:59 +00:00
Owner
Copy Link

Is this coordinated with Francesca?

Is this coordinated with Francesca?
egnun commented 2020-07-23 07:49:56 +00:00
Author
Member
Copy Link

It's coordinated with Erik A.

Also, the Alert says
"Please do not expect your order to be processed before mid June."
That was now almost over a month ago.

It's coordinated with Erik A. Also, the Alert says "Please do not expect your order to be processed before mid June." That was now almost over a month ago.
max.mehl commented 2020-07-23 08:01:20 +00:00
Owner
Copy Link

Ok, thanks for clarifying!

Ok, thanks for clarifying!
max.mehl marked this conversation as resolved
max.mehl commented 2020-07-23 09:28:58 +00:00
Owner
Copy Link

Cherry-picked the two correct commits manually to master

Cherry-picked the two correct commits manually to master
max.mehl closed this pull request 2020-07-23 09:29:00 +00:00
All checks were successful
continuous-integration/drone/pr Build is passing
Required
Details

Pull request closed

Please reopen this pull request to perform a merge.
Sign in to join this conversation.
Reviewers
No Reviewers
max.mehl
Labels
Clear labels
bug
build
cgi Scripting
design
disruptive
Requires careful coordination and documentation changes
documentation
duplicate
easy
feature-request
help wanted
javascript
priority/low
question
system-hackers
tagging
text
translations
wait/bugfix
wait/inprogress
wait/misc
wait/proofread
wontfix
xsl
No Label
Milestone
No items
No Milestone
Assignees
Clear assignees
albert alex.busch alex.sander anaghz ao bonnie cryptie dario delliott dmaphy doczkal eal egnun eventregbot fi floriansnow gabriel.ku guido hugo ineiev jn jzarl linus lucabon lucas.lasota max.mehl mk monochromec mweimann nico.rikken patrick reinhard repentinus schiessle sofiaritz tobiasd vincent
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: FSFE/fsfe-website#1511
No description provided.
Delete Branch "egnun/fsfe-website:spellcheck"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?