yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-08 08:46:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,409 Commits 113 Branches 488 Tags
Commit Graph

530 Commits

Author SHA1 Message Date
Christos Malliaridis
d77ab73d75 Remove unnecessary import of useState 
Signed-off-by: Christos Malliaridis <c.malliaridis@gmail.com>
 2020-06-17 11:09:18 +02:00
Christos Malliaridis
00b1c7571a
Merge branch 'master' into fix/input-checkbox-behavior 2020-06-17 10:53:33 +02:00
Fadhil Ahmad
d58a55dce6
Update translation support on 'users-permissions' , 'upload' and 'content-manager' plugin (#6439) 
* fix: add Enable, Disable, and Done trad on email plugin

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* fix: add translation for dinamic zone required component error

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* fix: back to form.button.done, turns out other dont have form.button.done on strapi-admin

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* feat: add replace media translation support

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>
 2020-06-15 14:10:12 +02:00
Christos Malliaridis
371a741c69 Move input selected state to parent component 
Move input selected state from controller to parent component (plugin)
to prevent multiple selections and highlighting of checkbox fields
from different controllers.

Signed-off-by: Christos Malliaridis <c.malliaridis@gmail.com>
 2020-06-14 05:19:58 +02:00
Christos Malliaridis
52a54de2a3 Move click action to wrapper and update styles 
Move click action to wrapper (parent) to allow clicks on
whole area of checkbox. Also update the highlighting and
visibility on hover of configuration wheel for better
usability. This way the user learns that clicking on the
item or wheel opens the configuration and clicking on
the text or checkbox toggles the checkbox.

Signed-off-by: Christos Malliaridis <c.malliaridis@gmail.com>
 2020-06-14 05:19:57 +02:00
Fadhil Ahmad
7123a11444
Add Malay(ms.json) Translation (#6394) 
* feat: add malay  translation for strapi-admin

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* feat: add malay locale on strapi-generate-plugin

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* feat: add malay translation for content-manager

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* feat: add malay translation for content-type-builder

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* faet: add malay translation for strapi-plugin-documentation

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* feat: add malay translation for email plugin

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* feat: add malay translation on upload plugin

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* feat: add malay translation for permission plugin

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* Fix language middleware (#6387)

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* [typo] Persmissions > Permissions (#6390)

Signed-off-by: ScottAgirs <scott@ijs.to>
Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* refactor: fix typo, suitable word and grammar

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* test: add ms test

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

* fix: typos on plugin.description email

Signed-off-by: Fadhil Ahmad <fadzbobby95@gmail.com>

Co-authored-by: Alexandre BODIN <alexandrebodin@users.noreply.github.com>
Co-authored-by: Scott Agirs <ScottAgirs@users.noreply.github.com>
Co-authored-by: cyril lopez <cyril.lpz@gmail.com>
 2020-06-11 12:05:16 +02:00
David Thomas
ba6c0b4ba2
Add Twitch auth provider (#6171) 
* Add Twitch auth provider

Signed-off-by: David Thomas <dev@synth3.tk>

* Remove unneeded label exclusion

Signed-off-by: David Thomas <dev@synth3.tk>
 2020-05-12 16:48:18 +02:00
Pierre Noël
57d7d876b7
Fix/#4513/ability to use a sub path behind a proxy (#5833) 
* add possibility to use strapi on a non-root base url path

* fix documentation password form

* use server.url and admin.url in config

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* update doc proxy

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* move server.url location in config

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* add possibility to put relative urls

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* allow '/' as an admin url + refacto

Signed-off-by: Pierre Noël <pierre.noel@strapi.io>

* update yarn.lock

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* refacto

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* Remove default proxy option

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

* fix github provider

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* fix github login

Signed-off-by: Pierre Noël <petersg83@gmail.com>

* Remove files that should be here

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Co-authored-by: Pierre Noël <pierre.noel@strapi.io>
Co-authored-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-08 13:50:00 +02:00
Ky
c11cc6ab97 apply design review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-29 11:47:38 +02:00
Ky
490d565c07 use theme for fontweight 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-28 15:31:43 +02:00
Ky
f828314acc apply pr review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-28 15:20:41 +02:00
Ky
4cd1b6c124 Merge branch 'front/ui-improvements' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-26 18:55:03 +02:00
Ky
9384a00a96 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-26 18:13:20 +02:00
soupette
8dcaf1b065 Fix styled compo lint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 15:49:51 +02:00
soupette
13d4c58bbe Update reducer injector in all plugins 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:05 +02:00
soupette
f3bcddcf89 Identify front-end core files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-06 13:33:32 +01:00
Virginie Ky
b69d3f807d Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-03-05 19:18:35 +01:00
soupette
d6bc4e1941 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 14:52:29 +01:00
soupette
7c12398df6 Fixes #5404 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 12:16:26 +01:00
Alexandre Bodin
7a8c865051 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 15:18:08 +01:00
soupette
ccc92b90a5 Add required info into the plugin object and update plugin generator 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 11:40:55 +01:00
virginieky
8d36b69507
Merge branch 'front/ui-improvements' into front/font-weight 2020-02-13 13:46:49 +01:00
cyril lopez
021f88c88f
Merge pull request #5241 from strapi/front/trash-icon 
Generalize all trash icon
 2020-02-13 13:31:07 +01:00
Virginie Ky
fb55ce3426 clean 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-13 11:36:19 +01:00
Virginie Ky
138bbae981 generalize all trash icons 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-13 11:29:01 +01:00
Virginie Ky
6e4dbf6394 Merge branch 'develop' of github.com:strapi/strapi into front/font-weight 2020-02-12 13:51:27 +01:00
soupette
86dcf65c20 Use logo from the plugin object instead of the one from github in the user-permissions plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-11 17:29:14 +01:00
soupette
f924a53a8a Add pluginLogo to the plugin object in order to prevent fetching the logo from github 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-11 17:15:53 +01:00
Virginie Ky
45ecaec15c font-weight and alignment 
Signed-off-by: Virginie Ky <virginie.ky@gmail.com>
 2020-02-11 17:12:40 +01:00
Alexandre Bodin
8a970562c9 Merge branch 'master' into develop 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 19:15:20 +01:00
Jim LAURIE
638ddd201e
Merge branch 'master' into update-zh-hans-translations 2020-02-07 09:56:09 +01:00
cyril lopez
8745d2373a
Merge branch 'master' into feat/update-pl-translations 2020-02-06 14:39:05 +01:00
ruibaby
ff489ce051 feat: updated zh-Hans translations. 
Signed-off-by: ruibaby <i@ryanc.cc>
 2020-02-04 15:55:02 +08:00
soupette
a49d696c51 Fix routing and menu highlight 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-30 12:32:29 +01:00
soupette
144d07cdbe Improve plugin left menu for trads and enable settings api 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-30 11:50:34 +01:00
soupette
96e092b300 Change the way we load plugins 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-23 16:46:50 +01:00
Mariusz Wachowski
4e5326490e feat: updated pl translations 
Signed-off-by: Mariusz Wachowski <wachowski.mariusz@gmail.com>
 2020-01-22 21:54:08 +01:00
soupette
be64adaa1c Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-22 10:29:36 +01:00
soupette
6c27d224f2 Add eslint config 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 11:33:43 +01:00
virginieky
50643f94b3
Merge branch 'master' into chore/eslint-config 2020-01-10 17:44:43 +01:00
soupette
c62dad2140 Improve eslint config fron front-end files 2020-01-08 12:21:47 +01:00
Jaroslav Vrána
0215f64648
Merge branch 'master' into feature/adminTranslationCs 2020-01-07 19:32:32 +01:00
Jozef Cipa
61972f6292
Merge branch 'master' into feature/slovak-translations 2020-01-06 18:22:48 +01:00
profispojka
2c9b8283b3
Update cs.json 2020-01-05 16:04:00 +01:00
profispojka
379033a91c
Merge branch 'feature/adminTranslationCs' into feature/adminTranslationCsWithPlugins 2020-01-05 15:59:47 +01:00
unknown
6e4fe7141a fix typos, merge 2020-01-05 15:48:51 +01:00
unknown
72e76c97f2 update translations to latest master 2020-01-05 15:40:09 +01:00
unknown
8281ed7a8f merge master changes 2020-01-05 14:36:47 +01:00
jozefcipa
ea23166e3e Fix typos 2020-01-05 14:11:00 +01:00
unknown
d53d7ac5e2 cs translation fixes 2020-01-05 13:05:57 +01:00