yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-31 20:33:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,371 Commits 113 Branches 491 Tags
Commit Graph

15371 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ky
83f2022e20 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-04-28 15:22:20 +02:00
Ky
f828314acc apply pr review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-28 15:20:41 +02:00
Alexandre Bodin
6a6d53b402 v3.0.0-beta.20.1 v3.0.0-beta.20.1 2020-04-28 10:00:23 +02:00
virginieky
a43386a6de
Merge branch 'develop' into front/media-lib-loader 2020-04-27 23:52:37 +02:00
Ky
8b1b68242a Media lib listView loadingBar and loadingIndicator 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-27 23:48:43 +02:00
cyril lopez
56629bdd04
Merge pull request #5942 from strapi/develop 
Front-end improvements
 2020-04-27 18:52:47 +02:00
Ky
18cd135268 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-04-27 17:51:19 +02:00
cyril lopez
62c01a08e5
Merge branch 'master' into develop 2020-04-27 17:50:25 +02:00
Ky
d3a94ecfd2 update snapshots 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-27 17:46:57 +02:00
domenico ventura
3eb8e379be Improving IT translation by adding missing labels. Now IT translation aligned with EN ones 
Signed-off-by: domenico ventura <domenico@digitware.it>
 2020-04-27 17:23:46 +02:00
domenicoven
898f757e5b
Made unit tests on files platform agnostic by using path.combine (tests were failing on windows) (#5943) 
Signed-off-by: domenico ventura <domenico@digitware.it>

Co-authored-by: domenico ventura <domenico@digitware.it>
 2020-04-27 16:56:19 +02:00
Alexandre BODIN
5dac3e4866
Add metris to the media lib with ratelimit (#5946) 
* Add daily sender

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

* Add media lib events and ratelimiter wrapper

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-27 16:08:55 +02:00
Ky
01c1b9f8e2 update buffetjs dependencies 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-27 16:03:15 +02:00
Ky
0c1105a51a Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-04-27 15:50:05 +02:00
Jim LAURIE
07a69517c4
Merge pull request #5966 from strapi/docs/rfcs 
Add rfcs into the contribution docs
 2020-04-27 14:56:08 +02:00
李晟
6780d3598b
fix the bug of rich text can't save Chinese (#5951) 
Signed-off-by: lisheng <499817366@qq.com>
 2020-04-27 12:54:24 +02:00
Bendegúz Cseresnyés
b6853eb907
Fixed: Core store returned null instead of string (#5957) 
* Fix: Add option to core-store that returns string

Signed-off-by: Bendegúz Cseresnyés <cser.bende@gmail.com>

* fix: Core-store string values parsed as json

Signed-off-by: Bendegúz Cseresnyés <cser.bende@gmail.com>
 2020-04-27 12:50:58 +02:00
Jim LAURIE
dd34f9465a
Merge pull request #5932 from bjdixon/bugfix/aws-documentation-typo 
Fix Typo in AWS deployment documentation
 2020-04-27 11:30:10 +02:00
Jim LAURIE
44dab28519
Merge branch 'master' into bugfix/aws-documentation-typo 2020-04-27 11:30:01 +02:00
Jim LAURIE
158909dcf1
Merge pull request #5926 from Astraeus-/master 
Update documentation of authentication errors
 2020-04-27 11:29:22 +02:00
Jim LAURIE
f65644ba64
Merge branch 'master' into master 2020-04-27 11:29:14 +02:00
Alexandre Bodin
05f22aaf27 Merge branch 'master' into develop 2020-04-27 11:15:48 +02:00
Jim LAURIE
a81d265edd
Merge pull request #5725 from adriatic/adriatic 
Update documentation from Content to Collection Type
 2020-04-27 10:59:41 +02:00
Jim LAURIE
22a2da3ae0 docs: add rfcs into the contribution docs 
Signed-off-by: Jim LAURIE <j.laurie6993@gmail.com>
 2020-04-27 10:16:59 +02:00
Walter Cossu
2c717f4004 Merge branch 'master' of https://github.com/trick0/strapi 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-04-27 10:06:22 +02:00
Jim LAURIE
8a1aefd28f Merge branch 'documentation' 2020-04-27 10:01:04 +02:00
Ky
771df8dfb7 fix lint 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-26 19:30:23 +02:00
Ky
ef8afac70e update snapshots 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-26 19:20:56 +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
cyril lopez
5e8069cc26
Merge pull request #5939 from strapi/front/indent 
indent RemoveWrapper file
 2020-04-24 16:02:31 +02:00
virginieky
0f7942cacb
Merge branch 'develop' into front/indent 2020-04-24 15:42:22 +02:00
Ky
3ff861e417 indent RemoveWrapper file 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-24 15:38:42 +02:00
soupette
afa40a3c45 Update branch 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-24 15:36:17 +02:00
soupette
5a41f68f2b Merge branch 'master' of github.com:strapi/strapi into develop 2020-04-24 15:34:45 +02:00
domenicoven
d0eea7e8cf
remove koa-qs dependency as it is not anymore maintained (#5922) 
* remove koa-qs dependency as it is not anymore maintained

Signed-off-by: domenico ventura <domenico@digitware.it>

Removing dependency from koa-qs

Signed-off-by: domenico ventura <domenico@digitware.it>

* cleaning the code

Signed-off-by: domenico ventura <domenico@digitware.it>

* removed merge dependency and use object.defineProperty

Signed-off-by: domenico ventura <domenico@digitware.it>

* remove koa-qs dependency as it is not anymore maintained

Signed-off-by: domenico ventura <domenico@digitware.it>

Removing dependency from koa-qs

Signed-off-by: domenico ventura <domenico@digitware.it>

* cleaning the code

Signed-off-by: domenico ventura <domenico@digitware.it>

* removed merge dependency and use object.defineProperty

Signed-off-by: domenico ventura <domenico@digitware.it>

* removing arrow functions

Signed-off-by: domenico ventura <domenico@digitware.it>

* removing arrow functions

Signed-off-by: domenico ventura <domenico@digitware.it>

Co-authored-by: domenico ventura <domenico@digitware.it>
 2020-04-24 14:09:27 +02:00
Daniel Schäfer
0e8dc2e917
Fix typo in documentation (#5866) 
Signed-off-by: Daniel <epegzz@gmail.com>
 2020-04-24 14:08:01 +02:00
cyril lopez
3e50e71c51
Merge pull request #5907 from strapi/chore/redux 
Upgrade dependencies
 2020-04-24 13:20:47 +02:00
soupette
03b7b3340f Improve doc 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-24 12:46:37 +02:00
soupette
8f22ee2c5a Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-24 12:07:07 +02:00
Walter Cossu
f1745c0956 Merge branch 'master' of https://github.com/trick0/strapi 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-04-24 10:47:29 +02:00
trick0
b982f59f13
Merge branch 'master' into master 2020-04-24 10:35:40 +02:00
Walter Cossu
6410e56c1e Merge branch 'master' of https://github.com/trick0/strapi 
Signed-off-by: Walter Cossu <walter.cossu@realt.it>
 2020-04-24 10:32:17 +02:00
Martin Muzatko
58588e10e5
docs: DE Abbrechen does not mean reset (#5796) 
Abbrechen means cancel. Which implies the user would get back to the list view, while editing a single item.

Signed-off-by: Martin Muzatko <martin@happy-css.com>
 2020-04-24 10:31:36 +02:00
Walter Cossu
90e0d75230 added countSearch method to user service 2020-04-24 10:30:37 +02:00
trick0
371e3e0d28
Merge branch 'master' into master 2020-04-24 10:26:37 +02:00
cyril lopez
991813636b
Merge branch 'develop' into chore/redux 2020-04-24 09:45:18 +02:00
cyril lopez
81c94c9ea0
Merge pull request #5897 from strapi/fix/single-types-issues 
Fix single types navigation
 2020-04-24 09:44:53 +02:00
HichamELBSI
4079ecbaf1 Fix PR review 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-24 09:39:18 +02:00
soupette
2cf58b20d4 Update snapshots 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-24 09:18:19 +02:00