cyril lopez
f4d3adf5a9
Merge branch 'add-description-to-plugins-routes' of github.com:strapi/strapi into add-description-to-plugins-routes
2018-09-21 16:09:47 +02:00
cyril lopez
d5aa66a5ff
Change path for overrides files
2018-09-21 16:08:09 +02:00
Martin Muzatko
992828744f
moved the language folders of docs into their correct location for vuepress
2018-09-21 09:39:47 +02:00
Aurelsicoko
71be2e506a
Remove logs
2018-09-20 17:17:04 +02:00
Aurelsicoko
25e8ef587a
Add documentation email and upload
2018-09-20 16:52:51 +02:00
Aurelsicoko
140e32bbe4
Merge branch 'add-description-to-plugins-routes' of github.com:strapi/strapi into add-description-to-plugins-routes
2018-09-20 11:42:25 +02:00
Aurelsicoko
9da6da036b
Add example POST upload
2018-09-20 11:40:37 +02:00
Jim LAURIE
df61ab3127
Merge pull request #1941 from NickBolles/njb/fix-strapi-new
...
Fix strapi new for Windows
2018-09-19 18:37:05 +02:00
Jim LAURIE
1fc650a3fc
Merge branch 'master' into njb/fix-strapi-new
2018-09-19 18:32:47 +02:00
cyril lopez
59961edf44
Merge branch 'master' of github.com:strapi/strapi into add-description-to-plugins-routes
2018-09-19 17:36:59 +02:00
cyril lopez
bc49c3842c
Change gitignore
2018-09-19 17:36:43 +02:00
Jim LAURIE
3e2e87c904
Merge pull request #1937 from maturanomx/refactor/linter
...
Refactor eslint commands
2018-09-19 14:14:25 +02:00
Jim LAURIE
513ef5839c
Merge branch 'master' into refactor/linter
2018-09-19 14:14:17 +02:00
Anthony Guimard
5128157c8f
Fix drag drop image not saved in WYSIWYG.
...
In order to fix this issue we have to invoke the sendData method
just before updating the state of the WYSIWYG otherwhise the sendData
method is not triggered because currentState === updatedState.
2018-09-19 02:41:31 -04:00
Anthony Guimard
2884c924a7
Remove moveFocusToEnd in addContent and addBlock WYSIWYG methods.
...
Remove moveFocusToEnd in order to prevent cursor which going to the bottom
of the textarea when user put text in bold, italic, line-through or add header.
2018-09-19 01:31:34 -04:00
Nick Bolles
a739f67a17
Merge branch 'master' into njb/fix-strapi-new
2018-09-18 23:32:21 -05:00
Thomas Hunter II
c3f156da62
Merge branch 'master' into patch-1
2018-09-18 16:23:05 -07:00
cyril lopez
f002a0d144
Add override documentation to upload and users-permissions
2018-09-18 20:39:31 +02:00
Jim LAURIE
2644b2ee8a
Merge pull request #1959 from hansemannn/patch-2
...
Update docs to show correct password-reset URL and fix formatting
2018-09-18 19:08:36 +02:00
Alberto Maturano
589761a644
Simplify select files for linter
2018-09-18 11:10:17 -05:00
Alberto Maturano
8485a12400
Refactor eslint commands
...
Note: Possibly the noise can be reduced if the dependency is managed on
the repository (the main `package.json` file) instead of in a package.
2018-09-18 11:10:17 -05:00
Hans Knöchel
8b6372c9dc
Merge branch 'master' into patch-2
2018-09-18 17:12:10 +02:00
Hans Knöchel
b8764fdafe
Update authentication.md
2018-09-18 17:12:01 +02:00
Jim LAURIE
6631054af0
Merge pull request #1970 from Tonours/bf/1897-whitespace-model-name
...
Fix model name with whitespace on keyboard content-builder form submission
2018-09-18 16:58:29 +02:00
Jim LAURIE
71c5ba0ae2
Merge branch 'master' into bf/1897-whitespace-model-name
2018-09-18 16:58:20 +02:00
Jim LAURIE
322ee28829
Merge pull request #1964 from derrickmehaffy/addAutoOpenDefault
...
Add config options for AutoOpen by default
2018-09-18 16:31:53 +02:00
Jim LAURIE
69e41a170b
Merge branch 'master' into addAutoOpenDefault
2018-09-18 16:30:38 +02:00
Jim LAURIE
e46d639a1e
Merge pull request #1971 from Tonours/bf/1844-increase-word-wrap-languages-list
...
Update lanagues list label breaked on multi-line.
2018-09-18 16:11:37 +02:00
Jim LAURIE
bfe85ac40c
Merge branch 'master' into bf/1844-increase-word-wrap-languages-list
2018-09-18 16:11:28 +02:00
Jim LAURIE
a3667235cc
Merge pull request #1974 from strapi/fix-email-service-send
...
Fix send email service
2018-09-18 16:00:40 +02:00
Jim LAURIE
686e938c41
Merge branch 'master' into fix-email-service-send
2018-09-18 16:00:33 +02:00
Jim LAURIE
9b94a73b8d
Fix association detection
2018-09-18 15:32:12 +02:00
Nick Bolles
30f44bea66
Remove rimraf dependency
2018-09-18 08:24:08 -05:00
Jim LAURIE
a153aea5b0
Merge pull request #1725 from strapi/improvement/pluralize-routes
...
Pluralize routes
2018-09-18 14:02:38 +02:00
Jim LAURIE
6c897555a0
Merge branch 'master' into improvement/pluralize-routes
2018-09-18 13:47:13 +02:00
Jim LAURIE
84d9070de0
Fix #1858 send email service
2018-09-18 13:20:55 +02:00
Anthony Guimard
5fea994d99
Remove code update commited by error due to bad sync.
2018-09-18 07:17:38 -04:00
Anthony Guimard
e7ccdbd4c3
Update lanagues list label break on multi-line.
...
Center vertically label with flexbox and decrease line-height
in order to increase render of language name.
2018-09-18 01:11:07 -04:00
Anthony Guimard
2e5c1581bf
CamelCased model name with whitespace on form submit.
...
Model name is camelCased only on input blur, a getModelWithCamelCaseName
function has been added and is used for model object on form submission in order
to prevent name with whitespaces.
2018-09-18 00:18:45 -04:00
NickBolles
7703b97d22
use npx to run rimraf
2018-09-17 20:27:52 -05:00
Thomas Hunter II
803d691ef8
Add shebang to server.js
...
* The execute bit is already enabled on server.js
* However, executing it via `./server.js` fails
* Adding the shebang allows the server to start
2018-09-17 11:27:15 -07:00
DMehaffy
dbbedb269f
Add config options to each environment.
2018-09-17 04:14:05 -07:00
Marcello Vetro
07524dde85
Fixed SelectMany Dropdown Input search Ajax Call on search
2018-09-17 12:46:22 +02:00
Pierre Burgy
5d0eeec2b3
Add Content Internationalization documentation
2018-09-17 11:12:08 +02:00
Jason Lei
9cb5b08db1
Updated package deps.
2018-09-17 16:31:45 +08:00
Jason Lei
9861b9ad3f
Bringing files up to date with master, fixing the missing contributor code.
2018-09-17 15:50:13 +08:00
Jason Lei
800fb6150d
Merge branch 'master' into graphql/mutations-aggregations-decimals
2018-09-17 15:30:15 +08:00
Hans Knöchel
02094660c8
fix: update docs to show correct password-reset URL
2018-09-16 21:52:26 +02:00
Jim LAURIE
683732e356
Merge pull request #1950 from marcellovetro/Fix_fulltextindex
...
Fix ORM Create FullText index error if no text colums founded
2018-09-16 11:48:47 +02:00
Jim LAURIE
3931355db7
Merge branch 'master' into Fix_fulltextindex
2018-09-16 11:48:39 +02:00
