5679 Commits

Author SHA1 Message Date
Vladislav Arsenev
b43f28e611
Merge branch 'master' into fix/repeat-upload-the-same-file 2018-09-03 15:57:10 +03:00
Jim LAURIE
d4953cf0f5
Merge pull request #1878 from bahdcoder/fix-enumeration-title
Add validation for attribute name of enumeration field
2018-09-03 12:33:51 +02:00
Kati Frantz
3ee7bbacf3 add validation for title enumeration field 2018-09-02 19:41:09 +01:00
Jim LAURIE
a0ac1110be
Merge pull request #1831 from sundaycrafts/strapi-support-srv-uri
Strapi support srv uri
2018-09-01 17:36:32 +02:00
Jim LAURIE
d80647c3c6
Merge branch 'master' into strapi-support-srv-uri 2018-09-01 17:35:49 +02:00
Vladislav Arsenev
b254d46607
Merge branch 'master' into fix/repeat-upload-the-same-file 2018-08-31 14:06:54 +03:00
Vladislav Arsenev
d75f3acae5 fix:repeat-upload-the-same-file - clear file input after trigger event 2018-08-31 13:30:39 +03:00
sundaycrafts
71beb1beba fix the message when generating new app 2018-08-31 19:07:15 +09:00
Jim LAURIE
b4cc579d35
Merge pull request #1827 from nobodywithbody/fix/files-required-validation
Fix files required validation
2018-08-31 10:14:48 +02:00
sundaycrafts
082f4a49fe add comment 2018-08-31 10:29:51 +09:00
sundaycrafts
b9a9e7a829 tweak to consistent with other code 2018-08-31 00:47:45 +09:00
Vladislav Arsenev
e30e61c217
Merge branch 'master' into fix/files-required-validation 2018-08-30 14:50:20 +03:00
Vladislav Arsenev
5a666d80df fix(files-required-validation): fix required prop save. add error display for component. fix validation file repeatedly 2018-08-30 14:44:57 +03:00
Jim LAURIE
de22db7243
Merge pull request #1841 from strapi/fix/docs-config-database
Wrong database parameters
2018-08-30 11:55:50 +02:00
Jim LAURIE
0ebd0d5842
Merge branch 'master' into fix/docs-config-database 2018-08-30 11:55:33 +02:00
Jim LAURIE
13e703074b
Merge pull request #1813 from derrickmehaffy/fix1551
Add basic global proxy support
2018-08-30 11:48:58 +02:00
DMehaffy
6dd705a178 Remove lines that aren't needed
Per Jim, removed some lines we don't need.
2018-08-30 02:46:44 -07:00
DMehaffy
bfadb3f914 Adjust Proxy Settings layout in Admin
Cleaning it up and moving SSL to the end.
2018-08-29 23:35:44 -07:00
Luca
120f6ba85e
docs(configurations): wrong database parameters 2018-08-30 08:18:14 +02:00
DMehaffy
a3de757115 Merge remote-tracking branch 'strapi/master' into fix1551 2018-08-29 10:18:25 -07:00
DMehaffy
873ec86cd5 add section header name 2018-08-29 08:24:18 -07:00
DMehaffy
1991857842 Update per PR Feedback 2018-08-29 08:01:55 -07:00
sundaycrafts
cdaf2df5b9 strapi supports srv 2018-08-29 23:50:29 +09:00
sundaycrafts
a1d08517b5 revert changes for beautify code 2018-08-29 23:27:49 +09:00
sundaycrafts
30a16682c8 Merge branch 'master' into strapi-support-srv-uri 2018-08-29 23:22:50 +09:00
Jim LAURIE
79733a6b7e
Merge pull request #1820 from avallete/avallete-handle-subchildrens-process-in-tests
Handle properly subchildrens process on test script
2018-08-29 15:16:52 +02:00
Jim LAURIE
b0ef4942fb
Merge branch 'master' into avallete-handle-subchildrens-process-in-tests 2018-08-29 15:16:45 +02:00
Jim LAURIE
4d5a285cde
Merge branch 'master' into fix1551 2018-08-29 14:30:37 +02:00
Jim LAURIE
4132aaca5f
Merge pull request #1802 from sundaycrafts/polish-pluginjs
Polish plugin.js for more readable
2018-08-29 14:20:45 +02:00
Jim LAURIE
bebca2f16f
Merge branch 'master' into polish-pluginjs 2018-08-29 14:20:25 +02:00
Jim LAURIE
0074b35e6d
Merge pull request #1800 from seanc/patch-1
Changed "You can access to" to "You can access"
2018-08-29 13:06:04 +02:00
Jim LAURIE
4189ce83e9
Merge branch 'master' into patch-1 2018-08-29 13:05:39 +02:00
Jim LAURIE
2fc1612602
Update derrickmehaffy feedback 2018-08-29 13:05:22 +02:00
Jim LAURIE
ac00bce56b
Merge pull request #1712 from strapi/fix/autoReload
Fix auto reload
2018-08-29 12:23:11 +02:00
Jim LAURIE
eace470998 Fix build 2018-08-29 12:14:54 +02:00
Jim LAURIE
d56d75b05b
Merge branch 'master' into fix/autoReload 2018-08-29 11:02:44 +02:00
Jim LAURIE
bfc12662a2
Merge pull request #1836 from strapi/lauriejim-patch-1
Update alpha.14 in doc
2018-08-29 10:07:19 +02:00
Jim LAURIE
627c0b315d
Update alpha.14 in doc 2018-08-29 10:06:26 +02:00
Jim LAURIE
b31c2b5575
Merge pull request #1572 from yummyelin/master
Specify upload-file field's directory and mime type
2018-08-28 20:40:59 +02:00
Jim LAURIE
b5a41534f2
Merge branch 'master' into master 2018-08-28 20:40:36 +02:00
Jim LAURIE
b7e2d41937
Merge pull request #1796 from nobodywithbody/fix/multiple-files-cancel
Discard action if canceled select file
2018-08-28 19:55:03 +02:00
Jim LAURIE
4913d5df74
Merge branch 'master' into fix/multiple-files-cancel 2018-08-28 19:54:05 +02:00
sundaycrafts
6fd5e50347 Merge branch 'master' into strapi-support-srv-uri 2018-08-29 01:49:54 +09:00
sundaycrafts
ac38aaa410 beautify mongoose hook lib/index.js 2018-08-29 01:33:58 +09:00
Jim LAURIE
e1d696ad2c
Merge pull request #1825 from strapi/update/generate-plugin
Add missing translations files
2018-08-28 18:23:16 +02:00
Jim LAURIE
878962c1be
Merge pull request #1824 from FarooqAR/patch-1
Fixed grammatical errors
2018-08-28 18:22:00 +02:00
sundaycrafts
75a83c0f21 strapi supports srv uri 2018-08-29 01:20:56 +09:00
Vladislav Arsenev
d234b20d88
Merge branch 'master' into fix/multiple-files-cancel 2018-08-28 19:02:29 +03:00
DMehaffy
b5a0fd90c8 Fix port typo in docs 2018-08-28 03:37:22 -07:00
soupette
f887879c02 Add missing translations files 2018-08-28 12:29:28 +02:00