yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-04 19:13:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,301 Commits 145 Branches 512 Tags
Commit Graph

13301 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
soupette
5021aabfdc Fix trads typo 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-24 09:17:42 +02:00
Brian Dixon
0f8d150105 Fix Typo in AWS deployment documentation 
Following the instructions to install Node.js with npm will result in node version 10 being installed instead of version 12.

Signed-off-by: bjdixon <bjdixon@gmail.com>
 2020-04-24 13:51:27 +08:00
cyril lopez
024de9ac5e
Merge pull request #5923 from strapi/tracking/front-end-events 
Add front-end media lib usage events
 2020-04-23 18:13:16 +02:00
HichamELBSI
7a4a87fa68 Merge branch 'develop' of github.com:strapi/strapi into fix/single-types-issues 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-23 17:18:14 +02:00
Astraeus-
2dafb22b5e Update authentication error documentation 
Error has a "response" property that holds the data

Signed-off-by: Astraeus- <Astraeus-@users.noreply.github.com>
 2020-04-23 16:56:52 +02:00
HichamELBSI
f07dcf3f7f Fix single types navigation 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-23 15:01:51 +02:00
soupette
221ad7975b Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-23 14:51:42 +02:00
Jim LAURIE
6ef4b17262
Merge pull request #5896 from strapi/doc/upload-provider-settings 
Add a simple example of using env vars in provider config files
 2020-04-23 14:46:39 +02:00
cyril lopez
76d5860d1f
Merge pull request #5917 from strapi/front/update-buffetjs 
Update buffetjs dependency
 2020-04-23 14:40:50 +02:00
soupette
c44dd2dbd8 Add front-end media lib usage events 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-23 14:18:58 +02:00
Ky
6060c3c3ee Merge branch 'front/update-buffetjs' of github.com:strapi/strapi into front/update-buffetjs 2020-04-23 14:02:55 +02:00
Ky
36695568e2 update snapshots 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-23 14:02:32 +02:00
Ky
7392bae6a2 Merge branch 'develop' of github.com:strapi/strapi into front/update-buffetjs 2020-04-23 13:50:19 +02:00
Ky
5bdb87d429 Merge branch 'master' of github.com:strapi/strapi into front/update-buffetjs 2020-04-23 12:36:15 +02:00
virginieky
3c0427ce60
Merge branch 'develop' into front/update-buffetjs 2020-04-23 12:33:44 +02:00
soupette
8fa8b2a086 Merge branch 'master' of github.com:strapi/strapi into develop 2020-04-23 12:31:31 +02:00
Ky
ccc452e5b2 update buffetjs dependency 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-23 10:07:53 +02:00
cyril lopez
c0e065f259
Merge branch 'develop' into chore/redux 2020-04-23 09:14:40 +02:00
cyril lopez
bbbd14fb4d
Merge pull request #5895 from strapi/front/global-improvements 
Some UI fixes
 2020-04-22 16:30:34 +02:00
cyril lopez
4bfcce0c0c
Merge branch 'develop' into front/global-improvements 2020-04-22 16:08:42 +02:00