29765 Commits

Author SHA1 Message Date
Karthikeyan Palaniswamy
5493c65a9c Delete Auth & Permission key from de.json because it is not listed in en.json. 2019-10-05 15:21:08 +02:00
Jim LAURIE
8e2a6ec256
Merge pull request #4191 from FailedSitcom/master
Fix image url when using a third party
2019-10-05 14:13:13 +02:00
Jim LAURIE
b76b264e19 Merge branch 'doc-update/users-permissions-plugin' of github.com:strapi/strapi into doc-update/users-permissions-plugin 2019-10-05 12:05:22 +02:00
Jim LAURIE
bf1b7b8562 Fix typo - apply PR feedback 2019-10-05 12:04:50 +02:00
Jim LAURIE
35a22d8616
Merge branch 'documentation-update' into doc-update/users-permissions-plugin 2019-10-05 11:16:27 +02:00
Samuel Durkin
ffdde168c5 only add backend host as prefix if local server upload when getting singular upload 2019-10-04 19:06:01 +02:00
Ivo Bathke
5877ff93d0 fixed typo in de.json and removed unneccesary whitespace in model generator 2019-10-04 17:48:45 +02:00
Virginie Ky
cde0369024 content manager displayed fields dropdown ui 2019-10-04 15:41:23 +02:00
Virginie Ky
53efb1269b content manager filters ui 2019-10-04 15:23:50 +02:00
Alexandre BODIN
714b6c9045
Merge pull request #4152 from strapi/chore/admin-development
Allow admin customization
2019-10-04 15:07:40 +02:00
Jim LAURIE
cd60609887
Fix file path for translations 2019-10-04 15:05:58 +02:00
Alexandre BODIN
1a49d1a51e
Merge pull request #3691 from DKvistgaard/bugfix/cloudinary-delete-resource-type
Fix Cloudinary deletion of other files than images
2019-10-04 14:44:09 +02:00
Alexandre BODIN
c6e7475a44
Merge pull request #3843 from sajjad-shirazy/patch-1
Ability to pass OAuth callback dynamically
2019-10-04 14:42:32 +02:00
Alexandre BODIN
cf58f742ef
Merge branch 'master' into patch-1 2019-10-04 14:41:08 +02:00
Alexandre Bodin
2d04d25097 v3.0.0-beta.16.8 v3.0.0-beta.16.8 2019-10-04 11:57:46 +02:00
Alexandre BODIN
8268a41503
Merge pull request #4185 from strapi/fix/mongo-id-serialize
Fix sanitize bug with mongo objectid and use lower-case for getModel
2019-10-04 11:56:12 +02:00
Alexandre Bodin
444ce89b19 Fix sanitize bug with mongo objectid and use lower-case for getModel 2019-10-04 11:38:54 +02:00
Alexandre Bodin
ba828dc8f6 Merge branch 'master' into chore/admin-development 2019-10-04 09:46:06 +02:00
Alexandre BODIN
5bc4a0b424
Merge pull request #4158 from strapi/fix/improve-graphql-perf
Improve graphql perf
2019-10-04 09:43:38 +02:00
Alexandre BODIN
82f464dd61
Merge branch 'master' into fix/improve-graphql-perf 2019-10-04 09:43:31 +02:00
Alexandre BODIN
ddce768d75
Merge pull request #4177 from strapi/doc-update/documentation-plugin
Move the documentation plugin in a plugins section
2019-10-04 09:27:41 +02:00
Jim LAURIE
9cbab5d4bb Move the users permissions plugin in a plugins section 2019-10-03 17:59:56 +02:00
Jim LAURIE
75dfd95946 Move the documentation plugin in a plugins section 2019-10-03 17:28:37 +02:00
Jim LAURIE
097ccbf3ac Remove old assets 2019-10-03 16:58:54 +02:00
Jim LAURIE
c463b6b149
Merge pull request #4175 from Lajcik007/master
Fix on no attachments in mails
2019-10-03 15:06:21 +02:00
Michał Powałka
6d6a0c6939 no attachment problem solved 2019-10-03 13:42:32 +02:00
soupette
2e7e7def33 Fix context in Edipage and children 2019-10-03 12:58:20 +02:00
soupette
743545606b Remove useless lifecycle in App and update its suffixURL 2019-10-03 11:54:23 +02:00
soupette
590ef49ec1 Fix HomePage contexts and update context api 2019-10-03 11:48:24 +02:00
soupette
5c42e43d4f Merge branch 'develop' of github.com:strapi/strapi into styled-component/ctb 2019-10-03 11:09:48 +02:00
cyril lopez
39988b3efb
Merge branch 'master' into develop 2019-10-03 10:47:25 +02:00
cyril lopez
e39de27061
Merge pull request #4011 from strapi/front/context-api
Update Context API
2019-10-02 18:56:14 +02:00
cyril lopez
52e700d1ca
Merge branch 'develop' into front/context-api 2019-10-02 18:09:13 +02:00
cyril lopez
9bed48d886
Merge branch 'master' into chore/admin-development 2019-10-02 17:45:57 +02:00
soupette
c2a8b49121 Fix PR feedback 2019-10-02 17:45:09 +02:00
Alexandre BODIN
5de4d9ea80
Merge pull request #4167 from strapi/update/heroku-button
Remove Heroku button
2019-10-02 17:37:44 +02:00
Jim LAURIE
fa10c384b6
Remove Heroku button 2019-10-02 17:29:04 +02:00
soupette
6b0acc7b8e Remove settings-manager 2019-10-02 17:27:22 +02:00
Alexandre BODIN
8f90b2644f
Merge branch 'master' into fix/improve-graphql-perf 2019-10-02 17:05:30 +02:00
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