hhh
4fc6cb84b2
Merge branch 'master' into update-doc-requirement
2018-09-27 23:54:50 +08:00
henrych4
6f9130179d
fix typo and add requirements for other databases
2018-09-27 23:54:55 +08: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
cyril lopez
a4d511a124
Update front-end dependencies
...
Move to react, redux, immutable @latest.
Note: prepare for upgrading webpack.
2018-09-27 15:19:09 +02:00
cyril lopez
199139ada2
Update mongoose
2018-09-27 14:40:24 +02:00
cyril lopez
3dca9151d2
Remove gitbook-cli
2018-09-27 13:59:11 +02:00
cyril lopez
bcf1b99c9b
Delete useless test.sh file and remove mocha.
2018-09-27 13:57:44 +02:00
cyril lopez
9156865f6a
Remove useless dependencies in strapi helper plugin
2018-09-26 18:24:42 +02:00
cyril lopez
57ef0ce36f
Merge branch 'master' of github.com:strapi/strapi into improve/admin-auth
2018-09-26 15:42:28 +02:00
henrych4
9ae159e093
update node and npm requirement on both github issue template and doc
2018-09-26 21:37:14 +08:00
Jim LAURIE
070f398044
Reorder translation keys
2018-09-26 15:15:48 +02:00
cyril lopez
77d9677c03
Fix proptypes
2018-09-26 15:07:53 +02:00
cyril lopez
c49cc5f97b
Check auth on aws
2018-09-26 14:43:10 +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
cyril lopez
01f88c43dc
Change register condition
2018-09-25 17:38:38 +02:00
cyril lopez
d96b888cc6
Improve login
2018-09-25 17:11:14 +02:00
cyril lopez
98d89475d4
Merge branch 'master' of github.com:strapi/strapi into split-admin-dev
2018-09-25 15:48:40 +02:00
cyril lopez
989b867714
Split admin entry point between dev and prod
2018-09-25 15:01:06 +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
cyril lopez
7ba29cc424
Remove documentation folder from watched files
2018-09-24 11:35:48 +02:00
cyril lopez
fd4fb0d529
Changes doc path by removing generatedFiles folders
2018-09-24 11:30:59 +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
cyril lopez
27e0183228
Merge branch 'master' of github.com:strapi/strapi into add-description-to-plugins-routes
2018-09-21 16:17:15 +02:00
