1304 Commits

Author SHA1 Message Date
Jim LAURIE
5997793451
Merge branch 'master' into master 2019-10-01 15:22:43 +02:00
Stephen Latham
8b4a016d2e Issue #4133 fixed - Changed the to parameter from policy to privacy 2019-10-01 11:53:09 +01:00
Alexandre Bodin
dbd621e6d8 v3.0.0-beta.16.7 2019-10-01 12:15:48 +02:00
Alexandre BODIN
84146362a7
Merge pull request #4081 from chiacode/master
Change Traditional Chinese flag in LocaleToggle
2019-09-27 15:33:24 +02:00
Erik Töyrä Silfverswärd
e3e185102d #4104 - Updates the url of the setting button for Content Manager PluginCard. 2019-09-26 17:29:33 +02:00
Alexandre Bodin
6305bee43b v3.0.0-beta.16.6 2019-09-26 14:35:06 +02:00
Casper S
706a27ad51
Update sv.json 2019-09-25 14:32:58 +02:00
Casper S
bc3ea2422b
Update sv.json 2019-09-25 14:31:18 +02:00
Casper S
0aacf1d834
Update sv.json 2019-09-25 14:29:33 +02:00
Casper S
010d7f6c9c
Update sv.json 2019-09-25 14:28:54 +02:00
Casper S
786253d0f4
Update sv.json 2019-09-25 14:28:14 +02:00
Casper S
7d60d34779
Update sv.json 2019-09-25 14:27:40 +02:00
Casper S
f181dc98e8
Update sv.json 2019-09-25 14:26:58 +02:00
Casper S
7a08ad3a81
Update sv.json 2019-09-25 14:26:28 +02:00
Casper S
a2b4108327
Update sv.json 2019-09-25 14:25:36 +02:00
Casper S
84c7fdba22
Update sv.json 2019-09-25 14:25:20 +02:00
Casper S
fa2f373d02
Update sv.json 2019-09-25 14:24:25 +02:00
Casper S
ade1861dbc
Update sv.json 2019-09-25 14:23:30 +02:00
Casper S
8ae0874710
Update sv.json 2019-09-25 14:22:36 +02:00
cyril lopez
14f1cc1714
Merge branch 'master' into patch-1 2019-09-24 17:40:42 +02:00
Alexandre BODIN
b3648ba4d9
Merge branch 'master' into chore/routing-x-forwarded 2019-09-24 10:04:19 +02:00
Chiahong
07f2282949
Update index.test.js 2019-09-23 23:33:44 +08:00
Chiahong
a8aa1a5ec2
Update flag 2019-09-23 23:32:59 +08:00
Alexandre BODIN
fe2a8f72bb
Merge pull request #3992 from fitztrev/patch-1
Update minimum webpack version for strapi-admin
2019-09-20 09:42:35 +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
Alexandre Bodin
df236d0642 v3.0.0-beta.16.4 2019-09-17 12:14:39 +02:00
cyril lopez
8657453ea2
Merge branch 'master' into eslint-update 2019-09-17 10:11:11 +02:00
Alexandre BODIN
c66eb5d2cf
Merge branch 'master' into chore/routing-x-forwarded 2019-09-13 17:40:50 +02:00
Trevor Fitzgerald
fd88eeb6db
Update minimum webpack version for strapi-admin 2019-09-13 10:54:40 -04:00
Alexandre Bodin
36e4e73ad3 v3.0.0-beta.16.3 2019-09-13 15:08:44 +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
soupette
a8dae57806 Merge branch 'master' of github.com:strapi/strapi into front/auth-views 2019-09-10 17:52:20 +02:00
soupette
535467be3c Fix PR feedback 2019-09-10 17:51:26 +02:00
soupette
93941e3d11 Delete useless container 2019-09-10 17:32:46 +02:00
Alexandre Bodin
7d51b8625d v3.0.0-beta.16.1 2019-09-10 16:33:22 +02:00
soupette
61a22c3a9b Fixes #3677 2019-09-10 12:33:21 +02:00
soupette
869cde8f19 Fix rerender issue in the admin 2019-09-10 12:14:07 +02:00
soupette
1e26065d95 Clean code and fix tests 2019-09-10 10:37:02 +02:00
soupette
b7b8e368a2 Fixes #3942 2019-09-10 09:06:26 +02:00
soupette
b3bc4a0941 Remove willSecure and didGetSecured data hooks 2019-09-09 18:44:41 +02:00
soupette
76560a1c9c Merge branch 'master' of github.com:strapi/strapi into front/auth-views 2019-09-09 17:29:47 +02:00
soupette
8485657342 Move global data to the app container and update plugins 2019-09-09 17:12:01 +02:00
soupette
22bf28431f Use global props instead of admin s ones 2019-09-09 16:45:25 +02:00
soupette
e1b0f07655 Global single request 2019-09-09 16:06:54 +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