3689 Commits

Author SHA1 Message Date
soupette
cc2bba8bbb Add suggested solutions in issue template 2018-03-30 10:34:38 +02:00
Jim LAURIE
a99a034c2e
Merge pull request #873 from strapi/update-github-templates
Update issue template
2018-03-29 10:42:23 +02:00
cyril lopez
364b022b1b
Fix typos 2018-03-29 10:41:08 +02:00
Jim Laurie
63b9810a35 Update issue template
Add bug and feature request template
2018-03-28 19:50:48 +02:00
Jim LAURIE
425746e79a
Merge pull request #857 from strapi/3.0.0-alpha.11.2
3.0.0-alpha.11.2
2018-03-27 18:13:48 +02:00
Jim Laurie
8390106f59 3.0.0-alpha.11.2 v3.0.0-alpha.11.2 2018-03-27 17:59:16 +02:00
Jim LAURIE
16628361f8
Merge pull request #856 from strapi/fix-pre-release
Fix pre release
2018-03-27 17:43:01 +02:00
Jim Laurie
bc39200cce Limit ssl options to mongoDB connection 2018-03-27 17:02:23 +02:00
Jim Laurie
5d03c350e4 Clean user model 2018-03-27 16:44:25 +02:00
Jim LAURIE
15dda2f2cb
Merge pull request #852 from thomas-j-moffett/fix-left-menu-link-container-scroll
Fixes #826
2018-03-27 15:14:51 +02:00
Jim LAURIE
ae71c340fe
Merge branch 'master' into fix-left-menu-link-container-scroll 2018-03-27 13:29:07 +02:00
Jim LAURIE
2b6cdb58b7
Merge pull request #851 from strapi/fix-ctm-redirect
Fixes #850
2018-03-27 13:28:34 +02:00
thomas-j-moffett
17440b2dd1
Fixes #826 2018-03-27 01:39:02 -07:00
cyril lopez
37eedd5747 Fix pagination 2018-03-27 10:27:50 +02:00
cyril lopez
b1e39929de Fixes #850 2018-03-27 10:13:13 +02:00
Jim LAURIE
b1e90d5136
Merge pull request #827 from msgeissler/patch-1
Updated version of node for alpha
2018-03-24 12:09:51 +01:00
Jim LAURIE
b1f5894801
Merge branch 'master' into patch-1 2018-03-24 11:55:56 +01:00
Jim LAURIE
9ff62a6144
Merge pull request #836 from nurikabe/master
Japanese "welcome" locale file
2018-03-24 11:53:37 +01:00
Jim LAURIE
9260746463
Merge branch 'master' into master 2018-03-24 11:15:16 +01:00
Jim LAURIE
ed202ba3e0
Merge pull request #835 from stevenkaspar/patch-1
Correct description to match example
2018-03-24 11:04:26 +01:00
Evan Owens
7e75679094
Merge branch 'master' into master 2018-03-23 13:45:52 -04:00
nurikabe
f701b3e53a Japanese "welcome" locale file 2018-03-23 13:43:18 -04:00
Jim LAURIE
edfce0c982
Merge branch 'master' into patch-1 2018-03-23 17:53:25 +01:00
Jim LAURIE
7cb0c790dc
Merge pull request #833 from Velua/patch-1
introduction of userObj
2018-03-23 17:53:04 +01:00
Jim LAURIE
2415122c26
Merge branch 'master' into patch-1 2018-03-23 17:38:22 +01:00
Jim LAURIE
2958893077
Merge pull request #821 from abdonrd/staging
Add staging environment config
2018-03-23 17:38:05 +01:00
Jim LAURIE
c59616cbd2
Merge branch 'master' into staging 2018-03-23 17:22:29 +01:00
Jim LAURIE
a1eab22311
Merge pull request #820 from nurikabe/master
Fix version command
2018-03-23 17:22:09 +01:00
Jim LAURIE
7f1f07742d
Merge branch 'master' into master 2018-03-23 17:06:18 +01:00
Jim LAURIE
9ba2f6803f
Merge pull request #808 from TheWebsDoor/fix-lodash-version
Add lodash to package.json to avoid version problem
2018-03-23 17:05:52 +01:00
Marcus Geißler
c6aade3951
Update node and npm engines settings
Synced minimum versions of node and npm with other documentations.
2018-03-23 17:02:26 +01:00
Marcus Geißler
da93565a84
Merge branch 'master' into patch-1 2018-03-23 17:02:05 +01:00
Jim LAURIE
1a0694a045
Merge branch 'master' into fix-lodash-version 2018-03-23 16:51:26 +01:00
Jim LAURIE
a56649b70b
Merge pull request #834 from strapi/disable-ga-option
Allow to disable GA
2018-03-23 15:25:45 +01:00
Jim LAURIE
49784fb72c
Merge branch 'master' into disable-ga-option 2018-03-23 15:11:31 +01:00
Steven Kaspar
e3f9772525
Correct description to match example
The description doesn't match the example. The example is correct
2018-03-23 08:39:38 -05:00
cyril lopez
19648b1a13 Allow to disable GA 2018-03-23 12:44:17 +01:00
John Williamson
1d603d1854
introduction of userObj
Mention of cbx.state.user is missing, added a bit of documentation mentioning it.
2018-03-23 21:29:23 +10:00
Jim LAURIE
88008ea900
Merge pull request #829 from strapi/fix-ctb-edit-relation
Fixes #828
2018-03-23 12:27:20 +01:00
cyril lopez
7553172cf0 Fixes #828 2018-03-22 12:57:21 +01:00
Marcus Geißler
2fb4373701
Updated version of node for alpha
Both the getting started page and the installation doc mention that the current alpha requires node version >= 9.
2018-03-21 22:23:18 +01:00
Abdón Rodríguez Davila
92503f8ad4 Update staging environment config similar as production 2018-03-20 21:46:02 +01:00
Abdón Rodríguez Davila
5c365f46a0 Rename test environment config to staging 2018-03-20 21:45:11 +01:00
Abdón Rodríguez Davila
f50b1670ec Update production environment config 2018-03-20 21:43:59 +01:00
Evan Owens
ab84809495 Fix version command 2018-03-20 11:53:45 -04:00
Jim LAURIE
b15c848cd8
Merge pull request #817 from Duske/patch-1
(doc) fix collection name in many-to-many example
2018-03-20 12:39:37 +01:00
Dustin
9c9225a8cd
(doc) fix collection name in many-to-many example
Not sure if I understand the example correctly, but with the given config it does not work for me.
Shouldn't be the collection names the other way round?
2018-03-20 12:17:07 +01:00
Jim LAURIE
e7dfc222fa
Merge pull request #812 from strapi/design/logout
Update styles.scss
2018-03-20 12:07:39 +01:00
Jim LAURIE
a1372e84df
Merge branch 'master' into design/logout 2018-03-20 11:49:02 +01:00
Jim LAURIE
717e86ba29
Delete comment 2018-03-20 11:48:50 +01:00