yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-01 12:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,273 Commits 113 Branches 491 Tags
Commit Graph

9273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Salem
3913e0d582
Create ar.json 2018-06-01 01:32:36 +03:00
Salem
82508698d3
Create ar.json 2018-06-01 01:10:51 +03:00
Austin Bratcher
ddc01eb27b Update to add dynamic settings to email plugin 
Email plugin now functions more like the upload plugin. Users can go to the plugins page, click on the settings cog for the email, and switch between providers or change settings. The default provider is strapi-email-sendmail. Extra providers can be added by installing strapi-email-mailgun or strapi-email-sendgrid.
 2018-05-31 14:29:00 -05:00
Austin Bratcher
cbb97f22eb Merge remote-tracking branch 'Strapi-Master/master' 2018-05-31 14:01:31 -05:00
Jim LAURIE
81488b86f0
Merge pull request #1305 from strapi/remove-info-db-ctb 
Remove warning in content-type-builder when creating tables
 2018-05-31 19:53:14 +02:00
Jim LAURIE
524999e451
Merge branch 'master' into remove-info-db-ctb 2018-05-31 19:04:12 +02:00
Kamal Bennani Bouchiba
ff2543652f
Merge branch 'master' into bugfix/graphql-returns-empty-array-when-entities-are-not-hosted-by-the-model 2018-05-31 17:06:45 +02:00
soupette
7f4488f65f Remove NoTableWarning int ctb since we automatically creates table 2018-05-31 16:14:08 +02:00
Jim LAURIE
f9b65b2e83
Merge pull request #1170 from marcostephan/third-party-windows-auth 
Fix third party auth providers always disabled on windows
 2018-05-31 16:06:31 +02:00
soupette
44cff94989 Fix conflicts 2018-05-31 15:31:46 +02:00
soupette
ff1eaa4b4f Disable autocomplete 2018-05-31 15:24:22 +02:00
soupette
e0ee3bb2a1 Fix margin in FilterOptions with bool select 2018-05-31 15:14:38 +02:00
soupette
b559f62e25 Fix boolean filters for mysql 2018-05-31 15:06:20 +02:00
Jim LAURIE
a9d725c74c
Merge branch 'master' into third-party-windows-auth 2018-05-31 14:54:51 +02:00
Jim LAURIE
b52f68a3ef
Merge pull request #1293 from okaris/count-route-controller-service 
Add count route on generated API
 2018-05-31 14:50:19 +02:00
Jim LAURIE
7a1e050526
Merge branch 'master' into count-route-controller-service 2018-05-31 14:33:35 +02:00
Jim LAURIE
033127105d
Merge pull request #1276 from johannpinson/patch-content-manager 
Improve <Ico> component for handle click if specified
 2018-05-31 14:27:50 +02:00
soupette
b8f0b327b7 Empty layout 2018-05-31 14:14:01 +02:00
soupette
2c262f7d19 Fix build css 2018-05-31 13:57:08 +02:00
Jim LAURIE
1d44f6c271
Merge branch 'master' into patch-content-manager 2018-05-31 13:53:07 +02:00
Jim LAURIE
6d3d03df8d
Merge pull request #1287 from johannpinson/patch-graphql-required 
Add `!` flag for GraphQL and non-nullable field
 2018-05-31 13:52:33 +02:00
Jim LAURIE
aeff4d663c
Merge branch 'master' into patch-graphql-required 2018-05-31 12:22:18 +02:00
Jim Laurie
5d8a24a010 Fix add multi column for mysql fix #1241 2018-05-31 12:03:24 +02:00
Salem
3146cadf30
Create ar.json 2018-05-31 01:12:42 +03:00
Salem
e6b6c67b00
Create ar.json 2018-05-31 01:05:33 +03:00
Salem
967f6e3d4b
Create ar.json 2018-05-31 01:04:17 +03:00
Salem
e6b812a357
Update languages.json 2018-05-31 01:03:12 +03:00
Salem
3075a9a70b
Create ar.json 2018-05-31 01:02:39 +03:00
soupette
b139a183f5 Improve anim 2018-05-30 16:37:49 +02:00
Jim Laurie
d2fd1204e4 Convert 1/0 to true/false for mysql fix #1203 2018-05-30 15:13:04 +02:00
Aurelsicoko
656c6d3463 Merge branch 'content-manager-filters' of github.com:strapi/strapi into content-manager-filters 2018-05-30 14:24:16 +02:00
Aurelsicoko
b83c8370f2 Enhance design filters 2018-05-30 14:19:36 +02:00
Jim Laurie
480f69c36f Fix cors on option request fix #914 2018-05-30 14:06:19 +02:00
soupette
6a720481b6 Fix anim 2018-05-30 13:59:49 +02:00
Jim LAURIE
bae8073c7b
Merge pull request #1181 from raulriera/additional-variables-mongoose 
Support for passing additional variables into mongoose
 2018-05-30 10:41:11 +02:00
Jim LAURIE
916c683e8d
Merge branch 'master' into additional-variables-mongoose 2018-05-30 10:02:50 +02:00
Jim LAURIE
f1a947eeaa
Merge pull request #1294 from johannpinson/patch-5 
Fix toJSON verification inside bookshelf for content-manager
 2018-05-30 10:02:10 +02:00
Raul Riera
156ed25265
Merge branch 'master' into additional-variables-mongoose 2018-05-29 16:28:22 -04:00
Jim LAURIE
70baca0a14
Merge branch 'master' into patch-5 2018-05-29 21:58:45 +02:00
Jim LAURIE
df324801e5
Merge pull request #1275 from strapi/fix/graphql 
Improve GraphQL query support
 2018-05-29 21:58:11 +02:00
Jim LAURIE
9a6d4330c1
Merge branch 'master' into additional-variables-mongoose 2018-05-29 21:27:18 +02:00
Jim LAURIE
aee7157d5a
Merge branch 'master' into fix/graphql 2018-05-29 21:09:57 +02:00
Jim Laurie
fbfdbf4812 Add oneToOne tests 2018-05-29 18:22:02 +02:00
soupette
dfa8c8e4b3 Empty layout.json 2018-05-29 18:13:02 +02:00
soupette
09ad42d1d2 Fixes #1262 2018-05-29 17:56:07 +02:00
soupette
85e638c901 Set values in placeholders when change the ct targets 2018-05-29 16:47:50 +02:00
Jim Laurie
50c30c79f4 Add oneToMany test and describe data independence 2018-05-29 16:30:29 +02:00
soupette
a7808b24e9 Refacto RelationBoc 2018-05-29 15:13:55 +02:00
Johann Pinson
de691ca47f
Fix toJSON verification 2018-05-29 15:08:43 +02:00
Okaris
89c97e6cae Added count to api template 2018-05-29 16:07:17 +03:00