soupette
a2192c1dec
Fix conflicts
2019-04-09 16:01:01 +02:00
soupette
c60457f3c7
Fix conflicts
2019-04-09 14:22:13 +02:00
soupette
e56e46e030
Split admin and users.
...
Co-authored-by: lauriejim
2019-04-09 12:09:03 +02:00
Jim LAURIE
6ec2b17e80
Merge pull request #2954 from strapi/improve/ctb
...
Content type builder Front-end refactoring
2019-04-09 10:46:44 +02:00
virginieky
8a5eab41f8
Merge pull request #3076 from strapi/front/admin-new-hook-architecture-admin-rework
...
Front/admin new hook architecture admin rework
2019-04-09 09:55:46 +02:00
soupette
9ea1eb4821
Fix PR feedback
2019-04-08 20:07:06 +02:00
soupette
3c108fe555
Fix PR feedback
2019-04-08 20:04:30 +02:00
soupette
82459b4726
Fix PR feedback
2019-04-08 19:54:30 +02:00
soupette
85bec881fc
Remove babel from back jest config
2019-04-08 19:03:55 +02:00
soupette
7027606a1d
Merge branch 'master' of github.com:strapi/strapi into improve/ctb
2019-04-08 17:16:06 +02:00
soupette
59b95280ea
Remove front end test until we update the webpack configuration so it uses babel 7.
...
The front-end tests are broken in the CI because the backend needs jest v 24 with babel 7 and the front-end need jest 23 with babel 6. Since the webpack config will be entirely reworked it better to disable the tests in the CI until the webpack cinf is updated.
2019-04-08 17:15:20 +02:00
soupette
e5393acf66
Merge branch 'front/admin-new-hook-architecture' of github.com:strapi/strapi into front/admin-new-hook-architecture-admin-rework
2019-04-08 16:20:21 +02:00
cyril lopez
b124d327c1
Merge pull request #3073 from strapi/front/admin-new-hook-architecture-lifecycle
...
Front/admin new hook architecture lifecycle
2019-04-08 15:51:16 +02:00
soupette
fb1c404f56
Merge branch 'front/admin-new-hook-architecture' of github.com:strapi/strapi into front/admin-new-hook-architecture-lifecycle
2019-04-08 13:53:31 +02:00
cyril lopez
72af5c4e42
Merge pull request #3071 from strapi/front/admin-new-hook-architecture-load-plugin
...
Front/admin new hook architecture load plugin
2019-04-08 13:52:18 +02:00
soupette
2899e2a05d
Fix remove and edit
2019-04-08 13:51:18 +02:00
soupette
251256d09f
Remove useless false required in the model s attributes
2019-04-05 16:57:27 +02:00
soupette
8fa7332f03
Clean fields
2019-04-05 16:49:26 +02:00
soupette
057da77b05
Add new plugin for class properties
2019-04-05 15:51:16 +02:00
soupette
4e11597e1f
Remove threshold
2019-04-05 11:39:05 +02:00
soupette
f37f740aba
Fix PR feedback
2019-04-05 00:50:14 +02:00
soupette
55d0fbfeea
Remove the modal s auto opening after the submit of an edited field
2019-04-05 00:46:25 +02:00
soupette
c62da404a5
Merge branch 'improve/ctb' of github.com:strapi/strapi into improve/ctb
2019-04-04 19:28:25 +02:00
soupette
441a140106
Fix order on edit attribute
2019-04-04 19:27:31 +02:00
Jim LAURIE
500374d6c0
Merge pull request #3070 from strapi/front/admin-new-hook-architecture-update-generators
...
Front/admin new hook architecture update generators
2019-04-04 14:09:24 +02:00
soupette
1af75af8f0
Remove Loadable
2019-04-04 13:49:46 +02:00
Jim LAURIE
196fa038bd
Merge pull request #2961 from strapi/feature/deep-filtering-mongoose-bookshelf
...
Deep filtering
2019-04-04 12:40:58 +02:00
Jim LAURIE
abece404ca
Merge branch 'master' into feature/deep-filtering-mongoose-bookshelf
2019-04-04 12:06:12 +02:00
soupette
90682b9106
Fix conflicts
2019-04-03 19:37:38 +02:00
soupette
fcbd7f9ec6
Fix cypress test
2019-04-03 19:02:19 +02:00
soupette
59587d02cd
Fix forgot password views
2019-04-03 17:26:31 +02:00
soupette
c8d269aeca
Fix MarketPlace and plugin documentation proptypes error
2019-04-03 17:06:07 +02:00
soupette
44a00f9c75
Add all features to the new Admin container
2019-04-03 16:40:15 +02:00
Jim LAURIE
3ca5c28450
Merge pull request #3051 from MunGell/master
...
Update CONTRIBUTING.md with fixes of minor typos
2019-04-03 15:45:47 +02:00
Jim LAURIE
bde7847a9b
Merge branch 'master' into master
2019-04-03 15:45:38 +02:00
Jim LAURIE
1a0e1d3bb8
Trim
2019-04-03 15:45:13 +02:00
Jim LAURIE
2f524b9553
Merge pull request #3037 from strapi/enhance/db-event
...
Run the database event if the connection is established
2019-04-03 15:41:16 +02:00
Jim LAURIE
7aecbc3665
Merge branch 'master' into enhance/db-event
2019-04-03 15:41:08 +02:00
Jim LAURIE
c511aa6eff
Merge pull request #3003 from abdonrd/patch-2
...
Remove duplicated server
2019-04-03 15:39:41 +02:00
Jim LAURIE
f28fed0e69
Merge branch 'master' into patch-2
2019-04-03 15:39:33 +02:00
Jim LAURIE
f7fbd205f8
Merge pull request #3032 from siddhartha-crypto/patch-1
...
Community link is broken
2019-04-03 15:38:27 +02:00
Jim LAURIE
3ade552b08
Merge branch 'master' into patch-1
2019-04-03 15:38:19 +02:00
Jim LAURIE
d19cbbacf0
Merge branch 'master' into feature/deep-filtering-mongoose-bookshelf
2019-04-03 15:35:36 +02:00
soupette
d4027f7064
Pass store to the app
2019-04-03 14:18:56 +02:00
soupette
86fc4d59e3
Merge branch 'master' of github.com:strapi/strapi into front/admin-new-hook-architecture
2019-04-03 14:17:56 +02:00
soupette
5d0427e6c6
Update register plugin
2019-04-03 14:15:51 +02:00
soupette
95f936c8ce
Add Onboarding in new Admin container
2019-04-03 14:10:42 +02:00
Jim LAURIE
b73c69076e
Merge branch 'master' into master
2019-04-03 14:01:51 +02:00
Jim LAURIE
3c567e8378
Merge branch 'master' into improve/ctb
2019-04-03 13:51:03 +02:00
Jim LAURIE
a8a59678fe
Merge pull request #2999 from abdonrd/patch-1
...
Added comment to improve linting of generated service files
2019-04-03 13:47:33 +02:00
