3951 Commits

Author SHA1 Message Date
Jim Laurie
3da6115fac Add upload provider documentation 2018-04-16 14:17:21 +02:00
Jim LAURIE
80e2cb2609
Merge pull request #947 from cece95/master
Fix SQL database UTF-8 email template
2018-04-16 10:49:00 +02:00
Jim LAURIE
23978a3da7
Merge branch 'master' into master 2018-04-16 09:49:58 +02:00
Jim LAURIE
ab238dca61
Remove space 2018-04-16 09:48:43 +02:00
Jim LAURIE
8531e9f8be
Merge pull request #945 from Makeyko/master
Russian language pack update
2018-04-16 09:47:27 +02:00
cesare grigoletto
ea284ae96e
Merge branch 'master' into master 2018-04-16 08:53:00 +02:00
cece95
32aefbe5be fixed issue #923 2018-04-16 08:49:41 +02:00
Administrator
0168b9ffe5 Russian language for User Permission plugin 2018-04-15 21:42:05 +03:00
Administrator
147f614c09 Russian language for Upload plugin 2018-04-15 20:13:23 +03:00
Administrator
5a60baa454 Russian language for Mail and Settings Manager plugins 2018-04-15 18:58:56 +03:00
Administrator
31a0393c52 Russian language pack for content type builder 2018-04-15 18:16:09 +03:00
Administrator
d030dc06ba Russian language pack update. Admin translations fixes + Content manager translations added. 2018-04-15 13:30:31 +03:00
Jim LAURIE
cd43705203
Merge pull request #944 from Makeyko/master
Add Russian language in admin
2018-04-15 10:09:24 +02:00
Administrator
8941d8683d russian language 2018-04-14 23:54:21 +03:00
Jim LAURIE
8897aa599b
Merge pull request #941 from strapi/fix/welcome-dashboard
Change link
2018-04-13 17:09:05 +02:00
Jim LAURIE
4a8ab72a55
Merge branch 'master' into fix/welcome-dashboard 2018-04-13 16:36:03 +02:00
Jim LAURIE
215e801071
Merge pull request #940 from strapi/fix/upload-cout
Fix upload count page
2018-04-13 16:35:50 +02:00
Jim LAURIE
42d3009638
Merge branch 'master' into fix/upload-cout 2018-04-13 16:13:21 +02:00
Jim LAURIE
031a0d9b0d
Merge pull request #938 from strapi/allow-new-input
Allow to pass custom input type and components to the lib
2018-04-13 16:13:03 +02:00
Aurélien GEORGET
8da3c8c66f
Change link 2018-04-13 16:08:37 +02:00
Jim LAURIE
06555cf4d4
Merge branch 'master' into allow-new-input 2018-04-13 15:44:06 +02:00
Jim Laurie
3b7de09362 Fix upload count page 2018-04-13 15:42:45 +02:00
Jim LAURIE
80d1849093
Merge pull request #937 from strapi/add-version-to-admin
Add strapi version on left menu
2018-04-13 15:11:21 +02:00
Jim LAURIE
a508dcf7d7
Merge branch 'master' into add-version-to-admin 2018-04-13 14:43:25 +02:00
Jim LAURIE
42572f6409
Merge pull request #935 from declantyson/patch-1
Update Getting Started docs to show correct sort parameter
2018-04-13 14:43:11 +02:00
Jim LAURIE
6ba1e667c0
Merge branch 'master' into patch-1 2018-04-13 14:02:55 +02:00
Jim LAURIE
59f3146db3
Merge pull request #934 from strapi/fix-setup
Fix project npm run setup
2018-04-13 14:02:31 +02:00
soupette
eae1ae1d7f Fix PR feedback 2018-04-13 13:50:05 +02:00
Jim LAURIE
a65e0c5f56
Merge branch 'master' into fix-setup 2018-04-13 13:34:15 +02:00
soupette
24b0ca8259 Update doc 2018-04-13 10:17:45 +02:00
Jim LAURIE
bae40c837d
Merge pull request #933 from strapi/poly-cm
Handle polymorphic in content manager
2018-04-13 10:14:23 +02:00
soupette
d9291ae394 Allow to pass custom input type and components to the lib 2018-04-13 09:57:17 +02:00
soupette
87b5832a51 Fixes #810 2018-04-12 23:45:17 +02:00
Declan Tyson
ca7cd5e97a
Change order filter to sort to reflect parameter 2018-04-12 17:55:02 +01:00
Jim LAURIE
950122dbdb
Merge branch 'master' into poly-cm 2018-04-12 17:58:51 +02:00
cyril lopez
936bdf7949
Merge branch 'master' into fix-setup 2018-04-12 17:30:50 +02:00
soupette
3176f02a25 Fixes #858 2018-04-12 17:28:13 +02:00
Jim LAURIE
d3a82618b3
Merge pull request #928 from Froelund/patch-2
Fixed issue for connection settings and ssl prop
2018-04-12 15:48:21 +02:00
Jim LAURIE
1cf906547f
Merge branch 'master' into patch-2 2018-04-12 15:30:03 +02:00
Jim LAURIE
f896d94424
Merge pull request #831 from strapi/wysiwyg-preview-fullscreen
Wysiwyg
2018-04-12 15:27:07 +02:00
Jørgensen
f5a0bce148
Update index.js
Updated according to comments.
2018-04-12 15:23:03 +02:00
Jim LAURIE
6e843dad3e
Merge branch 'master' into wysiwyg-preview-fullscreen 2018-04-12 15:02:13 +02:00
Aurelsicoko
815f896ba8 Remove logs and clean code 2018-04-12 14:42:31 +02:00
Jim Laurie
bb114a592d Clean model 2018-04-12 14:19:22 +02:00
Jim LAURIE
be2162eaa4
Merge pull request #929 from Jan10/master
Update german translations
2018-04-12 12:02:29 +02:00
soupette
37c976d495 WYSIWYG is ready 2018-04-12 09:49:29 +02:00
soupette
57e34cf994 Allow to add <a><img /><a> 2018-04-11 22:39:30 +02:00
soupette
54fc51592b Need to identify add ul bug 2018-04-11 22:13:43 +02:00
Jan Brachhold
d986055fb8 Update german translations 2018-04-11 21:19:31 +02:00
Jim LAURIE
c15d166685
Merge pull request #892 from TheWebsDoor/ISSUE-825
Losing OneToOne relation in the content manager
2018-04-11 19:56:35 +02:00