aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar vantezzen <hello@vantezzen.io>2019-11-16 11:25:02 +0100
committerLibravatar vantezzen <hello@vantezzen.io>2019-11-16 11:25:02 +0100
commitc9bfd7c7cba36ce4c088b2dfaddc98646c04cb3a (patch)
treebeb5160043c6d085bf25dd20b9a302429a3cc11e
parentUpdate submodules (diff)
parentMerge pull request #203 from getferdi/all-contributors/add-brorbw (diff)
downloadferdium-app-c9bfd7c7cba36ce4c088b2dfaddc98646c04cb3a.tar.gz
ferdium-app-c9bfd7c7cba36ce4c088b2dfaddc98646c04cb3a.tar.zst
ferdium-app-c9bfd7c7cba36ce4c088b2dfaddc98646c04cb3a.zip
Merge branch 'develop' of https://github.com/getferdi/ferdi into develop
-rw-r--r--.all-contributorsrc9
-rw-r--r--README.md3
2 files changed, 11 insertions, 1 deletions
diff --git a/.all-contributorsrc b/.all-contributorsrc
index 832fcd243..487175335 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -242,6 +242,15 @@
242 "code", 242 "code",
243 "ideas" 243 "ideas"
244 ] 244 ]
245 },
246 {
247 "login": "brorbw",
248 "name": "Bror Winther",
249 "avatar_url": "https://avatars2.githubusercontent.com/u/5909562?v=4",
250 "profile": "https://github.com/brorbw",
251 "contributions": [
252 "doc"
253 ]
245 } 254 }
246 ], 255 ],
247 "contributorsPerLine": 6 256 "contributorsPerLine": 6
diff --git a/README.md b/README.md
index 6aac3d449..662fc37f3 100644
--- a/README.md
+++ b/README.md
@@ -108,7 +108,7 @@ If you use a AUR Helper e.g. yay, simply install it via Β΄yay -S ferdi-binΒ΄
108- [x] Add Process Manager to find services using a lot of resources 108- [x] Add Process Manager to find services using a lot of resources
109- [x] Add "npm run prepare-code" command for development to lint and beautify code 109- [x] Add "npm run prepare-code" command for development to lint and beautify code
110- [x] Add button to open darkmode.css for a service 110- [x] Add button to open darkmode.css for a service
111- [x] Switch to [`electron-spellchecker`](https://github.com/electron-userland/electron-spellchecker) ti improve application size 111- [x] Switch to [`electron-spellchecker`](https://github.com/electron-userland/electron-spellchecker) to improve application size
112- [x] Improve "About Ferdi" screen to better display versions 112- [x] Improve "About Ferdi" screen to better display versions
113- [x] Minifying build files to improve app size 113- [x] Minifying build files to improve app size
114- [x] [Makes it possible to edit the "Franz Todo" server](https://github.com/getferdi/ferdi/wiki/Custom-Todo) 114- [x] [Makes it possible to edit the "Franz Todo" server](https://github.com/getferdi/ferdi/wiki/Custom-Todo)
@@ -236,6 +236,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
236 <td align="center"><a href="https://github.com/Stanzilla"><img src="https://avatars3.githubusercontent.com/u/75278?v=4" width="40px;" alt="Benjamin Staneck"/><br /><sub><b>Benjamin Staneck</b></sub></a><br /><a href="#design-Stanzilla" title="Design">🎨</a></td> 236 <td align="center"><a href="https://github.com/Stanzilla"><img src="https://avatars3.githubusercontent.com/u/75278?v=4" width="40px;" alt="Benjamin Staneck"/><br /><sub><b>Benjamin Staneck</b></sub></a><br /><a href="#design-Stanzilla" title="Design">🎨</a></td>
237 <td align="center"><a href="https://github.com/ammarmalhas"><img src="https://avatars1.githubusercontent.com/u/57057209?v=4" width="40px;" alt="ammarmalhas"/><br /><sub><b>ammarmalhas</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Aammarmalhas" title="Bug reports">πŸ›</a> <a href="#security-ammarmalhas" title="Security">πŸ›‘οΈ</a></td> 237 <td align="center"><a href="https://github.com/ammarmalhas"><img src="https://avatars1.githubusercontent.com/u/57057209?v=4" width="40px;" alt="ammarmalhas"/><br /><sub><b>ammarmalhas</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/issues?q=author%3Aammarmalhas" title="Bug reports">πŸ›</a> <a href="#security-ammarmalhas" title="Security">πŸ›‘οΈ</a></td>
238 <td align="center"><a href="https://github.com/steliyan"><img src="https://avatars1.githubusercontent.com/u/1850292?v=4" width="40px;" alt="Steliyan Stoyanov"/><br /><sub><b>Steliyan Stoyanov</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=steliyan" title="Code">πŸ’»</a> <a href="#ideas-steliyan" title="Ideas, Planning, & Feedback">πŸ€”</a></td> 238 <td align="center"><a href="https://github.com/steliyan"><img src="https://avatars1.githubusercontent.com/u/1850292?v=4" width="40px;" alt="Steliyan Stoyanov"/><br /><sub><b>Steliyan Stoyanov</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=steliyan" title="Code">πŸ’»</a> <a href="#ideas-steliyan" title="Ideas, Planning, & Feedback">πŸ€”</a></td>
239 <td align="center"><a href="https://github.com/brorbw"><img src="https://avatars2.githubusercontent.com/u/5909562?v=4" width="40px;" alt="Bror Winther"/><br /><sub><b>Bror Winther</b></sub></a><br /><a href="https://github.com/getferdi/ferdi/commits?author=brorbw" title="Documentation">πŸ“–</a></td>
239 </tr> 240 </tr>
240</table> 241</table>
241 242