9873 Commits

Author SHA1 Message Date
Alexandre Bodin
03784d6df0 Add alias when necessary 2019-10-02 16:38:06 +02:00
Alexandre BODIN
8bb468121e
Merge pull request #4146 from etchteam/master
Fix full text search on postgres uppercased attributes chars
2019-10-02 11:54:34 +02:00
Alexandre BODIN
2dfee17271
Merge branch 'master' into master 2019-10-02 11:52:15 +02:00
soupette
b6c0e2e87b Merge branch 'develop' of github.com:strapi/strapi into stm/update 2019-10-02 11:39:46 +02:00
Alexandre BODIN
f6740bb4fb
Merge pull request #4161 from websocket98765/fix-s3-typo
Fix typo in strapi-provider-upload-s3 documentation
2019-10-02 09:51:33 +02:00
Alexandre BODIN
279639b5aa
Merge branch 'master' into fix-s3-typo 2019-10-02 09:51:23 +02:00
Alexandre BODIN
5fd4d0ce49
Merge pull request #4160 from DrevanTonder/patch-1
Fix typo in graphql plugin documentation
2019-10-02 09:50:40 +02:00
Daniel Kvistgaard
66cdd9d068
Merge branch 'master' into bugfix/cloudinary-delete-resource-type 2019-10-02 09:34:20 +02:00
websocket98765
9f84db73df
Merge branch 'master' into fix-s3-typo 2019-10-02 01:59:04 +00:00
websocket98765
acf5d7c08e
Update README.md 2019-10-02 01:52:44 +00:00
Andre van Tonder
9cbfaac465
Fix typo in strapi install command for graphql
Yeah, I don't think installing the documentation plugin will install graphql
2019-10-02 07:42:42 +10:00
soupette
66104d9e11 Fix conflicts 2019-10-01 17:56:52 +02:00
soupette
f20532fd37 Fix PR feedback 2019-10-01 17:54:35 +02:00
Alexandre Bodin
0ad7a7e719 Improve graphql perf 2019-10-01 17:45:16 +02:00
Jim LAURIE
473d700208
Merge pull request #4155 from strapi/fix/#4127
Fix links in the content manager
2019-10-01 17:15:25 +02:00
soupette
2dc5df9595 Fix #4127 2019-10-01 16:25:08 +02:00
Jim LAURIE
ea0b72fe00
Merge pull request #4154 from slatham/master
Fixed broken privacy policy link
2019-10-01 15:46:15 +02:00
Alexandre Bodin
84746b8118 Add server admin panel option to strapi server to disable file serving when running development server 2019-10-01 15:43:44 +02:00
Jim LAURIE
5997793451
Merge branch 'master' into master 2019-10-01 15:22:43 +02:00
Stephen Latham
8b4a016d2e Issue #4133 fixed - Changed the to parameter from policy to privacy 2019-10-01 11:53:09 +01:00
Alexandre BODIN
fdb8ea7102
Merge pull request #4153 from strapi/fix/self-referencing-many-way
Fix manyWay relation with self content type.
2019-10-01 12:49:24 +02:00
Alexandre BODIN
0590ba2dcc
Merge branch 'master' into fix/self-referencing-many-way 2019-10-01 12:49:18 +02:00
soupette
cf8bcf627b Fix manyWay with self ct 2019-10-01 12:42:42 +02:00
Alexandre Bodin
dbd621e6d8 v3.0.0-beta.16.7 2019-10-01 12:15:48 +02:00
Josh Rose
5012687b41
fix: Correctly quote column names 2019-09-30 17:33:07 +02:00
Alexandre Bodin
080951496b Merge branch 'master' of github.com:strapi/strapi into develop 2019-09-30 10:26:34 +02:00
Alexandre BODIN
a516e197b4
Merge pull request #4125 from strapi/fix/default-datetime
Do not set default timestamp value for date types
v3.0.0-beta.16.7
2019-09-30 10:06:09 +02:00
Alexandre Bodin
8809766d1a Do not set default timestamp value for date types 2019-09-27 20:08:34 +02:00
Alexandre BODIN
0ee4124fb5
Merge pull request #3926 from strapi/fix/scrollbar
Vertical scrollbar shown for accessibility
2019-09-27 19:53:52 +02:00
soupette
616c2def34 Apply PR feedback 2019-09-27 16:29:05 +02:00
soupette
691f8a6318 Merge branch 'develop' of github.com:strapi/strapi into stm/update 2019-09-27 16:26:21 +02:00
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