赵兵
|
04523d9637
|
Fix package.json wrong update
|
2019-09-10 16:26:59 +08:00 |
|
Alexandre BODIN
|
0c3bba055b
|
Merge branch 'master' into patch-1
|
2019-09-10 10:22:41 +02:00 |
|
赵兵
|
a462fab945
|
Merge remote-tracking branch 'upstream/master' into patch-1
|
2019-09-10 16:14:38 +08:00 |
|
Alexandre BODIN
|
c0794549a5
|
Merge pull request #3930 from websocket98765/patch-1
Fix comma in JSON example
|
2019-09-10 10:08:17 +02:00 |
|
Alexandre BODIN
|
d560fa9e89
|
Merge branch 'master' into patch-1
|
2019-09-10 10:08:04 +02:00 |
|
Alexandre BODIN
|
5b3e1c719a
|
Merge pull request #3932 from tsheils/patch-1
Update migration-guide-beta.15-to-beta.16.md
|
2019-09-10 10:07:11 +02:00 |
|
Alexandre BODIN
|
7b7f2a4bfa
|
Merge branch 'master' into patch-1
|
2019-09-10 10:06:57 +02:00 |
|
soupette
|
b7b8e368a2
|
Fixes #3942
|
2019-09-10 09:06:26 +02:00 |
|
Peter Zhao
|
b3a6ad4f23
|
Add zh-Hans translations of new feature
|
2019-09-10 14:29:03 +08:00 |
|
Alexandre BODIN
|
c0b085e5f4
|
Merge branch 'master' into patch-1
|
2019-09-10 00:33:07 +02:00 |
|
Alexandre BODIN
|
435a0679d7
|
Merge pull request #3938 from websocket98765/websocket98765-patch-enjson-fix
Fix typo in en.json
|
2019-09-10 00:32:30 +02:00 |
|
websocket98765
|
71b2993f33
|
Fix typo in en.json
Fixs `Make you sure you understand` to `Make sure you understand`.
|
2019-09-09 22:29:02 +00:00 |
|
sheva
|
4d20d657db
|
Adding custom travis configuration for utf-8
|
2019-09-09 23:30:07 +02:00 |
|
sheva
|
dade405e0c
|
Removing utf8mb4
|
2019-09-09 23:01:50 +02:00 |
|
sheva
|
2462958aff
|
Updating bookshelf after merge v.3.0.0-beta.16
|
2019-09-09 22:16:01 +02:00 |
|
sheva
|
23b4b91fe3
|
Merge branch 'master' into fix/3874-bookshelf-unicode-fix
# Conflicts:
# packages/strapi/lib/core-api/queries/bookshelf.js
|
2019-09-09 21:29:53 +02:00 |
|
Tim Sheils
|
08d4797754
|
Update migration-guide-beta.15-to-beta.16.md
minor grammatical/readibility changes
|
2019-09-09 14:12:34 -04:00 |
|
websocket98765
|
dbf977184d
|
Fix comma in JSON example
|
2019-09-09 17:46:32 +00:00 |
|
davidkartuzinski
|
464ad872a5
|
standardized punctuation for steps, and replaced two images
|
2019-09-09 19:15:18 +02:00 |
|
soupette
|
b3bc4a0941
|
Remove willSecure and didGetSecured data hooks
|
2019-09-09 18:44:41 +02:00 |
|
Alexandre BODIN
|
eec3acfa63
|
Merge pull request #3923 from strapi/front/qa
Content manager update field infos display on editview
|
2019-09-09 17:47:43 +02:00 |
|
Alexandre BODIN
|
32d3df8fbb
|
Merge branch 'master' into front/qa
|
2019-09-09 17:46:59 +02:00 |
|
davidkartuzinski
|
4a87d83887
|
Fix conflict
|
2019-09-09 17:42:39 +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 |
|
Alexandre BODIN
|
67478ffdd7
|
Merge branch 'master' into eslint-update
|
2019-09-09 16:51:51 +02:00 |
|
Abdón Rodríguez Davila
|
d4b72a958c
|
Merge branch 'master' into eslint-update
# Conflicts:
# yarn.lock
|
2019-09-09 16:45:56 +02:00 |
|
soupette
|
22bf28431f
|
Use global props instead of admin s ones
|
2019-09-09 16:45:25 +02:00 |
|
Alexandre BODIN
|
7fe97b3e54
|
Merge pull request #3892 from shabab477/bugfix/cli-creating-extra-model-folder
Fix issue with duplicate model folder getting created when generating model with api option
|
2019-09-09 16:45:22 +02:00 |
|
Alexandre BODIN
|
1a9f4e8e59
|
Merge branch 'master' into bugfix/cli-creating-extra-model-folder
|
2019-09-09 16:45:15 +02:00 |
|
Alexandre BODIN
|
d3cf6fd613
|
Merge pull request #3855 from abdonrd/koa-update
Update koa dependencies
|
2019-09-09 16:41:45 +02:00 |
|
davidkartuzinski
|
ace4c2439a
|
Returns on PR fixed
|
2019-09-09 16:27:42 +02:00 |
|
soupette
|
e1b0f07655
|
Global single request
|
2019-09-09 16:06:54 +02:00 |
|
Abdón Rodríguez Davila
|
315399527a
|
Fix missed lint error
|
2019-09-09 15:32:02 +02:00 |
|
Abdón Rodríguez Davila
|
118691808b
|
Update ESLint to v6.3
|
2019-09-09 15:28:59 +02:00 |
|
soupette
|
6e559170f7
|
Update tests
|
2019-09-09 15:27:54 +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 |
|
Natalia Tsvetkova
|
92f00de254
|
Merge branch 'master' into feature/instagram_provider
|
2019-09-09 14:59:21 +02:00 |
|
Abdón Rodríguez Davila
|
1015540af9
|
Update koa dependencies
|
2019-09-09 14:39:57 +02:00 |
|
Alexandre BODIN
|
1593c122c6
|
Merge branch 'master' into bugfix/cli-creating-extra-model-folder
|
2019-09-09 14:38:48 +02:00 |
|
soupette
|
99cb1f8f5e
|
Add all views
|
2019-09-09 14:32:06 +02:00 |
|
Alexandre BODIN
|
d65e60e94d
|
Merge pull request #3852 from strapi/fix/fr_template
Revert and fix the feature request template
|
2019-09-09 14:31:35 +02:00 |
|
Alexandre BODIN
|
b0433e03f5
|
Merge branch 'master' into fix/fr_template
|
2019-09-09 14:31:14 +02:00 |
|
Alexandre Bodin
|
2530606e47
|
Merge branch 'master' into chore/routing-x-forwarded
|
2019-09-09 14:29:07 +02:00 |
|
Alexandre BODIN
|
a9ad27f351
|
Merge branch 'develop' into chore/routing-x-forwarded
|
2019-09-09 14:25:48 +02:00 |
|
Alexandre BODIN
|
47cd741705
|
Merge branch 'master' into patch-1
|
2019-09-09 14:22:57 +02:00 |
|
soupette
|
1cd7084a94
|
Move auth views to the admin
|
2019-09-09 13:58:07 +02:00 |
|
Jim LAURIE
|
f00be91230
|
Merge pull request #3915 from strapi/readme
Readme to change image, and fix installation commands
|
2019-09-09 13:42:16 +02:00 |
|