Skip to content

Commit 553ebef

Browse files
committed
fix: readme + admin UI fixes
1 parent c08b5ac commit 553ebef

File tree

4 files changed

+4
-174
lines changed

4 files changed

+4
-174
lines changed

README.md

+1-170
Original file line numberDiff line numberDiff line change
@@ -1,172 +1,3 @@
11
![Wiki.js](https://raw.githubusercontent.com/Requarks/wiki-site/1.0/assets/images/logo.png)
22

3-
[![Release](https://img.shields.io/github/release/Requarks/wiki.svg?style=flat-square&maxAge=3600)](https://github.com/Requarks/wiki/releases)
4-
[![License](https://img.shields.io/badge/license-AGPLv3-blue.svg?style=flat-square)](https://github.com/requarks/wiki/blob/master/LICENSE)
5-
[![Backers on Open Collective](https://opencollective.com/wikijs/backers/badge.svg)](#backers)
6-
[![Sponsors on Open Collective](https://opencollective.com/wikijs/sponsors/badge.svg)](#sponsors)
7-
[![npm](https://img.shields.io/badge/npm-wiki.js-blue.svg?style=flat-square)](https://www.npmjs.com/package/wiki.js)
8-
[![Downloads](https://img.shields.io/github/downloads/Requarks/wiki/total.svg?style=flat-square)](https://www.npmjs.com/package/wiki.js)
9-
![Build Status](https://requarks.visualstudio.com/_apis/public/build/definitions/5850c090-02b9-4312-b4ce-0e1f5677b574/6/badge)
10-
[![Codacy Badge](https://img.shields.io/codacy/grade/1d0217a3153c4595bdedb322263e55c8/master.svg?style=flat-square)](https://www.codacy.com/app/Requarks/wiki)
11-
[![Standard - JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](http://standardjs.com/)
12-
[![Chat on Gitter](https://img.shields.io/badge/chat-on_gitter-CC2B5E.svg?style=flat-square&logo=image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAOCAMAAADUg/YpAAAABlBMVEUAAAD///%2Bl2Z/dAAAAAXRSTlMAQObYZgAAABVJREFUeAFjwAUYYTQByAAh0WicAAAFnwAYeB5bLwAAAABJRU5ErkJggg==)](https://gitter.im/Requarks/wiki)
13-
[![Twitter Follow](https://img.shields.io/badge/follow-%40requarks-blue.svg?style=flat-square)](https://twitter.com/requarks)
14-
15-
##### A modern, lightweight and powerful wiki app built on NodeJS, Git and Markdown
16-
17-
- **[Official Website](https://wiki.js.org/)**
18-
- **[Getting Started](https://wiki.js.org/get-started.html)**
19-
- **[Documentation](https://docs.requarks.io/wiki/)**
20-
- [Requirements](#requirements)
21-
- [Change Log](https://github.com/Requarks/wiki/blob/master/CHANGELOG.md)
22-
- [Feature Requests](https://wikijs.canny.io/features)
23-
- [Milestones](#milestones)
24-
- [Chat with us](#gitter)
25-
- [Translations](#translations) *(We need your help!)*
26-
- [Special Thanks](#special-thanks)
27-
28-
<a target='_blank' rel='nofollow' href='https://app.codesponsor.io/link/roGruqDX64HMJwmnvjhaQ7kt/Requarks/wiki'>
29-
<img alt='Sponsor' width='888' height='68' src='https://app.codesponsor.io/embed/roGruqDX64HMJwmnvjhaQ7kt/Requarks/wiki.svg' />
30-
</a>
31-
32-
## Requirements
33-
34-
Wiki.js can run on virtually all platforms where Node.js can (Windows, Mac, Linux, etc.).
35-
36-
- Node.js **6.11.1** or later
37-
- MongoDB **3.2** or later
38-
- Git **2.7.4** or later
39-
- An empty Git repository (optional)
40-
41-
> Read the full [prerequisites](https://docs.requarks.io/wiki/prerequisites) article for full details.
42-
43-
## Cloud Install
44-
45-
[![Deploy to Heroku](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/requarks/wiki-heroku)
46-
47-
*Docker Cloud, Azure, IBM Bluemix and more coming soon!*
48-
49-
## Docker
50-
51-
A docker Wiki.js image is available on Docker Hub:
52-
53-
[![Docker Image](https://raw.githubusercontent.com/Requarks/wiki-site/master/assets/images/docker-deploy.png)](https://hub.docker.com/r/requarks/wiki/)
54-
55-
You can also use a Dockerfile ([see example](https://github.com/Requarks/wiki/blob/master/tools/Dockerfile)) or Docker Compose ([see example](https://github.com/Requarks/wiki/blob/master/tools/docker-compose.yml)) to run Wiki.js.
56-
57-
## Milestones
58-
59-
Current and upcoming milestones *(major features only, see the [changelog](https://github.com/Requarks/wiki/blob/master/CHANGELOG.md) for complete list of features and bug fixes)*:
60-
61-
### 1.0.11 - Stable
62-
![Progress](http://progressed.io/bar/100)
63-
64-
**Note**: As 2.0 is under development, no new features are being developed in the 1.0 branch.
65-
66-
- [x] Japanese localization
67-
- [x] Fix for name search when using OpenLDAP
68-
- [x] Added referrer policy header
69-
70-
### 2.0.0 - Dev
71-
![Progress](http://progressed.io/bar/35)
72-
73-
**Goals**:
74-
- Decouple front-end and back-end completely.
75-
- All operations and queries will be made via GraphQL API.
76-
- New fully responsive layout, with better customization capabilities.
77-
- Full localization support, especially for non-latin languages.
78-
79-
**Breaking Changes**: MongoDB is being phased out in favor of PostgreSQL + Redis. An upgrade tool will be provided to migrate existing data to the new system.
80-
81-
- [x] GraphQL API
82-
- [x] Comments
83-
- [x] Documents
84-
- [x] Files
85-
- [x] Folders
86-
- [x] Groups
87-
- [x] Rights
88-
- [x] Settings
89-
- [x] Tags
90-
- [x] Translations
91-
- [x] Users
92-
- [x] Migrate to PostgreSQL + Redis datastore
93-
- [ ] Themes
94-
- [ ] New Login page
95-
- [ ] History / Revert to previous version
96-
- [ ] Optional Two-Steps Authentication (2FA)
97-
- [x] Docker support + Auto compile/publish to Docker Hub
98-
- [x] Support sub-directory installations (e.g. example.com/wiki)
99-
- [ ] Persist system settings to database instead of file-based
100-
- [ ] User Groups + Better permissions management
101-
- [x] Make use of all available CPU cores, distributed jobs queue
102-
- [ ] Tags per document / folder
103-
- [ ] Comments / Discussion per document
104-
- [ ] Profile page per user
105-
- [ ] Preview changes directly from the editor, without saving
106-
- [x] Modular authentication providers
107-
- [ ] High Availability support (multiple concurrent instances)
108-
- [ ] Insert Link modal in Editor
109-
- [ ] Better simultaneous user editing handling
110-
111-
## Gitter
112-
113-
Want to discuss features, ideas or issues? Join our [gitter channel](https://gitter.im/Requarks/wiki). We are very active and friendly!
114-
[![Chat on Gitter](https://img.shields.io/badge/chat-on_gitter-CC2B5E.svg?style=flat-square&logo=image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAOCAMAAADUg/YpAAAABlBMVEUAAAD///%2Bl2Z/dAAAAAXRSTlMAQObYZgAAABVJREFUeAFjwAUYYTQByAAh0WicAAAFnwAYeB5bLwAAAABJRU5ErkJggg==)](https://gitter.im/Requarks/wiki)
115-
116-
## Twitter
117-
118-
Follow our Twitter feed to learn about upcoming updates and new releases!
119-
[![Twitter Follow](https://img.shields.io/badge/follow-%40requarks-blue.svg?style=flat-square)](https://twitter.com/requarks)
120-
121-
## Translations
122-
123-
We are looking for translators to make Wiki.js available in multiple languages. If your language is not listed below and would like to contribute to this project, contact us on our [gitter channel](https://gitter.im/Requarks/wiki) and we'll provide you with the necessary tool to add translations, no coding required!
124-
125-
**Languages that are already translated:**
126-
127-
- [x] English
128-
- [x] Chinese - *Thanks to [@choicky](https://github.com/choicky)*
129-
- [x] Dutch - *Thanks to [@weirdwater](https://github.com/weirdwater)*
130-
- [x] Estonian - *Thanks to [@vonforum](https://github.com/vonforum)*
131-
- [x] French
132-
- [x] German - *Thanks to [@joetjengerdes](https://github.com/joetjengerdes), [@MyZeD](https://github.com/MyZeD)*
133-
- [x] Japanese - *Thanks to [@johnnyshields](https://github.com/johnnyshields)*
134-
- [x] Korean - *Thanks to [@junwonpk](https://github.com/junwonpk)*
135-
- [x] Persian - *Thanks to [@ashkang](https://github.com/ashkang)*
136-
- [x] Portuguese - *Thanks to [@felipeplets](https://github.com/felipeplets)*
137-
- [x] Russian - *Thanks to [@efimlosev](https://github.com/efimlosev)*
138-
- [x] Spanish - *Thanks to [@MatiasArriola](https://github.com/MatiasArriola)*
139-
140-
## Special Thanks
141-
142-
![Browserstack](https://wiki.js.org/assets/images/logo_browserstack.png)
143-
[Browserstack](https://www.browserstack.com/) for providing access to their great cross-browser testing tools.
144-
145-
[![DigitalOcean](https://wiki.js.org/assets/images/logo_digitalocean.png)](https://m.do.co/c/5f7445bfa4d0)
146-
[DigitalOcean](https://m.do.co/c/5f7445bfa4d0) for providing hosting of the Wiki.js documentation site.
147-
148-
## Contributors
149-
150-
This project exists thanks to all the people who contribute. [[Contribute]](CONTRIBUTING.md).
151-
<a href="graphs/contributors"><img src="https://opencollective.com/wikijs/contributors.svg?width=890" /></a>
152-
153-
## Backers
154-
155-
Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/wikijs#backer)]
156-
157-
<a href="https://opencollective.com/wikijs#backers" target="_blank"><img src="https://opencollective.com/wikijs/backers.svg?width=890"></a>
158-
159-
## Sponsors
160-
161-
Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/wikijs#sponsor)]
162-
163-
<a href="https://opencollective.com/wikijs/sponsor/0/website" target="_blank"><img src="https://opencollective.com/wikijs/sponsor/0/avatar.svg"></a>
164-
<a href="https://opencollective.com/wikijs/sponsor/1/website" target="_blank"><img src="https://opencollective.com/wikijs/sponsor/1/avatar.svg"></a>
165-
<a href="https://opencollective.com/wikijs/sponsor/2/website" target="_blank"><img src="https://opencollective.com/wikijs/sponsor/2/avatar.svg"></a>
166-
<a href="https://opencollective.com/wikijs/sponsor/3/website" target="_blank"><img src="https://opencollective.com/wikijs/sponsor/3/avatar.svg"></a>
167-
<a href="https://opencollective.com/wikijs/sponsor/4/website" target="_blank"><img src="https://opencollective.com/wikijs/sponsor/4/avatar.svg"></a>
168-
<a href="https://opencollective.com/wikijs/sponsor/5/website" target="_blank"><img src="https://opencollective.com/wikijs/sponsor/5/avatar.svg"></a>
169-
<a href="https://opencollective.com/wikijs/sponsor/6/website" target="_blank"><img src="https://opencollective.com/wikijs/sponsor/6/avatar.svg"></a>
170-
<a href="https://opencollective.com/wikijs/sponsor/7/website" target="_blank"><img src="https://opencollective.com/wikijs/sponsor/7/avatar.svg"></a>
171-
<a href="https://opencollective.com/wikijs/sponsor/8/website" target="_blank"><img src="https://opencollective.com/wikijs/sponsor/8/avatar.svg"></a>
172-
<a href="https://opencollective.com/wikijs/sponsor/9/website" target="_blank"><img src="https://opencollective.com/wikijs/sponsor/9/avatar.svg"></a>
3+
View [milestones and documentation on the master branch]() instead!

client/components/admin/admin-groups-edit.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
v-container.pa-3(fluid, grid-list-md)
4949
v-layout(row, wrap)
5050
v-flex(xs12, md6, lg4, v-for='pmGroup in permissions')
51-
v-card.md2.grey.lighten-5(flat)
51+
v-card.md2.grey(flat, :class='$vuetify.dark ? "darken-4" : "lighten-5"')
5252
v-subheader {{pmGroup.category}}
5353
v-card-text.pt-0
5454
template(v-for='(pm, idx) in pmGroup.items')

client/components/admin/admin-users.vue

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
)
3030
template(slot='headers', slot-scope='props')
3131
tr
32-
//- th(width='50')
3332
th.text-xs-left(
3433
v-for='header in props.headers'
3534
:key='header.text'
@@ -40,7 +39,7 @@
4039
| {{ header.text }}
4140
v-icon(small, v-if='header.sortable') arrow_upward
4241
template(slot='items', slot-scope='props')
43-
tr(:active='props.selected')
42+
tr.is-clickable(:active='props.selected', @click='$router.push("/users/" + props.item.id)')
4443
//- td
4544
v-checkbox(hide-details, :input-value='props.selected', color='blue darken-2', @click='props.selected = !props.selected')
4645
td.text-xs-right {{ props.item.id }}

server/graph/schemas/navigation.graphql

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ type NavigationQuery {
2525
type NavigationMutation {
2626
updateTree(
2727
tree: [NavigationItemInput]!
28-
): DefaultResponse
28+
): DefaultResponse @auth(requires: ["manage:navigation", "manage:system"])
2929
}
3030

3131
# -----------------------------------------------

0 commit comments

Comments
 (0)