yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-19 06:08:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,041 Commits 118 Branches 489 Tags
Commit Graph

5041 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
87d70a8d34 Fix count query bookshelf in ctm & users-permissions 2018-05-23 10:29:04 +02:00
Austin Bratcher
077b7ad69e Added support in email plugin for Mailgun and Sendgrid 
Added basic support for using Mailgun and Sendgrid (as opposed to the Sendmail) package in the email plugin. Configuration is done in plugins/email/config/settings.json
 2018-05-23 00:18:39 -05:00
soupette
cc1669faf5 Fix sort query bookshelf users-permissions 2018-05-22 18:27:07 +02:00
soupette
1fae3e9852 Fix ctm bookshelf find query with sort 2018-05-22 18:23:03 +02:00
soupette
d1dfb7fc40 Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-05-22 18:17:56 +02:00
soupette
7d3dd2ad0c Clean user model 2018-05-22 17:56:13 +02:00
soupette
185350f07c Fix count routes for mongoose 2018-05-22 17:11:35 +02:00
Jim LAURIE
acbf4581aa
Merge branch 'master' into fix-typo 2018-05-22 17:06:13 +02:00
soupette
685930e551 Apply filters with URI 2018-05-22 16:55:58 +02:00
soupette
c2e187da8c Handle filters when modifying all params 2018-05-22 15:59:01 +02:00
soupette
c07d5a8f56 Apply filters from the URI 2018-05-22 15:25:21 +02:00
Raul Riera
0e4c6064ce Updated content type builder 2018-05-22 08:38:08 -04:00
Jim LAURIE
0a9fff5a30
Merge pull request #1249 from strapi/update-issue-template 
Remove issue template checkbox
 2018-05-22 14:17:12 +02:00
Jim Laurie
7056a6d65b Remove issue template checkbox 2018-05-22 14:16:25 +02:00
soupette
4c1ddf5bc4 Display filter content and remove then 2018-05-22 11:52:29 +02:00
soupette
42146a0118 Display applied filters 2018-05-22 10:19:16 +02:00
Raul Riera
262182fd00 Fix a typo in the error key 2018-05-21 14:14:09 -04:00
soupette
cf4cfafa06 Add hide option 2018-05-21 17:45:23 +02:00
soupette
7260bbe309 Add actions to filterpicker 2018-05-21 17:16:04 +02:00
Jim Laurie
e6b4b2a214 Setup test project 
Change test structure
Generate new testApp from node script and launch app
Add new feature: Be able to user strapi start and specify an app path (WIP) configs are loaded
Generate test API with relations - articles, tag and category
 2018-05-21 17:04:25 +02:00
Johann Pinson
330aac40ef
fix(graphql): update Union type creation rules 2018-05-21 15:39:45 +02:00
Johann Pinson
09cff64c5d
fix(graphql): update Union type creation rules 
My PR is a:
🐛 Bug fix

Main update on the:
Plugin

Fix error type `Union type Morph can only include Object types, it cannot include [Enum name]`
 2018-05-21 15:25:26 +02:00
Jim LAURIE
df87cc32c2
Merge pull request #1238 from yakupad/master 
🇹🇷 update Turkish language translates
 2018-05-21 10:25:20 +02:00
Yakup AD
58e4b27ddb update Turkish language translates 2018-05-20 14:08:47 +03:00
Raul Riera
bf4fa666ec Improved the syntax 2018-05-18 21:04:24 -04:00
Raul Riera
e274ff01e9 Support for passing additional options 2018-05-18 20:49:11 -04:00
soupette
e9ce813474 Handle change input filters 2018-05-18 17:54:38 +02:00
soupette
569717e69f Move logic to container 2018-05-18 16:46:13 +02:00
Jim LAURIE
5e1a62b45b
Merge pull request #1229 from ertugrulungor/tr-language 
🇹🇷 Update Turkish translations
 2018-05-18 16:43:01 +02:00
soupette
773a15d1cb Merge branch 'master' of github.com:strapi/strapi into content-manager-filters 2018-05-18 14:59:30 +02:00
soupette
f3bdbff968 Fix conflicts 2018-05-18 14:56:40 +02:00
Ertuğrul Üngör
05d8201476
Merge branch 'master' into tr-language 2018-05-18 15:46:39 +03:00
ertugrulungor
8a327c4cb6 Turkish translations 2018-05-18 15:41:18 +03:00
Jim Laurie
6c194ff333 Init create new app test 2018-05-18 14:22:24 +02:00
Jim LAURIE
6126645581
Merge pull request #1228 from strapi/lauriejim-patch-1 
Remove prettier
 2018-05-18 14:21:31 +02:00
Jim LAURIE
2393a6cef9
Remove prettier 
Waiting for prettier indent fix
 2018-05-18 14:21:05 +02:00
soupette
283dfc7972 Retrieve schema 2018-05-18 11:41:42 +02:00
Jim LAURIE
b2fb8c9022
Merge pull request #1205 from strapi/add-prettier 
Add prettier on pre-commit
 2018-05-18 11:24:34 +02:00
Jim LAURIE
a64e19861f
Merge branch 'master' into add-prettier 2018-05-18 11:16:00 +02:00
Jim LAURIE
75ce8ea0be
Merge pull request #1196 from strapi/add-styled-component 
Add styled-components
 2018-05-18 11:15:41 +02:00
Jim LAURIE
74d3987a11
Merge branch 'master' into add-styled-component 2018-05-18 11:07:32 +02:00
Jim LAURIE
53e7c8f2cd
Merge pull request #1222 from johanbaath/fix-auth-redirect 
Wait for the user plugin to bootstrap before redirection
 2018-05-18 11:06:49 +02:00
soupette
1543160819 Add Loadable to inputs 2018-05-18 10:58:51 +02:00
Jim LAURIE
40cfa26c74
Merge branch 'master' into fix-auth-redirect 2018-05-18 10:57:40 +02:00
Jim LAURIE
b4ca0c88c5
Merge pull request #1223 from strapi/3.0.0-alpha.12.2 
3.0.0-alpha.12.2
 2018-05-18 10:53:21 +02:00
Johan Baath
7e6f7dcbf4 remove whitespace 2018-05-17 19:06:52 +02:00
soupette
7333116119 Handle add and remove filter 2018-05-17 18:35:41 +02:00
soupette
6c14dbf8fa Prepare for dynamic filters 2018-05-17 17:57:45 +02:00
Jim Laurie
31c0d7457a 3.0.0-alpha.12.2 v3.0.0-alpha.12.2 2018-05-17 16:54:27 +02:00
soupette
559c862e26 Add dynamic PluginHeaderTitle in FiltersPickWrapper 2018-05-17 16:25:02 +02:00