yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-07 00:09:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,877 Commits 112 Branches 488 Tags
Commit Graph

5877 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim LAURIE
7f0159f547
Merge branch 'master' into fix-users-advanced-settings 2018-08-01 14:35:15 +02:00
Aurelsicoko
2c2d3efc3b Merge branch 'enhancement/relational-input' of github.com:strapi/strapi into enhancement/relational-input 2018-08-01 14:29:39 +02:00
soupette
39b64c7d1b Change dynamic sorting to allow it only for full size elements 2018-08-01 14:28:38 +02:00
Aurelsicoko
eb2fd6574d Force unique value in selectMany component 2018-08-01 13:58:57 +02:00
soupette
97e8bd46e2 Fix bug data sent 2018-08-01 13:42:31 +02:00
soupette
463e287038 Handle sort for full size elements 2018-08-01 12:03:50 +02:00
Jim LAURIE
f5eae7d4c2
Merge pull request #1680 from strapi/security-patch 
Apply policies on admin routes
 2018-08-01 10:22:52 +02:00
Jim LAURIE
4dc4db24bf
Merge branch 'master' into security-patch 2018-08-01 10:21:51 +02:00
Jim LAURIE
57d5a6afd9
Remove relations 2018-08-01 09:53:30 +02:00
Jim LAURIE
85c9ccd7ef
Clean layout file 2018-08-01 09:53:11 +02:00
KuongKnight
dd7e6a479c Merge remote-tracking branch 'upstream/master' 
# Conflicts:
#	packages/strapi-hook-bookshelf/lib/index.js
 2018-08-01 14:38:59 +07:00
Chris
78e8cb96ea Added the Dutch (NL) language 2018-08-01 09:17:53 +02:00
Jim LAURIE
acfcd936f5
Merge pull request #1673 from basilebong/translation/de 
Update DE translations
 2018-08-01 09:08:52 +02:00
Jim LAURIE
9243151fe6
Merge branch 'master' into translation/de 2018-08-01 09:08:26 +02:00
Jim LAURIE
871eb88eb2
Merge pull request #1674 from preco21/korean-translation 
Update KO translations
 2018-08-01 09:07:43 +02:00
Basile Bong
260a9bf69b Add > FR translation keys 2018-07-31 19:26:51 +02:00
Plusb Preco
5eeb1aa5be Merge branch 'korean-translation' of https://github.com/preco21/strapi into korean-translation 2018-08-01 00:10:10 +09:00
Plusb Preco
5902f41df8 Fix grammatical issue 2018-08-01 00:08:55 +09:00
Plusb Preco
9a0490bdda
Merge branch 'master' into korean-translation 2018-08-01 00:03:11 +09:00
Aurelsicoko
120f515e5e Better design many-to-many and add jump link 2018-07-31 16:57:16 +02:00
Basile Bong
1d6f4c957b Add > DE translation keys > strapi-plugin-content-manager 2018-07-31 16:55:43 +02:00
Plusb Preco
6fc7852cf1 Add missing translations and small grammatical fixes 2018-07-31 23:44:13 +09:00
Jim LAURIE
b2a9579442
Merge pull request #1664 from derrickmehaffy/discordProvider 
Add Discord auth provider
 2018-07-31 16:28:29 +02:00
Jim LAURIE
f559bcc82c
Merge branch 'master' into discordProvider 2018-07-31 16:18:04 +02:00
Jim LAURIE
44b3ae5f05
Update discord icon 2018-07-31 16:17:41 +02:00
Jim LAURIE
ca4f54151c
Merge pull request #1666 from strapi/fix-json-input 
Fix json input that was sending undefined.
 2018-07-31 15:36:09 +02:00
Jim LAURIE
d61ca192b0
Merge branch 'master' into fix-json-input 2018-07-31 15:26:21 +02:00
Jim LAURIE
d0732a6083
Merge pull request #1665 from strapi/fix-policies-generation 
Fix multi API controller
 2018-07-31 15:20:04 +02:00
Jim LAURIE
45671113e5
Merge branch 'master' into fix-policies-generation 2018-07-31 15:10:42 +02:00
soupette
043838ba3f Handle added upload relations 2018-07-31 14:54:52 +02:00
Jim LAURIE
d4a832f6a6
Merge pull request #1416 from brocgailit/master 
Implement sorting for SelectMany in Frontend
 2018-07-31 14:34:08 +02:00
Jim LAURIE
0b8178fa71
Merge branch 'master' into master 2018-07-31 14:17:49 +02:00
Aurélien GEORGET
065792bea6
Update User.settings.json 2018-07-31 14:16:27 +02:00
Aurélien GEORGET
8386003e47
Update permissions.js 2018-07-31 14:15:53 +02:00
soupette
2d4dded100 Improve ctb by making the continue button the submit one 2018-07-31 13:59:30 +02:00
Jim LAURIE
97bc4dac11
Merge pull request #1654 from mikmar88/patch-3 
Update IT translations
 2018-07-31 13:53:35 +02:00
Jim LAURIE
6ec8c627c0
Merge branch 'master' into patch-3 2018-07-31 13:53:29 +02:00
DMehaffy
fb0e848ee0
Merge branch 'master' into discordProvider 2018-07-31 04:52:54 -07:00
Jim LAURIE
b8942ccd1d
Merge pull request #1659 from jbbn/translation-resolves-1625 
Update PT-BR translations
 2018-07-31 13:45:04 +02:00
Jim LAURIE
8930e2a072
Merge branch 'master' into translation-resolves-1625 2018-07-31 13:44:55 +02:00
Jim LAURIE
7da9fef916
Merge pull request #1649 from basilebong/translation/de 
Added missing translation keys in DE language
 2018-07-31 13:42:58 +02:00
Jim LAURIE
a66c3d8eb0
Merge branch 'master' into translation/de 2018-07-31 13:42:51 +02:00
Jim LAURIE
37f9f2b02a
Merge pull request #1640 from bardaq/translation-keys-ru 
Update RU translations
 2018-07-31 13:41:30 +02:00
Jim LAURIE
a912976282
Merge branch 'master' into translation-keys-ru 2018-07-31 13:41:23 +02:00
Jim LAURIE
ac6dadddba
Merge pull request #1638 from maturano/feature/spanishTranslation 
Update ES translations
 2018-07-31 13:38:24 +02:00
Jim LAURIE
ba99e0f24d
Merge branch 'master' into feature/spanishTranslation 2018-07-31 13:38:18 +02:00
Jim LAURIE
641cdda790
Merge pull request #1634 from moersoy/master 
Update TR translations
 2018-07-31 13:37:34 +02:00
Jim LAURIE
6666444f48
Merge branch 'master' into master 2018-07-31 13:37:20 +02:00
soupette
ac382484b3 Fix path for advanced settings 2018-07-31 13:33:45 +02:00
Jim LAURIE
5cf5d2f60b
Merge pull request #1633 from mikmar88/patch-2 
Another update of it.json
 2018-07-31 13:33:43 +02:00