Thomas Hunter II
c3f156da62
Merge branch 'master' into patch-1
2018-09-18 16:23:05 -07: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
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
Jim LAURIE
1c0293f355
Merge pull request #1958 from Tonours/bf/1484-graphql-filter-nested-object
...
Fix nested objects returns null in GraphQL
2018-09-16 11:27:17 +02:00
Anthony Guimard
73fb19ca0f
Update isNumeric function with Object type check.
...
Fix false positive of isNumeric function in order to allow
where query on nested object in graphql.
2018-09-15 23:16:20 -04:00
Jason Lei
a3bdd9b3fb
Merge branch 'master' into graphql/mutations-aggregations-decimals
2018-09-15 19:53:48 +08:00
Jim LAURIE
6a24021a2a
Merge pull request #1575 from ackro/fix-916
...
Don't parse npm scripts for dynamic config
2018-09-14 16:09:29 +02:00
Jim LAURIE
184c49ef2c
Merge branch 'master' into fix-916
2018-09-14 15:47:25 +02:00
Jim LAURIE
ff666c9c80
Merge branch 'master' into Fix_fulltextindex
2018-09-14 15:32:45 +02:00
Jim LAURIE
54cf16b5f1
Merge branch 'master' into njb/fix-strapi-new
2018-09-14 15:21:18 +02:00
Jim LAURIE
a4a8f8d031
Merge pull request #1947 from strapi/3.0.0-alpha.14.1.1
...
3.0.0 alpha.14.1.1
2018-09-14 12:18:40 +02:00
Jim LAURIE
0e484e9099
Merge branch 'master' into 3.0.0-alpha.14.1.1
2018-09-14 12:18:31 +02:00
Marcello Vetro
7a4453b917
Fix SQL ORM CREATE FULLTEXT INDEX SEARCH Error: If aren't text colums definend in the schema do not lanch the SQL to create the fulltext index.
2018-09-13 18:51:37 +02:00
Jim LAURIE
4d8ace2db7
3.0.0-alpha.14.1.1
2018-09-13 18:39:37 +02:00
Jim LAURIE
b773262624
Merge pull request #1946 from strapi/fix-build-graphql
...
Fixes #1938
2018-09-13 18:37:23 +02:00
Jim LAURIE
b004b245de
Merge pull request #1946 from strapi/fix-build-graphql
...
Fixes #1938
2018-09-13 18:36:16 +02:00
soupette
fa03ceef11
Fixes #1938
2018-09-13 18:08:32 +02:00
Jim LAURIE
25bf0b1d95
Fix missing admin config object
2018-09-13 16:44:42 +02:00
Jim LAURIE
67112e92cd
Merge branch 'master' into graphql/mutations-aggregations-decimals
2018-09-13 15:00:02 +02:00
Jim LAURIE
ea51c9949f
Merge pull request #1935 from strapi/3.0.0-alpha.14.1
...
3.0.0 alpha.14.1
2018-09-13 14:51:40 +02:00
Jim LAURIE
44daf8d962
Merge branch 'master' into 3.0.0-alpha.14.1
2018-09-13 14:51:31 +02:00
