Jim LAURIE
c98338942b
Merge pull request #649 from strapi/relations/polymorphic
...
Relations/polymorphic
2018-02-19 11:49:51 +01:00
Jim LAURIE
e2be148071
Merge branch 'master' into relations/polymorphic
2018-02-19 11:32:06 +01:00
Jim LAURIE
97acced7da
Merge pull request #663 from denislutz/docImprove
...
Some minor doc improvements on english level
2018-02-19 11:09:51 +01:00
Jim LAURIE
71298adb53
Merge branch 'master' into docImprove
2018-02-19 10:58:23 +01:00
Jim LAURIE
771ea7662b
Merge pull request #665 from jamesdbruner/patch-2
...
Renaming 'Cancel' to 'Reset'
2018-02-19 10:38:03 +01:00
Jim LAURIE
2f704ea3c3
Merge branch 'master' into patch-2
2018-02-19 10:26:42 +01:00
Jim LAURIE
d0c7d8768b
Merge pull request #666 from igghera/master
...
Fix #660 : Allow side menu to scroll when content requires it
2018-02-18 17:44:45 +01:00
Jim LAURIE
8f06a9c250
Merge branch 'master' into master
2018-02-18 17:09:00 +01:00
Jim LAURIE
8e060c3fdb
Merge pull request #662 from lucaperret/master
...
fix(generate-new): prevent delete the node_modules dir
2018-02-18 17:08:49 +01:00
Jim LAURIE
115283ac37
Merge branch 'master' into master
2018-02-18 16:54:33 +01:00
Denis Lutz
79128d35d1
fix writing mistakes
2018-02-18 16:17:19 +01:00
Denis Lutz
95bbc50553
Merge branch 'master' into docImprove
2018-02-18 16:03:06 +01:00
Andrea Gherardi
25a22dfe05
Fix #660 : Allow side menu to scroll when content requires it
...
Depending on screen resolution, when adding many content types the side
menu can't fit them all. This commit simply uses absolute positioning
and overflow-y: auto to allow vertical scrolling when it's needed.
2018-02-18 09:30:28 +01:00
James
5a97c09a70
Renaming 'Cancel' to 'Reset'
...
Helps clarify what the button actually does. Otherwise it seems like nothing is happening.
2018-02-17 16:08:08 -07:00
Jim LAURIE
18a65a7435
Merge pull request #664 from jamesdbruner/patch-1
...
Grammar edits
2018-02-17 21:24:28 +01:00
James
7c1582cb7e
Grammar edits
2018-02-17 13:08:07 -07:00
Denis Lutz
c325fec851
some doc improvements on english level
2018-02-17 09:34:34 +01:00
Luca Perret
d0457c887a
fix(generate-new): prevent delete the node_modules dir
2018-02-16 19:50:28 +01:00
Jim LAURIE
232d6cfe6e
Merge pull request #653 from oad-earth/master
...
polish language
2018-02-16 15:37:50 +01:00
cyril lopez
99ca8e7117
Merge branch 'master' into master
2018-02-16 13:39:38 +01:00
Jim LAURIE
d72365ea6d
Merge pull request #654 from Freakspot/en-lang-corrections
...
Improvements in the English translation
2018-02-16 11:02:22 +01:00
inder redni
d030ed11cb
polish language | resolve conflict
2018-02-16 10:43:58 +01:00
Jim LAURIE
6a9640c3f5
Merge branch 'master' into en-lang-corrections
2018-02-16 10:40:17 +01:00
Jim LAURIE
a5c5d55882
Merge pull request #652 from Freakspot/master
...
Translated most of all basic plugins and the admin into german
2018-02-16 10:40:06 +01:00
inder redni
3ae54bf958
polish language | input-file-component
2018-02-16 10:37:29 +01:00
Jim LAURIE
faa05aa372
Merge branch 'master' into master
2018-02-16 10:27:00 +01:00
Jim LAURIE
89a972d10d
Merge pull request #651 from strapi/migration-9-10
...
Write migration guide from alpha.9 to alpha.10
2018-02-16 10:09:55 +01:00
Freakspot
33826d8e91
Fixed even more spelling mistakes and made some strings prettier
2018-02-16 01:13:20 +01:00
Freakspot
f21f690645
Fixed a few spelling mistakes as well as enhanced some strings
2018-02-15 23:30:31 +01:00
inder redni
4a16c4ecff
polish language | corrections
2018-02-15 17:21:24 +01:00
inder redni
abfe04a9c7
polish language | strapi-plugin-users-permissions
2018-02-15 17:12:32 +01:00
Jim LAURIE
751d4194bb
Add wording specification
2018-02-15 17:01:10 +01:00
Jim Laurie
4ff5e26dc1
Fix PR review
2018-02-15 16:47:57 +01:00
Freakspot
095df2dffc
Translated most of all basic plugins and the admin into german
2018-02-15 16:26:19 +01:00
Jim Laurie
031968d971
Write migration guide from alpha.9 to alpha.10
2018-02-15 15:58:53 +01:00
inder redni
f08468c332
polish language | strapi-plugin-settings-manager
2018-02-15 15:48:56 +01:00
inder redni
ae2ff61d4f
polish language | strapi-plugin-email
2018-02-15 15:04:38 +01:00
inder redni
1a38158e50
polish language | strapi-plugin-content-tyoe-builder
2018-02-15 15:03:03 +01:00
Jim LAURIE
cba73114b9
Merge pull request #642 from strapi/3.0.0-alpha.10
...
3.0.0-alpha.10.1
2018-02-14 11:20:24 +01:00
Jim Laurie
25d8217986
3.0.0-alpha.10.1
2018-02-14 11:03:00 +01:00
Jim LAURIE
f0f06543a5
Merge pull request #638 from strapi/fix-config-user
...
Fix config user and front things
2018-02-13 17:11:15 +01:00
Jim Laurie
bbc2493f07
Fix front-end before release
...
Fix eye position input password
Add notification on settings update plugin users permissions
Fix error display on login page
Co-authored-by: soupette <cyril.lpz@gmail.com>
2018-02-13 16:26:27 +01:00
Jim Laurie
c52fe7165b
Fix get email settings reset password
2018-02-13 15:59:06 +01:00
Aurelsicoko
128a3a67e6
Merge branch 'master' of github.com:strapi/strapi into relations/polymorphic
2018-02-13 15:13:06 +01:00
Jim Laurie
957e7a08cb
Environment agnostic for users-permissions configs
2018-02-13 15:04:21 +01:00
Jim LAURIE
520c0bfcc8
Merge pull request #620 from strapi/fix-filter-doc
...
Fix filter documentation
2018-02-13 13:21:39 +01:00
Jim LAURIE
df48e85ff5
Merge branch 'master' into fix-filter-doc
2018-02-13 11:28:24 +01:00
Jim LAURIE
63f2c83a64
Merge pull request #628 from strapi/configs-databases
...
Handle configuration in database
2018-02-13 11:28:11 +01:00
Jim LAURIE
4ab9907bd7
Merge branch 'master' into configs-databases
2018-02-13 11:10:05 +01:00
Jim LAURIE
039efc0b42
Merge pull request #632 from lucaperret/feat/tmp-connection
...
Feat/tmp connection
2018-02-13 11:09:53 +01:00
