yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-11 18:27:22 +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
Alexandre BODIN
1dc53ff226
Merge pull request #4291 from lasseborly/patch-1 
Correct minor docs typos.
 2019-10-21 09:06:00 +02:00
Alexandre BODIN
fc068d38e9
Merge branch 'master' into graphql_policies_params 2019-10-21 09:03:23 +02:00
Veit Bjarsch
3a8c3055e4 added resolverOf and plugin key to graphql schema 2019-10-21 00:12:04 +02:00
Lasse Borly
9bd51b094f
Correct minor typos. 
flies -> files
constomization -> customization
 2019-10-20 01:07:15 +02:00
Don Masakayan
93319d8c47 Context params moved earlier 2019-10-19 19:33:06 +08:00
soupette
6a852ad6cb Fix conflicts 2019-10-18 15:51:44 +02:00
cyril lopez
fd38567bac
Merge pull request #4284 from strapi/fix/ui 
Fix UI
 2019-10-18 15:49:26 +02:00
Virginie Ky
4d22b721ae review done 2019-10-18 15:25:08 +02:00
Alexandre Bodin
b6feabf689 v3.0.0-beta.17.2 v3.0.0-beta.17.2 2019-10-18 13:42:22 +02:00
Alexandre BODIN
99a5d9ecc5
Merge pull request #4281 from strapi/fix/groups-issue-interupting 
Fix groups creation/update not working with null groups
 2019-10-18 13:27:18 +02:00
Alexandre BODIN
415bdcd806
Merge branch 'master' into fix/groups-issue-interupting 2019-10-18 13:27:07 +02:00
lucalionetti
5600db8e7f Update IT translation 
- Added missing from en file
- Updated some errors
 2019-10-18 13:18:16 +02:00
Ezekiel
b7859f4a9b Fixed Parameters typo (#4261) 2019-10-18 12:20:43 +02:00
Alexandre BODIN
862e4cd2ba
Merge pull request #4263 from JelmerV-WFC/fix/#3101 
Fixe cuts the content in WYSIWYG not reflecting on saving
 2019-10-18 12:20:08 +02:00
Alexandre BODIN
eefbf61403
Merge branch 'master' into fix/#3101 2019-10-18 12:20:01 +02:00
Alexandre BODIN
47abc07efa
Merge pull request #4275 from jontey/patch-1 
Fix typos
 2019-10-18 12:12:07 +02:00
Alexandre Bodin
02f98bc887 Fix groups creation/update not working when null group bofre in the loop 2019-10-18 11:20:51 +02:00
Virginie Ky
c4886d7936 review ip 2019-10-17 13:46:39 +02:00
Jonathan Tey
b35409cf5e
Fix spelling Eamil -> Email 2019-10-17 18:01:09 +08:00
soupette
75bd60162a Fix some elements 2019-10-17 08:29:33 +02:00
Don Masakayan
aa91ca7a96 Made ctx.params and ctx.query available to policies executed via graphql requests 2019-10-16 22:42:47 +08:00
Alexandre Bodin
f0ad2ab52c Merge branch 'master' into develop 2019-10-16 14:16:52 +02:00
Jelmer Visser
4babfb359f
Merge branch 'master' into fix/#3101 2019-10-16 13:13:19 +02:00
Alexandre Bodin
9f0713649b v3.0.0-beta.17.1 v3.0.0-beta.17.1 2019-10-16 11:42:54 +02:00
Alexandre BODIN
ea6630d5d4
Merge pull request #4269 from strapi/fix/create-quickstart-stderr 
Fix err.stderr not defined in quickstart
 2019-10-16 11:42:19 +02:00
Alexandre Bodin
3f68d45cd2 Fix err.stderr not defined 2019-10-16 11:37:42 +02:00
Alexandre Bodin
7c8eda443e v3.0.0-beta.17 v3.0.0-beta.17 2019-10-16 10:40:18 +02:00
Jelmer Visser
426ace6e0e
Merge branch 'master' into fix/#3101 2019-10-15 20:57:04 +02:00
Jelmer Visser
f91f3e4184 Fixes #3101 2019-10-15 20:37:15 +02:00
Alexandre Bodin
58f0706840 Fix localPluginsToCopy 2019-10-15 18:33:27 +02:00
Alexandre Bodin
866a612d41 Merge branch 'master' into develop 2019-10-15 17:48:45 +02:00
Alexandre BODIN
57b93e1dfa
Merge pull request #4258 from strapi/chore/improve-project-creation-error-diagnostic 
Improve project creation error diagnostic
 2019-10-15 17:46:50 +02:00
Alexandre BODIN
e749cdb613
Merge branch 'master' into chore/improve-project-creation-error-diagnostic 2019-10-15 17:46:41 +02:00
DMehaffy
32c161f287 Change enum regex message for special characters (#4255) 2019-10-15 17:20:50 +02:00
Alexandre Bodin
4e1ee0b5db Fix lint 2019-10-15 17:18:21 +02:00
Alexandre Bodin
c0683cad2f Remove eslint from project generation to gain speed and keep node compat 2019-10-15 17:18:20 +02:00
Alexandre Bodin
0367a55751 Improve sentry error analytics and startup message 2019-10-15 17:18:20 +02:00
Alexandre Bodin
85cd288526 Capture more detailed events 2019-10-15 17:18:19 +02:00
KalanyuZ
edbff44c82 Add GraphQL register/login (#3879) 
* Add GraphQL login

* Add GraphQL register

* Add graphql login/register/delete End2End test

* Update from requests

* Remove logging

* Update to beta.16

* Update

* Add error handling

* Util function

* Update
 2019-10-15 17:17:54 +02:00
Alexandre BODIN
8da5165a80
Merge pull request #4257 from strapi/webpack/update-image-loader 
Update image-webpack-loader configuration
 2019-10-15 14:58:41 +02:00
soupette
9be21dc9d9 Update image-webpack-loader config 2019-10-15 14:55:33 +02:00
soupette
774702af59 Fix conflicts 2019-10-15 14:09:11 +02:00
Alexandre BODIN
71c4745417
Merge pull request #4222 from strapi/fix/forgot-password-url 
Fix forgot password url
 2019-10-15 13:48:00 +02:00
cyril lopez
a9bc35ad27
Merge branch 'master' into develop 2019-10-15 12:45:33 +02:00
Alexandre BODIN
b121a0da4b
Merge pull request #4229 from strapi/update/plugin-generators 
Add front-end files in the plugin generator
 2019-10-15 12:44:10 +02:00
Alexandre BODIN
c69e3fd042
Merge branch 'master' into fix/forgot-password-url 2019-10-15 12:17:00 +02:00
soupette
5a79208f86 Remove compression plugin 2019-10-15 12:07:27 +02:00
soupette
9b0dda7e72 Fix PR feedback 2019-10-15 12:05:08 +02:00
Jim LAURIE
bd323c7cae Fix typo 2019-10-15 12:03:03 +02:00
Jim LAURIE
5ddb32222b Apply PR feedback 2019-10-15 11:56:13 +02:00