yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-13 19:27:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,892 Commits 117 Branches 489 Tags
Commit Graph

1669 Commits

Author SHA1 Message Date
cyril lopez
83a6fe44e4
Merge branch 'master' into front/context-api 2019-09-23 09:38:26 +02:00
Virginie Ky
230ba6b41f merge master 2019-09-19 17:09:29 +02:00
Virginie Ky
92f71d777d reviews feedback 2019-09-19 10:17:20 +02:00
HuyNQ
712848b378
Fix filterOption of SelectMany to enable searching in multiple select 2019-09-19 11:02:47 +07:00
Virginie Ky
1a82ba625e constant naming 2019-09-18 18:56:04 +02:00
Virginie Ky
dfe3922ca7 add const 2019-09-18 18:25:50 +02:00
Virginie Ky
0c6508af52 count fix 2019-09-18 18:11:31 +02:00
Alexandre Bodin
bf7870de3b Merge branch 'master' of github.com:strapi/strapi into chore/routing-x-forwarded 2019-09-18 17:29:09 +02:00
Alexandre Bodin
84adbf3bcf v3.0.0-beta.16.5 2019-09-18 14:00:21 +02:00
Alexandre BODIN
7a94d9dad9
Merge branch 'master' into chore/routing-x-forwarded 2019-09-18 13:27:39 +02:00
cyril lopez
6c8a446e0c
Merge branch 'master' into front/context-api 2019-09-17 13:36:59 +02:00
Alexandre Bodin
df236d0642 v3.0.0-beta.16.4 2019-09-17 12:14:39 +02:00
Alexandre BODIN
f8bfb636cd
Merge branch 'master' into fix/group-navigation 2019-09-17 10:46:13 +02:00
Alexandre BODIN
67ed10a56f
Merge branch 'master' into fix/#4026 2019-09-17 10:42:24 +02:00
soupette
8ad1256fab Fixes #4026 2019-09-17 10:22:20 +02:00
cyril lopez
8657453ea2
Merge branch 'master' into eslint-update 2019-09-17 10:11:11 +02:00
Alexandre BODIN
8a6c162095
Merge branch 'master' into chore/routing-x-forwarded 2019-09-16 23:07:54 +02:00
soupette
d2c8d5e419 Fixes #4013 2019-09-16 17:47:43 +02:00
soupette
6494a3dd07 Merge branch 'master' of github.com:strapi/strapi into front/context-api 2019-09-16 13:52:59 +02:00
Alexandre BODIN
c66eb5d2cf
Merge branch 'master' into chore/routing-x-forwarded 2019-09-13 17:40:50 +02:00
soupette
c971ab5ada Remove all context api in all plugins except users 2019-09-13 17:05:21 +02:00
virginieky
5fc8600506
Merge branch 'master' into features/media-preview 2019-09-13 16:16:36 +02:00
Virginie Ky
1b53286c71 merge 2019-09-13 16:05:10 +02:00
Virginie Ky
4f9065f19e last review apply 2019-09-13 16:04:15 +02:00
Alexandre Bodin
36e4e73ad3 v3.0.0-beta.16.3 2019-09-13 15:08:44 +02:00
soupette
9ad9fafd6b Fixes #3987 #3954 2019-09-13 14:46:31 +02:00
Alexandre BODIN
09a227c3d8
Merge branch 'master' into fix/json-array-pg 2019-09-13 10:56:28 +02:00
Alexandre Bodin
852be46911 Stringify json input for pg to support arrays 2019-09-13 10:41:21 +02:00
Alexandre Bodin
ae6492dab2 Allow group mainField and defaultSortBy to be id 2019-09-13 10:36:48 +02:00
Alexandre BODIN
b11e9375c9
Merge branch 'master' into features/media-preview 2019-09-13 10:19:55 +02:00
Abdón Rodríguez Davila
54c383fd44
Merge branch 'master' into eslint-update 2019-09-12 15:05:53 +02:00
Alexandre Bodin
e20d781383 Merge branch 'master' into chore/routing-x-forwarded 2019-09-12 09:59:11 +02:00
Alexandre Bodin
7207184648 v3.0.0-beta.16.2 2019-09-11 19:22:05 +02:00
Virginie Ky
c21f9272f6 media border 2019-09-11 10:36:27 +02:00
Virginie Ky
395f82a128 PR feedbacks 2019-09-11 10:07:25 +02:00
soupette
a8dae57806 Merge branch 'master' of github.com:strapi/strapi into front/auth-views 2019-09-10 17:52:20 +02:00
Alexandre Bodin
7d51b8625d v3.0.0-beta.16.1 2019-09-10 16:33:22 +02:00
Alexandre BODIN
7e9adb789f
Merge branch 'master' into eslint-update 2019-09-10 16:29:46 +02:00
soupette
55ea54608d Merge branch 'master' of github.com:strapi/strapi into front/auth-views 2019-09-10 12:19:54 +02:00
soupette
869cde8f19 Fix rerender issue in the admin 2019-09-10 12:14:07 +02:00
soupette
c5fd30e314 Fix WYSIWYG preview 2019-09-10 10:39:57 +02:00
赵兵
a462fab945 Merge remote-tracking branch 'upstream/master' into patch-1 2019-09-10 16:14:38 +08:00
Peter Zhao
b3a6ad4f23
Add zh-Hans translations of new feature 2019-09-10 14:29:03 +08:00
soupette
b3bc4a0941 Remove willSecure and didGetSecured data hooks 2019-09-09 18:44:41 +02:00
Alexandre BODIN
32d3df8fbb
Merge branch 'master' into front/qa 2019-09-09 17:46:59 +02:00
soupette
76560a1c9c Merge branch 'master' of github.com:strapi/strapi into front/auth-views 2019-09-09 17:29:47 +02:00
Virginie Ky
01045a5a1b content manager update field infos on editview UI fix 2019-09-09 17:23:56 +02:00
soupette
8485657342 Move global data to the app container and update plugins 2019-09-09 17:12:01 +02:00
Virginie Ky
a60f1d1ba0 qa fixes 2019-09-09 16:56:46 +02:00
Abdón Rodríguez Davila
187a669d1e Merge branch 'master' into eslint-update 
# Conflicts:
#	.eslintrc.js
#	package.json
#	packages/strapi-admin/admin/src/containers/HomePage/CommunityContent.js
#	packages/strapi-admin/admin/src/containers/HomePage/WelcomeContent.js
#	packages/strapi-helper-plugin/lib/src/components/InputTextWithErrors/index.js
#	packages/strapi-hook-bookshelf/lib/index.js
#	packages/strapi-hook-bookshelf/lib/utils/graphql.js
#	packages/strapi-hook-bookshelf/lib/utils/index.js
#	packages/strapi-plugin-content-manager/admin/src/components/FilterOptions/InputWithAutoFocus.js
#	packages/strapi-plugin-content-manager/admin/src/components/SelectMany/index.js
#	packages/strapi-plugin-content-manager/admin/src/components/SelectOne/index.js
#	packages/strapi-plugin-content-manager/admin/src/components/TableHeader/index.js
#	packages/strapi-plugin-content-manager/admin/src/containers/ListPage/index.js
#	packages/strapi-plugin-content-manager/admin/src/containers/SettingPage/index.js
#	packages/strapi-plugin-content-manager/config/policies/routing.js
#	packages/strapi-plugin-content-manager/services/ContentManager.js
#	packages/strapi-plugin-content-type-builder/admin/src/components/TableListRow/index.js
#	packages/strapi-plugin-content-type-builder/admin/src/containers/AttributesPickerModal/index.js
#	packages/strapi-utils/lib/models.js
#	yarn.lock
 2019-09-09 15:26:35 +02:00