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
6,761 Commits 112 Branches 488 Tags
Commit Graph

6761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
eceafe7074 Fixes #1395 2018-08-06 16:18:37 +02:00
Jim LAURIE
1fc9513d80 Change lodash version 2018-08-06 16:03:09 +02:00
soupette
9101ba2efd Fixes #1660 2018-08-06 15:00:49 +02:00
Jim LAURIE
af83fdb867
Merge pull request #1679 from chrisdekker1997/master 
Added the Dutch (NL) language
 2018-08-06 09:43:34 +02:00
Jim LAURIE
90041a5fba
Merge branch 'master' into master 2018-08-06 09:43:14 +02:00
Chris Dekker
049d9c87b8 removed NL flag icon 2018-08-06 09:33:49 +02:00
Jim LAURIE
1971197b73
Merge pull request #1677 from basilebong/translation/fr 
Update FR translations
 2018-08-06 09:28:12 +02:00
Jim LAURIE
1dbbea458d
Merge branch 'master' into translation/fr 2018-08-06 09:27:28 +02:00
David Thomas
27c88e3a1a
Merge branch 'master' into auth-microsoft 2018-08-05 12:20:05 -04:00
soupette
34111caed5 Remove duplicate description in SelectMany 2018-08-03 18:05:22 +02:00
soupette
39a937851a Display updatedAt and createdAt fields in both the edit and list view of the ctm 2018-08-03 17:40:39 +02:00
soupette
ef158bff2e Fix last element dragged bug which returned undefined 2018-08-03 16:37:51 +02:00
soupette
6165ba01ad Fix duplicate key bug 2018-08-03 16:07:23 +02:00
Jim LAURIE
06262e9657 Fix load hook 2018-08-03 12:06:54 +02:00
Jakub Skořepa
2ad3121494
Use actual hash instead of randomly generated string 2018-08-02 20:09:12 +02:00
KuongKnight
f508da6fce Fixed custom primaryType option 2018-08-02 23:13:38 +07:00
soupette
10f323640d Fix fields display sorting 2018-08-02 17:29:06 +02:00
soupette
cf63abb344 Remove requiredFields not displayed from formValidations 2018-08-02 16:13:16 +02:00
Aurélien GEORGET
0f7f20b95c
Update User.settings.json 2018-08-02 16:08:10 +02:00
Aurelsicoko
a9bf0e7a9d Fix bug when the List wasn't existing in selectMany component 2018-08-02 15:51:12 +02:00
soupette
ccb4fe0270 Pull enhancement/sortable-input because master is too buggy with my modifications 2018-08-02 15:51:10 +02:00
Aurelsicoko
6a4a07428a Split component and put logic into the reducer 2018-08-02 15:27:30 +02:00
soupette
030836e6e7 Display hint for boolean 2018-08-02 14:42:11 +02:00
soupette
4609394db5 Fix bugs and refactored code 2018-08-02 14:26:31 +02:00
Jim LAURIE
8f2c285cb0
Merge pull request #1686 from VictorKolb/master 
Update sessions documentation - access auth user data
 2018-08-02 10:51:03 +02:00
victorkolb
99407d6472 Fix Policies docs. Appeal to the user part 2018-08-02 11:40:49 +03:00
soupette
3ed4c62f6c Fix bugs 2018-08-01 19:55:52 +02:00
KuongKnight
6c0abfc314 change length to 36 for type uuid mysql 2018-08-02 00:05:29 +07:00
soupette
54936eb7dc Finish variableWidth sort dynamic 2018-08-01 18:05:59 +02:00
Jim LAURIE
9ec9366815
Merge pull request #1675 from strapi/enhancement/relational-input 
Better design many-to-many and add jump link
 2018-08-01 16:35:12 +02:00
Jim LAURIE
c404de5e59
Merge branch 'master' into enhancement/relational-input 2018-08-01 15:01:59 +02:00
Jim LAURIE
738cbf656a Add rate limit on auth routes 2018-08-01 14:56:31 +02:00
Jim LAURIE
6c091378a8
Merge pull request #1672 from strapi/fix-users-advanced-settings 
Fix advanced settings in users permissions plugin
 2018-08-01 14:47:50 +02:00
Aurelsicoko
bbab1d47de Hide CSS glitch in relational selectMany input 2018-08-01 14:46:11 +02:00
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