soupette
1544cdf877
Fix PR feedback
2019-04-09 18:35:49 +02:00
Jim LAURIE
b31d36b99d
Merge pull request #2994 from Getriax/TRIM_MODEL
...
Trim content builder model attributes
2019-04-09 18:26:53 +02:00
soupette
f413decdcc
Fix cypress tests
2019-04-09 18:07:47 +02:00
Jim LAURIE
b47fccd570
Merge branch 'master' into TRIM_MODEL
2019-04-09 17:34:44 +02:00
Jim LAURIE
b1fd88c5ef
Merge pull request #3100 from strapi/heroku-documentation
...
Documentation - Deploying on Heroku with PostgresSQL / MongoDB with Strapi
2019-04-09 17:32:39 +02:00
Alexandre BODIN
34c0ceac22
Merge branch 'master' into fix/#3084
2019-04-09 17:05:43 +02:00
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
cyril lopez
2e3d004d90
Merge branch 'master' into good-old-issues-fixing-before-the-beta
2019-04-09 12:06:13 +02:00
cyril lopez
930c0c2feb
Merge branch 'master' into heroku-documentation
2019-04-09 11:36:11 +02:00
davidkartuzinski
509fb3052a
Final requested changes before Merge. Fixed Database to Databases references.
2019-04-09 11:32:22 +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
davidkartuzinski
1da784fa40
Addresses comment https://github.com/strapi/strapi/pull/3100#discussion_r272977863 by @derrickmehaffy and adds a Note regarding using SQLite with Heroku.
2019-04-08 19:27:42 +02:00
soupette
85bec881fc
Remove babel from back jest config
2019-04-08 19:03:55 +02:00
davidkartuzinski
2addd01a97
Additional clarification to using versioning and other minor changes such as broken links and a file name change - IE. Database.md to Databases.md
2019-04-08 18:52:37 +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
davidkartuzinski
241b1a2884
Add heroku documentation
2019-04-08 10:42:48 +02:00
DMehaffy
d1fd29fbdb
one more
2019-04-05 09:41:44 -07:00
DMehaffy
246fa553da
remove _in test
2019-04-05 08:15:33 -07: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
DMehaffy
f92f76dd59
I have no idea if this is right
2019-04-05 07:45:56 -07:00
soupette
057da77b05
Add new plugin for class properties
2019-04-05 15:51:16 +02:00
Derrick Mehaffy
88e1ce2c57
Fix return of long type
2019-04-05 06:17:20 -07:00
Derrick Mehaffy
457e689297
Add GraphQL-Type-Long to types
2019-04-05 05:51:09 -07: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
04e7ff65c0
Fixes #2490
2019-04-05 00:35:12 +02:00
soupette
0e3632b8b2
Fixes #3054
2019-04-05 00:10:06 +02:00
soupette
f344a1082a
Fixes #3085
2019-04-04 23:41:53 +02:00
soupette
0375cec220
Merge branch 'improve/ctb' of github.com:strapi/strapi into good-old-issues-fixing-before-the-beta
2019-04-04 23:35:08 +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
Alexandre Bodin
865664315f
Apply feedbacks
2019-04-04 12:41:57 +02:00
Alexandre Bodin
7c6206f1a2
Remove old code
2019-04-04 12:41:57 +02:00
Alexandre Bodin
72e7d34a14
Use SQL alias to allow for the same table name multiple times in the same query
2019-04-04 12:41:57 +02:00
