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
Jim LAURIE
a1fa931d1c
Merge pull request #813 from strapi/design/logout-next
...
Update index.js
2018-03-20 11:47:48 +01:00
Aurélien GEORGET
17ef1682b1
Update index.js
2018-03-19 19:12:54 +01:00
Aurélien GEORGET
ca6077f9c9
Update styles.scss
2018-03-19 19:12:07 +01:00
Jim LAURIE
58ff40a432
Merge pull request #809 from strapi/fix/update-email
...
Update User.js
2018-03-19 18:35:41 +01:00
Jim LAURIE
2f182732dc
Merge branch 'master' into fix/update-email
2018-03-19 18:21:19 +01:00
Jim LAURIE
4d5e02cd8b
Merge pull request #811 from strapi/ga-admin
...
Add ga in admin to improve Strapi
2018-03-19 18:20:57 +01:00
Jim LAURIE
46bcadaae5
Fix PR feedback
2018-03-19 18:00:04 +01:00
Jim LAURIE
792b909b85
Merge branch 'master' into ga-admin
2018-03-19 17:48:31 +01:00
Jim Laurie
9017c0d1d0
Add ga in admin to improve Strapi
2018-03-19 17:45:33 +01:00
Aurélien GEORGET
11c68bebf2
Update User.js
2018-03-19 17:31:04 +01:00
