Vladislav Arsenev
|
d266961881
|
fix(multiple-files-cancel): discard action if canceled select file
|
2018-08-24 15:05:12 +03:00 |
|
Yilin Gan
|
ae807faacc
|
add documentation
|
2018-08-23 11:50:33 -07:00 |
|
Yilin Gan
|
2ede104be5
|
update s3 delete & upload controller
|
2018-08-23 11:43:05 -07:00 |
|
yummyelin
|
8fe1878c13
|
Merge branch 'master' into master
|
2018-08-23 10:41:13 -07:00 |
|
Jim LAURIE
|
d4c2cb1009
|
Merge pull request #1733 from strapi/email-validation
Add confirmation email
|
2018-08-23 18:46:56 +02:00 |
|
Jim LAURIE
|
cee9fe2811
|
Merge branch 'master' into email-validation
|
2018-08-23 18:46:48 +02:00 |
|
Jim LAURIE
|
7fdccc62ee
|
PR feedback
|
2018-08-23 18:28:13 +02:00 |
|
Jim LAURIE
|
782ab60609
|
Merge pull request #1777 from derrickmehaffy/updateReadMe4Alpha
Update read with Requirements
|
2018-08-23 17:27:44 +02:00 |
|
Jim LAURIE
|
930d8dac43
|
Merge branch 'master' into updateReadMe4Alpha
|
2018-08-23 17:27:33 +02:00 |
|
Jim LAURIE
|
b1660437d2
|
Merge pull request #1752 from strapi/ux/ctm-list-view
Custom content manager columns on list view
|
2018-08-23 17:26:51 +02:00 |
|
Jim LAURIE
|
1051c1cfbb
|
Merge branch 'master' into ux/ctm-list-view
|
2018-08-23 17:24:57 +02:00 |
|
Jim LAURIE
|
db75fc8f3a
|
Merge pull request #1743 from sundaycrafts/new-command-srv-support
"new" command supports mongo +srv prefix uri
|
2018-08-23 17:24:46 +02:00 |
|
Jim LAURIE
|
33ad03548f
|
Merge branch 'master' into new-command-srv-support
|
2018-08-23 17:20:08 +02:00 |
|
Jim LAURIE
|
3fbf183591
|
Merge pull request #1684 from strapi/settings-ctm-edit-view
Configure the content manager's layout from the admin panel
|
2018-08-23 17:17:47 +02:00 |
|
Aurélien GEORGET
|
f5abc3e002
|
Update README.md
|
2018-08-23 12:23:37 +02:00 |
|
Aurélien GEORGET
|
e8b7bd478a
|
Update bootstrap.js
|
2018-08-23 12:00:46 +02:00 |
|
soupette
|
81c19fb3bc
|
Fix conflicts
|
2018-08-22 14:20:03 +02:00 |
|
soupette
|
8003982b08
|
Fix conflicts
|
2018-08-22 14:17:09 +02:00 |
|
soupette
|
0fd23f4c16
|
Add comments to Manager
|
2018-08-22 14:10:50 +02:00 |
|
soupette
|
14fc74def4
|
Add comments to ctm/ bootstrap file and split functions
|
2018-08-21 17:43:17 +02:00 |
|
Jim LAURIE
|
059b37291a
|
Merge pull request #1776 from danielehrhardt/master
File Upload Explorer showing GB instead of MB
|
2018-08-21 16:48:46 +02:00 |
|
Jim LAURIE
|
07ca225eb0
|
Merge branch 'master' into master
|
2018-08-21 16:46:57 +02:00 |
|
soupette
|
d113234a95
|
Add comments
|
2018-08-21 16:40:53 +02:00 |
|
Jim LAURIE
|
f7f9c61461
|
Merge pull request #1764 from jonlov/patch-1
Allow global policies to be organised by folders
|
2018-08-21 16:39:03 +02:00 |
|
Jim LAURIE
|
ee2ccd76a9
|
Merge branch 'master' into patch-1
|
2018-08-21 16:27:45 +02:00 |
|
Jim LAURIE
|
66a2c95aaa
|
Merge pull request #1724 from sdubrez/patch-1
Update Concepts/Where are the models defined documentation
|
2018-08-21 16:17:53 +02:00 |
|
Jim LAURIE
|
e540330031
|
Merge branch 'master' into patch-1
|
2018-08-21 16:17:46 +02:00 |
|
Jim LAURIE
|
453d2ae474
|
Merge pull request #1689 from jskorepa/master
Use actual hash instead of randomly generated string
|
2018-08-21 16:16:10 +02:00 |
|
Jim LAURIE
|
dcfc5b8c54
|
Merge branch 'master' into master
|
2018-08-21 16:16:03 +02:00 |
|
soupette
|
38c4fd6a47
|
Fix first part of PR feedback
|
2018-08-21 14:01:15 +02:00 |
|
Jim LAURIE
|
f27b2ae2f6
|
Merge branch 'master' into email-validation
|
2018-08-21 11:54:22 +02:00 |
|
Jim LAURIE
|
8989691840
|
Merge pull request #1778 from heyarne/bugfix/getting-started-link
Fix link to getting started page in README
|
2018-08-21 11:51:39 +02:00 |
|
Jim LAURIE
|
af2792f6f0
|
Merge branch 'master' into bugfix/getting-started-link
|
2018-08-21 11:51:34 +02:00 |
|
Jim LAURIE
|
d3b7a9636a
|
Merge pull request #1723 from strapi/improvement/notifications-display
Center notifications
|
2018-08-21 11:49:15 +02:00 |
|
Jim LAURIE
|
6cf9d47272
|
Merge branch 'master' into improvement/notifications-display
|
2018-08-21 11:49:07 +02:00 |
|
Jim LAURIE
|
39c1ae23b1
|
Merge pull request #1722 from strapi/update-ejs-doc
Update strapi hook ejs doc
|
2018-08-21 11:48:42 +02:00 |
|
Jim LAURIE
|
9c7dd341a7
|
Merge branch 'master' into update-ejs-doc
|
2018-08-21 11:48:32 +02:00 |
|
Jim LAURIE
|
25536c87de
|
Merge pull request #1772 from strapi/fix-1704
Fix default value set to false for boolean attributes
|
2018-08-21 11:47:42 +02:00 |
|
Jim LAURIE
|
ff886cc3ba
|
Merge branch 'master' into fix-1704
|
2018-08-21 11:47:32 +02:00 |
|
Jim LAURIE
|
8e39fca71f
|
Merge pull request #1775 from maturano/fixLinterErrors
Fix linter errors
|
2018-08-21 11:45:55 +02:00 |
|
Jim LAURIE
|
5d6da451fc
|
Merge branch 'master' into fixLinterErrors
|
2018-08-21 11:43:52 +02:00 |
|
Jim LAURIE
|
459443dfa7
|
Merge pull request #1773 from strapi/fix-it-users-permissions
Load it translations for users-permissions plugin
|
2018-08-21 11:40:37 +02:00 |
|
Jim LAURIE
|
ed3f7d9018
|
Merge branch 'master' into fix-it-users-permissions
|
2018-08-21 11:40:31 +02:00 |
|
Jim LAURIE
|
82481601f2
|
Merge pull request #1757 from chrisdekker1997/master
Fix email template forgot password
|
2018-08-21 11:38:51 +02:00 |
|
Jim LAURIE
|
e97fa20ba3
|
Merge branch 'master' into master
|
2018-08-21 11:25:22 +02:00 |
|
Jim LAURIE
|
602229df27
|
Merge pull request #1407 from kamalbennani/feature/graphql-aggregation
GraphQL Aggregation Feature
|
2018-08-21 10:53:30 +02:00 |
|
DMehaffy
|
dc5055eb52
|
Fix getting Started Link
|
2018-08-21 01:43:49 -07:00 |
|
Jim LAURIE
|
4bf88f8792
|
Merge branch 'master' into feature/graphql-aggregation
|
2018-08-21 10:36:09 +02:00 |
|
Arne Schlüter
|
5b957da4af
|
Fix link to getting started page in README
|
2018-08-21 10:34:16 +02:00 |
|
Aurélien GEORGET
|
50244f0089
|
Merge branch 'master' into enhancement/front-start
|
2018-08-21 10:33:03 +02:00 |
|