7565 Commits

Author SHA1 Message Date
Jim LAURIE
def65ba152
Merge pull request #3141 from strapi/fix/limit-100
Set the fetch limit to 100 by default and add a default param
2019-04-18 11:12:23 +02:00
Jim LAURIE
c44818e072
Merge branch 'master' into fix/limit-100 2019-04-18 10:03:55 +02:00
Jim LAURIE
a5322a1e32
Merge pull request #3151 from strapi/fix/graphql-loaders-merging
Fix issue with graphql loaders
2019-04-17 18:28:31 +02:00
Jim LAURIE
4aef7eb4df
Merge branch 'master' into fix/graphql-loaders-merging 2019-04-17 17:56:07 +02:00
Jim LAURIE
34baf02602
Merge pull request #3152 from strapi/fix/relation-column
Fix column name for many to many relations
2019-04-17 17:55:45 +02:00
Alexandre Bodin
99e6dc31aa Fix issue with graphql loaders 2019-04-17 16:27:25 +02:00
Jim LAURIE
0ad1c523d3 Fix #3144 column name for many to many relations 2019-04-17 16:10:38 +02:00
Alexandre Bodin
e2869f0b7e Set the fetch limit to 100 by default and add a default param 2019-04-16 17:25:27 +02:00
Jim LAURIE
b0f2b9b857
Merge pull request #3138 from strapi/3.0.0-alpha.26
3.0.0 alpha.26
2019-04-16 12:57:24 +02:00
Jim LAURIE
9405b84f54 Review some change log structure v3.0.0-alpha.26 2019-04-16 11:46:01 +02:00
Jim LAURIE
28e7c70f61 Add migration guide alpha.25 to alpha.26 2019-04-16 11:38:59 +02:00
Jim LAURIE
fd87e6353e 3.0.0-alpha.26 2019-04-16 11:13:14 +02:00
Jim LAURIE
0e86e1b130
Merge pull request #3118 from strapi/fix/ctb-redirect
Fix redirect when editing a model
2019-04-12 14:39:45 +02:00
Virginie Ky
395186d64e Fix PR feedback 2019-04-12 13:13:55 +02:00
Virginie Ky
3120b4dc49 Fix redirect when editing a model 2019-04-12 13:10:49 +02:00
Jim LAURIE
a3b95e0d37
Merge pull request #2945 from AminZibayi/patch-2
Add necessary spaces before the list items
2019-04-12 12:03:55 +02:00
Jim LAURIE
c4353c3405
Merge branch 'master' into patch-2 2019-04-12 12:03:36 +02:00
Jim LAURIE
919734b01a
Merge pull request #3116 from strapi/remove-tbd
Removed empty "TBD" sections from deployment.md
2019-04-11 17:08:28 +02:00
davidkartuzinski
de4aebacdc Removed empty sections from deployment.md 2019-04-11 16:55:01 +02:00
Jim LAURIE
89a218d2fb
Merge pull request #3050 from strapi/feature/deep-filtering-sql-aliases
Use SQL aliases to allow for the same table name multiple times in a query
2019-04-10 13:46:59 +02:00
Jim LAURIE
e252182be8
Merge branch 'master' into feature/deep-filtering-sql-aliases 2019-04-10 11:46:23 +02:00
Jim LAURIE
dca7cb1c35
Merge pull request #3111 from strapi/lauriejim-patch-1
Remove hiring banner from readme
2019-04-10 11:44:59 +02:00
Jim LAURIE
b67a3501d3
Merge branch 'master' into lauriejim-patch-1 2019-04-10 11:44:53 +02:00
Jim LAURIE
86d45f29db
Merge pull request #3110 from strapi/heroku-gitignore
Add gitignore step in Heroku tutorial
2019-04-10 11:44:39 +02:00
Jim LAURIE
29ab3fe662
Merge branch 'master' into heroku-gitignore 2019-04-10 11:44:31 +02:00
Jim LAURIE
d285de7bc2
Merge pull request #3088 from strapi/good-old-issues-fixing-before-the-beta
Good old issues fixing before the beta
2019-04-10 11:44:15 +02:00
Jim LAURIE
587ff1108b
Merge branch 'master' into good-old-issues-fixing-before-the-beta 2019-04-10 11:31:17 +02:00
Jim LAURIE
35681c1e1d
Merge pull request #3090 from strapi/fix/#3084
Fix big integer support on GraphQL
2019-04-10 11:31:05 +02:00
Jim LAURIE
8eb7892877
Remove hiring banner 2019-04-10 11:05:11 +02:00
Pierre Burgy
302de96811 Add gitignore step in Heroku tutorial 2019-04-10 10:58:51 +02:00
Jim LAURIE
053730190f
Merge branch 'master' into fix/#3084 2019-04-10 10:49:26 +02:00
cyril lopez
5d59572d0d
Merge branch 'master' into good-old-issues-fixing-before-the-beta 2019-04-09 18:39:37 +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
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
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
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