yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-12 02:38:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,892 Commits 115 Branches 488 Tags
Commit Graph

9892 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
6f8b23d254 Fix conflicts 2019-09-27 16:26:09 +02:00
cyril lopez
922f6109f6
Merge branch 'develop' into fix/scrollbar 2019-09-27 16:17:15 +02:00
cyril lopez
ba30924ede
Merge branch 'develop' into front/context-api 2019-09-27 16:13:41 +02:00
cyril lopez
2c7f5dd74d
Merge pull request #3977 from strapi/styled-components/documentation 
Remove scss files in documentation plugin
 2019-09-27 16:11:48 +02:00
cyril lopez
3a4bb7fda5
Merge branch 'develop' into front/context-api 2019-09-27 15:44:15 +02:00
cyril lopez
ad662544a2
Merge branch 'develop' into styled-components/documentation 2019-09-27 15:43:52 +02:00
Alexandre BODIN
84146362a7
Merge pull request #4081 from chiacode/master 
Change Traditional Chinese flag in LocaleToggle
 2019-09-27 15:33:24 +02:00
Alexandre BODIN
9d70d1caf7
Merge pull request #4120 from strapi/update/contributing-guide 
Add rfc in contributing guide and add some comment
 2019-09-27 14:14:46 +02:00
Jim LAURIE
c86f402c56 Add rfc in contributing guide and add some comment 2019-09-27 13:56:45 +02:00
Alexandre BODIN
5e55f76724
Merge pull request #4117 from strapi/fix/default-ejs-config 
Fix default config usage ejs
 2019-09-27 10:38:45 +02:00
Jim LAURIE
fcf6e76804
Fix default config usage ejs 2019-09-27 10:07:53 +02:00
Karthikeyan Palaniswamy
765498a606 Use 2 spaces for a tab 2019-09-26 22:32:22 +02:00
Karthikeyan Palaniswamy
ce70c911e4 Remove space before :(colon) 2019-09-26 22:32:06 +02:00
Jim LAURIE
93ee900a14
Merge pull request #4112 from eriktoyra/bug/4104-update-url-of-settings-button-for-content-manager-plugincard 
Updates the url of the settings button for Content Manager PluginCard
 2019-09-26 20:16:16 +02:00
Jim LAURIE
2c5ee6d41a
Merge branch 'master' into bug/4104-update-url-of-settings-button-for-content-manager-plugincard 2019-09-26 19:47:55 +02:00
Alexandre BODIN
561074236f
Merge pull request #4111 from JelmerV-WFC/fix/#4109 
Allow null values on manyToMany and manyWay to set empty array
 2019-09-26 17:46:18 +02:00
Erik Töyrä Silfverswärd
e3e185102d #4104 - Updates the url of the setting button for Content Manager PluginCard. 2019-09-26 17:29:33 +02:00
Jelmer Visser
3111ee4942 Fix for null values with manyToMany and manyWay 2019-09-26 16:07:53 +02:00
Alexandre BODIN
8ac65379e6
Merge pull request #4108 from strapi/chore/sentry-full-errors 
Use stderr instead of message
 2019-09-26 15:37:46 +02:00
Alexandre Bodin
7c84795d8a Use stderr instead of message 2019-09-26 15:35:55 +02:00
Alexandre Bodin
6305bee43b v3.0.0-beta.16.6 v3.0.0-beta.16.6 2019-09-26 14:35:06 +02:00
Alexandre BODIN
517b1e9923
Merge pull request #4070 from x-yuri/patch-1 
Update quick-start documentation
 2019-09-26 14:28:40 +02:00
Alexandre BODIN
893e514a85
Merge pull request #4086 from strapi/front/admin-development 
Enable easy admin development
 2019-09-26 14:27:52 +02:00
Alexandre BODIN
6c344318da
Merge pull request #4107 from strapi/chore/add-sentry 
Add sentry in strapi new command
 2019-09-26 14:23:34 +02:00
Alexandre BODIN
da6f8b1fff
Merge pull request #4088 from strapi/fix/documentation 
Review documentation text format
 2019-09-26 14:07:28 +02:00
Alexandre BODIN
43be7ab49c
Merge branch 'master' into fix/documentation 2019-09-26 14:07:02 +02:00
Alexandre Bodin
571e7f3579 Factorize sentry capture code 2019-09-26 14:03:22 +02:00
Alexandre Bodin
67e60369df Add sentry to strapi-generate-new 2019-09-26 12:33:36 +02:00
Jim LAURIE
25aa50462d Apply review feedback 2019-09-26 12:21:56 +02:00
soupette
0b39322bba Apply PR feedback 2019-09-26 11:52:02 +02:00
Karthikeyan Palaniswamy
29bd8f208c Add missing translations for German language 2019-09-25 22:59:51 +02:00
Alexandre BODIN
47848388fc
Merge pull request #4079 from strapi/front/copy-admin-plugins-files 
Allow to customise plugins front-end files
 2019-09-25 17:19:17 +02:00
Alexandre BODIN
12b832f3ce
Merge pull request #3689 from BitesizedLion/patch-1 
Update swedish Translation
 2019-09-25 17:07:12 +02:00
Casper S
706a27ad51
Update sv.json 2019-09-25 14:32:58 +02:00
Casper S
bc3ea2422b
Update sv.json 2019-09-25 14:31:18 +02:00
Casper S
0aacf1d834
Update sv.json 2019-09-25 14:29:33 +02:00
Casper S
010d7f6c9c
Update sv.json 2019-09-25 14:28:54 +02:00
Casper S
786253d0f4
Update sv.json 2019-09-25 14:28:14 +02:00
Casper S
7d60d34779
Update sv.json 2019-09-25 14:27:40 +02:00
Casper S
f181dc98e8
Update sv.json 2019-09-25 14:26:58 +02:00
Casper S
7a08ad3a81
Update sv.json 2019-09-25 14:26:28 +02:00
Casper S
a2b4108327
Update sv.json 2019-09-25 14:25:36 +02:00
Casper S
84c7fdba22
Update sv.json 2019-09-25 14:25:20 +02:00
Casper S
fa2f373d02
Update sv.json 2019-09-25 14:24:25 +02:00
Casper S
ade1861dbc
Update sv.json 2019-09-25 14:23:30 +02:00
Casper S
8ae0874710
Update sv.json 2019-09-25 14:22:36 +02:00
Virginie Ky
ed84f0619a some clean 2019-09-24 18:54:23 +02:00
Virginie Ky
11f3871af1 Bootstrap and fonts without sass 2019-09-24 18:42:08 +02:00
Jim LAURIE
8ebd7cc548 Fix conflict 2019-09-24 18:01:59 +02:00
Jim LAURIE
dca6d0451e Review middleware structure doc 2019-09-24 17:59:02 +02:00