Jim LAURIE
|
d1721b66f0
|
Merge branch 'master' into update-doc-requirement
|
2018-09-29 14:45:43 +02:00 |
|
Jim LAURIE
|
fef8e5afe8
|
Merge pull request #2037 from moersoy/master
Update TR translations 🇹🇷
|
2018-09-29 14:29:36 +02:00 |
|
Jim LAURIE
|
e98589e130
|
Merge branch 'master' into master
|
2018-09-29 14:29:25 +02:00 |
|
Jim LAURIE
|
aea7e1f486
|
Merge pull request #2043 from BraydenGirard/patch-1
Updated docs for MLab example configuration
|
2018-09-28 19:47:26 +02:00 |
|
Jim LAURIE
|
025eba1bb8
|
Merge branch 'master' into patch-1
|
2018-09-28 19:47:09 +02:00 |
|
Jim LAURIE
|
377a63d590
|
Merge pull request #2040 from strapi/fix/1785
Fix the same password requirements when registering a user
|
2018-09-28 19:44:29 +02:00 |
|
Jim LAURIE
|
bff434f3ad
|
Merge branch 'master' into fix/1785
|
2018-09-28 19:43:19 +02:00 |
|
Jim LAURIE
|
455077b786
|
Delete log
|
2018-09-28 19:43:03 +02:00 |
|
Jim LAURIE
|
c333963b7a
|
Merge pull request #2041 from strapi/fix/1823
Allow any valid JSON in the content manager
|
2018-09-28 19:40:08 +02:00 |
|
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 |
|
Brayden Girard
|
6949720de9
|
Updated for MLab example configuration
|
2018-09-28 10:00:59 -04:00 |
|
cyril lopez
|
3acec21d68
|
Add en trad
|
2018-09-28 12:53:14 +02:00 |
|
cyril lopez
|
d992fd7464
|
Fixes 1785
|
2018-09-28 12:52:27 +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 |
|
Özgür ERSOY
|
0994b05142
|
Update TR translations - 2 #1634
|
2018-09-27 22:53:39 +03:00 |
|
Özgür ERSOY
|
e6aea6022e
|
Merge pull request #3 from strapi/master
sync
|
2018-09-27 22:26:52 +03: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 |
|
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 |
|
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 |
|
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
v3.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 |
|