yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-16 12:47:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,273 Commits 117 Branches 489 Tags
Commit Graph

9273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
1fe131017a Fix edit model, create group 2019-06-13 15:36:05 +02:00
Daniel Karski
f290196097
Fixed curl request to extract files and field 
With actual request files parametr is broken
And will throw error like in the  example below error couldn't open file "/path/to/pictures/avatar.jpg&refId=5a993616b8e66660e8baf45c&ref=user&source=users-permissions&field=avatar"
 2019-06-13 12:08:00 +02:00
Alexandre BODIN
dcb099d151
Merge branch 'master' into fix/bookshelf-delete-query 2019-06-13 10:03:35 +02:00
Alexandre BODIN
0ceb50ac6b
Merge pull request #3436 from strapi/fix/403-documentaton 
Fix beforeInitialize middlewares can modify order or middlewares
 2019-06-13 09:22:12 +02:00
Mahdi Dibaiee
749b01dd3f fix(core-api/bookshelf): delete query passed values to forge 2019-06-13 11:21:24 +04:30
Alexandre Bodin
8b8af57946 Fix beforeInitialize middlewares can modify order or middlewares 2019-06-12 22:29:12 +02:00
Alexandre Bodin
dd9182dfa2 Enable on develop only 2019-06-12 21:57:49 +02:00
Alexandre Bodin
03d6f55b93 Use curl trigger 2019-06-12 21:15:23 +02:00
Alexandre Bodin
bbf5a405ec v3.0.0-beta.4 v3.0.0-beta.4 2019-06-12 20:30:45 +02:00
soupette
c0ceedbb76 Init move ModelForm to the closest parent 2019-06-12 19:03:35 +02:00
Alexandre BODIN
dbcfbddc56
Merge pull request #3410 from strapi/tech/middleware-load 
Remove strapi.koaMiddlewares and simplify middleware ordering algorithm
 2019-06-12 18:34:48 +02:00
Alexandre BODIN
0d480fe11d
Merge branch 'master' into tech/middleware-load 2019-06-12 18:34:35 +02:00
Alexandre BODIN
238adabaf7
Merge pull request #3417 from strapi/fix/issue-3411 
Load extensions in graphql schemas
 2019-06-12 18:34:18 +02:00
Alexandre Bodin
34f56ee937 trying stuff 2019-06-12 18:17:38 +02:00
Alexandre Bodin
29d799810c init 2019-06-12 18:15:45 +02:00
soupette
d0a494f906 Merge branch 'front/ctb-modal-ui' of github.com:strapi/strapi into front/repeatable-homepage 2019-06-12 16:07:27 +02:00
soupette
57493d2629 Fix conflicts 2019-06-12 16:07:19 +02:00
Virginie Ky
a308503b07 Modal Header & Footer UI refont 2019-06-12 15:50:40 +02:00
cyril lopez
f701742223
Merge pull request #3419 from strapi/front/repeatable-fields-leftmenu 
Front/repeatable fields leftmenu
 2019-06-12 15:49:30 +02:00
Virginie Ky
c60d5308da apply review 2019-06-12 15:22:59 +02:00
soupette
732cc1a22d Fix List box shadow 2019-06-12 15:19:28 +02:00
soupette
a7bf58e4b4 Fix conflicts 2019-06-12 14:41:43 +02:00
Alexandre Bodin
50fc3a127f Add example in getstarted 2019-06-12 14:35:03 +02:00
Alexandre Bodin
c37ba583ba Load extensions 2019-06-12 14:35:03 +02:00
Jonas Broms
02ba3b0a7a
Update package.json 2019-06-12 15:32:47 +03:00
Alexandre BODIN
dc1594f856
Merge branch 'master' into tech/middleware-load 2019-06-12 14:20:40 +02:00
Alexandre BODIN
15daa6212c
Merge pull request #3432 from strapi/fix/3424 
Fixes #3224
 2019-06-12 11:48:18 +02:00
soupette
32dbeb3467 Fixes #3224 2019-06-12 11:24:20 +02:00
Virginie Ky
84ecec8140 merge from develop 2019-06-11 18:34:09 +02:00
Virginie Ky
844b140a18 CTB modals Footer 2019-06-11 18:29:52 +02:00
Alexandre Bodin
864a6ecaea Refactor middleware loading 2019-06-11 18:22:07 +02:00
Alexandre BODIN
9d8025ed27
Merge pull request #3426 from strapi/tech/handle-health-bad-status-code 
Add status code handler to health checks
 2019-06-11 18:17:02 +02:00
Alexandre BODIN
e39fb395d2
Merge branch 'master' into tech/handle-health-bad-status-code 2019-06-11 18:16:54 +02:00
Alexandre BODIN
e79e110add
Merge pull request #3416 from strapi/fix/custom-graphql-query 
Fix primaryKey not found for custom resolvers
 2019-06-11 18:16:14 +02:00
soupette
6c99392747 Update HP to display both groups ans cts 2019-06-11 18:12:57 +02:00
Alexandre Bodin
2311f7de3d Done 2019-06-11 17:53:01 +02:00
Alexandre Bodin
d9b396821d Fix primaryKey not found for custom resolvers 2019-06-11 15:01:46 +02:00
Alexandre BODIN
243f425fe9
Merge pull request #3422 from strapi/fix/graphql-amount-limiting 
Fix amountLimit in graphql queries
 2019-06-11 14:59:09 +02:00
Alexandre Bodin
3104204e20 Fix amountLimit in graphql queries 2019-06-11 13:56:24 +02:00
Virginie Ky
c4fc84fac9 ModelPage clean 2019-06-11 12:29:02 +02:00
soupette
0038505775 Fix leftmenui link active 2019-06-11 12:26:58 +02:00
Virginie Ky
6ae5ffdeb0 merge develop 2019-06-11 12:18:11 +02:00
Virginie Ky
e54aa64d4a delete old snapshot 2019-06-11 11:49:54 +02:00
Virginie Ky
761cf5eb1f Clean 2019-06-11 11:07:04 +02:00
Virginie Ky
8fc4e8d54e LeftMenu unit test 2019-06-10 18:22:20 +02:00
Virginie Ky
b961ef38b7 ModelPage Unit tests with context 2019-06-10 18:02:14 +02:00
Virginie Ky
7db8366492 CTB LeftMenu refont with groups 2019-06-10 17:38:10 +02:00
Alexandre BODIN
33cbe98b5f
Merge pull request #3401 from strapi/fix/sqlite-non-constant-default-timestamp 
Fix wrong param name in getType bookshelf hook
 2019-06-10 17:31:01 +02:00
Alexandre BODIN
d16c4ddffb
Merge branch 'master' into fix/sqlite-non-constant-default-timestamp 2019-06-10 17:08:22 +02:00
Alexandre BODIN
47e3f94d6c
Merge pull request #3407 from strapi/fix/ignore-marketplace-plugin-list-errors 
Fix error not ignored getPlugins
 2019-06-10 17:08:01 +02:00