yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 23:24:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,407 Commits 138 Branches 514 Tags
Commit Graph

5407 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
soupette
688defca70 Fix conflict 2018-08-10 12:52:11 +02:00
soupette
edf81024c1 Fix design 2018-08-10 12:45:56 +02:00
soupette
3feae01952 Fix edit view drag-n-drop design 2018-08-09 18:21:31 +02:00
Jim LAURIE
d30b03fd50
Merge pull request #1667 from maturano/bug/1590 
Parse environment variables on build configuration
 2018-08-09 17:52:40 +02:00
Jim LAURIE
3853e78452
Merge branch 'master' into bug/1590 2018-08-09 17:37:54 +02:00
Jim LAURIE
eada18a619
Merge pull request #1613 from synth3tk/auth-microsoft 
Add Microsoft Graph auth provider
 2018-08-09 17:10:08 +02:00
soupette
3d42a91a0c Remove react-sortable-hoc 2018-08-09 17:02:15 +02:00
Jim LAURIE
86828d731a
Merge branch 'master' into auth-microsoft 2018-08-09 16:59:00 +02:00
soupette
afa4c28378 Remove sortable-hoc and use react-dnd 2018-08-09 14:59:33 +02:00
Jim LAURIE
424ad7fff0
Merge pull request #1737 from strapi/3.0.0-alpha.13.1 
3.0.0-alpha.13.1
 2018-08-09 14:03:38 +02:00
Jim LAURIE
b4d97fb9db 3.0.0-alpha.13.1 v3.0.0-alpha.13.1 2018-08-09 13:39:34 +02:00
soupette
5a441a69af Fix conflict 2018-08-09 13:39:21 +02:00
soupette
4068b02091 Move react-dnd into the shared dependencies 2018-08-09 13:36:25 +02:00
Jim LAURIE
1f297b6bd4
Merge pull request #1681 from strapi/rate-limit 
Add rate limit on auth routes
 2018-08-08 14:50:12 +02:00
Jim LAURIE
012cb0332b
Merge branch 'master' into rate-limit 2018-08-08 14:36:42 +02:00
Jim LAURIE
0afe2eceac Add rate limit configs 2018-08-08 14:29:10 +02:00
Jim LAURIE
f15202b306
Merge pull request #1691 from strapi/fix-hook-load 
Fix load hook
 2018-08-08 14:21:12 +02:00
Jim LAURIE
ce0643e4df
Merge branch 'master' into fix-hook-load 2018-08-08 14:02:31 +02:00
Jim LAURIE
c2655b2c42
Merge pull request #1701 from strapi/fix-lodash-version 
Change lodash version
 2018-08-08 13:05:53 +02:00
Jim LAURIE
f75fb40e78
Merge branch 'master' into fix-lodash-version 2018-08-08 11:33:36 +02:00
Jim LAURIE
ac8d15fc12
Merge pull request #1703 from strapi/fix-1516 
Fix policy error
 2018-08-08 11:32:44 +02:00
Aurelsicoko
585527c963 Merge branch 'enhancement/relational-input' of github.com:strapi/strapi into enhancement/relational-input 2018-08-07 10:49:27 +02:00
Alberto Maturano
186eb4de47 Parse environment variables on build configuration 
Move existing code to a shared library and invoke it on the build
process to parse environment variables on configuration files.

Looking for a consistent behavior.

close #1590
 2018-08-06 12:38:20 -05:00
Jim LAURIE
92cbe5a56f
Fix layout 2018-08-06 17:11:10 +02:00
Jim LAURIE
70e9523ba8 Fix policy error 2018-08-06 16:59:14 +02:00
Jim LAURIE
1fc9513d80 Change lodash version 2018-08-06 16:03:09 +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
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
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