Jim LAURIE
8e85e104cc
Merge branch 'master' into fix/1823
2018-09-28 19:40:00 +02:00
Jim LAURIE
71dbb7bc55
Merge pull request #2039 from derrickmehaffy/updateIssueTemp
...
Update the Templates to ensure users are on the latest release
2018-09-28 17:35:09 +02:00
Jim LAURIE
c804978d65
Merge branch 'master' into updateIssueTemp
2018-09-28 17:35:01 +02:00
Jim LAURIE
adfade414e
Merge pull request #2036 from maturanomx/fix/serverPermission
...
Add execute bit to `server.js` file
2018-09-28 16:25:12 +02:00
cyril lopez
f593a441e6
Fixes 1823
2018-09-28 12:24:11 +02:00
DMehaffy
46b477c0b3
Update the templates
2018-09-28 03:05:55 -07: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
63b44b173e
Merge pull request #2027 from strapi/order-translation-key
...
Reorder translation keys
2018-09-27 18:39:42 +02:00
Jim LAURIE
1f56c823e9
Merge branch 'master' into order-translation-key
2018-09-27 18:39:22 +02:00
Jim LAURIE
aa70eb2bd9
Merge pull request #1928 from uyouthe/master
...
Font-family declarations fixed
2018-09-27 18:32:15 +02:00
Jim LAURIE
29409f9531
Merge branch 'master' into master
2018-09-27 18:32:03 +02:00
Jim LAURIE
f969853c60
Merge pull request #1982 from Tonours/bf/1847-drag-drop-image-save
...
Fix drag drop image not saved in WYSIWYG.
2018-09-27 17:20:50 +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
bf355c8911
Merge pull request #2021 from strapi/3.0.0-alpha.14.2
...
3.0.0-alpha.14.2
2018-09-26 12:19:16 +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
8ace61faf3
Merge pull request #1967 from tlhunter/patch-1
...
Add shebang to server.js
2018-09-25 11:41:21 +02:00
Jim LAURIE
beeb826981
Merge branch 'master' into patch-1
2018-09-25 11:40:56 +02:00
Jim LAURIE
3dc4618cb8
Merge pull request #2002 from tthakurani/master
...
Converted password to a string before creating hash
2018-09-25 11:09:37 +02:00
Jim LAURIE
1893a82bff
Merge branch 'master' into master
2018-09-25 11:08:40 +02:00
Jim LAURIE
a03469c1f0
Merge pull request #1838 from sundaycrafts/polish-strapi-hook-mongoose
...
Polish strapi hook mongoose
2018-09-25 10:46:38 +02:00
Jim LAURIE
e45b823385
Merge branch 'master' into polish-strapi-hook-mongoose
2018-09-25 10:46:17 +02:00
Jim LAURIE
63a4a22260
Merge pull request #1913 from xlmnxp/master
...
Update AR translations
2018-09-25 10:12:11 +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
124d0b1ebb
Merge pull request #1987 from maturanomx/fixFilePermissions
...
Normalize to standar file permissions
2018-09-24 20:17:57 +02:00
Jim LAURIE
86dea3279f
Merge branch 'master' into fixFilePermissions
2018-09-24 20:13:31 +02:00
Jim LAURIE
c752ab0daf
Merge pull request #1924 from JZFLei/graphql/mutations-aggregations-decimals
...
Mutation/Aggregations Merge and Decimal Fix
2018-09-24 19:43:13 +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
297e52e789
Merge pull request #1990 from maturanomx/fix/916
...
Don't parse npm scripts for dynamic config
2018-09-24 19:28:19 +02:00
Jim LAURIE
10b051ebfb
Merge branch 'master' into fix/916
2018-09-24 19:28:06 +02:00
Jim LAURIE
5a920daef8
Merge pull request #1976 from strapi/fix-1885
...
Fix association detection
2018-09-24 19:11:20 +02:00
Jim LAURIE
c4cb9ccfab
Merge branch 'master' into fix-1885
2018-09-24 19:11:14 +02:00
Jim LAURIE
3a36028a5b
Merge pull request #1961 from strapi/documentation/content-internationalization
...
Add Content Internationalization documentation
2018-09-24 18:27:48 +02:00
Jim LAURIE
2a25c1a17b
Merge branch 'master' into documentation/content-internationalization
2018-09-24 18:27:21 +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
f1251ea342
Merge pull request #1981 from Tonours/bf/985-wysiwyg-cursor
...
Remove moveFocusToEnd in addContent and addBlock WYSIWYG methods.
2018-09-21 18:00:53 +02:00
Jim LAURIE
91d056c727
Merge branch 'master' into bf/985-wysiwyg-cursor
2018-09-21 18:00:43 +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
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
