Jim LAURIE
8e85e104cc
Merge branch 'master' into fix/1823
2018-09-28 19:40:00 +02:00
cyril lopez
f593a441e6
Fixes 1823
2018-09-28 12:24:11 +02:00
Alberto Maturano
6f35b53d3c
Add execute bit to server.js file
...
Without this, #1967 makes no sense.
2018-09-27 12:54:49 -05:00
Jim LAURIE
1f56c823e9
Merge branch 'master' into order-translation-key
2018-09-27 18:39:22 +02:00
Jim LAURIE
29409f9531
Merge branch 'master' into master
2018-09-27 18:32:03 +02:00
Jim LAURIE
8ea46642dc
Merge branch 'master' into bf/1847-drag-drop-image-save
2018-09-27 17:20:40 +02:00
Jim LAURIE
070f398044
Reorder translation keys
2018-09-26 15:15:48 +02:00
Jim LAURIE
46c9b0f966
3.0.0-alpha.14.2
2018-09-26 11:08:10 +02:00
Jim LAURIE
2aebb74424
Fix private key in User model
2018-09-25 14:42:15 +02:00
Jim LAURIE
beeb826981
Merge branch 'master' into patch-1
2018-09-25 11:40:56 +02:00
Jim LAURIE
1893a82bff
Merge branch 'master' into master
2018-09-25 11:08:40 +02:00
Jim LAURIE
e45b823385
Merge branch 'master' into polish-strapi-hook-mongoose
2018-09-25 10:46:17 +02:00
Jim LAURIE
a818c1258b
Merge branch 'master' into master
2018-09-25 10:11:59 +02:00
Jim LAURIE
81b3149655
Fix space
2018-09-25 10:11:44 +02:00
Jim LAURIE
86dea3279f
Merge branch 'master' into fixFilePermissions
2018-09-24 20:13:31 +02:00
Jim LAURIE
a09e88f567
Merge branch 'master' into graphql/mutations-aggregations-decimals
2018-09-24 19:42:57 +02:00
Alberto Maturano
154fc28a57
Normalize to standar file permissions
...
As a result of taking a look on PR #1967 I realized there is 819
executable files in this repository. It is obvious this is an error.
2018-09-24 12:33:09 -05:00
Jim LAURIE
10b051ebfb
Merge branch 'master' into fix/916
2018-09-24 19:28:06 +02:00
Jim LAURIE
c4cb9ccfab
Merge branch 'master' into fix-1885
2018-09-24 19:11:14 +02:00
Tarun Thakurani
34905eaa8d
Merge branch 'master' into master
2018-09-23 11:53:24 +05:30
Miloslav Voloskov
1cd3fe3c5c
Merge branch 'master' into master
2018-09-23 08:04:20 +03:00
Tarun Thakurani
d1427cb6c8
[ #932 ] fixed Setting user with numeric password fails
2018-09-22 18:45:49 +05:30
Alberto Maturano
0e164d6da8
Don't parse npm scripts for dynamic config
...
Fix the fix merged with #1575
The original patch was done over a block of code moved on #1667
resulting in re-introducing code that now is not invoqued and continue
with the bug reported on #916 .
This patch take the original changes and put them in the current correct
place.
2018-09-21 16:27:35 -05:00
Jim LAURIE
91d056c727
Merge branch 'master' into bf/985-wysiwyg-cursor
2018-09-21 18:00:43 +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
Jim LAURIE
71c5ba0ae2
Merge branch 'master' into bf/1897-whitespace-model-name
2018-09-18 16:58:20 +02:00
Jim LAURIE
69e41a170b
Merge branch 'master' into addAutoOpenDefault
2018-09-18 16:30:38 +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
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
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
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
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
Jim LAURIE
3931355db7
Merge branch 'master' into Fix_fulltextindex
2018-09-16 11:48:39 +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
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
0e484e9099
Merge branch 'master' into 3.0.0-alpha.14.1.1
2018-09-14 12:18:31 +02:00
