yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-01 10:23:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,025 Commits 121 Branches 507 Tags
Commit Graph

3025 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim LAURIE
2eabbbf847
Merge pull request #560 from strapi/fix-update-user 
Fix user update via API and content-type-builder
 2018-02-05 17:46:40 +01:00
Jim LAURIE
dcb2839260
Merge branch 'master' into fix-update-user 2018-02-05 17:09:26 +01:00
Jim LAURIE
08cc524b8e
Merge pull request #572 from strapi/encrypt/usage 
Encrypt/usage
 2018-02-05 16:54:41 +01:00
Jim Laurie
1f3efc6416 3.0.0-alpha.9.2 v3.0.0-alpha.9.2 2018-02-05 16:36:33 +01:00
Jim LAURIE
b9705edde6
Merge branch 'master' into encrypt/usage 2018-02-05 16:33:00 +01:00
Jim LAURIE
09ff7f45f9
Merge pull request #558 from strapi/improve/lib-input 
Improve/lib input
 2018-02-05 13:47:50 +01:00
Jim LAURIE
f4c1acec53
Merge branch 'master' into improve/lib-input 2018-02-05 12:49:22 +01:00
Jim LAURIE
ec56b3a884
Merge pull request #564 from strapi/add/input-textarea 
Add/input textarea
 2018-02-05 12:45:17 +01:00
Jim LAURIE
5fece61ed9
Fix set params id 2018-02-05 12:41:10 +01:00
cyril lopez
7a54b11051 Add input s type description in DefaultInputError 2018-02-05 12:34:44 +01:00
cyril lopez
2afe10812c Fix documentation 2018-02-05 12:10:48 +01:00
Aurelsicoko
4650b35dcf Optimize code readibility 2018-02-05 11:50:03 +01:00
Jim LAURIE
eaf842a4c0
Merge pull request #539 from Froelund/master 
Moved user validation logic from Jwt service to permissions policy
 2018-02-05 11:14:55 +01:00
Jørgensen
7580fe16f3
Merge branch 'master' into master 2018-02-04 12:09:57 +01:00
Aurelsicoko
a03a283e09 Enhance dependency exposer 2018-02-02 18:58:14 +01:00
Aurelsicoko
494a970df0 Verify signature of incoming code 2018-02-02 18:27:03 +01:00
cyril lopez
fa033ffbd3 Add documentation 2018-02-02 17:24:39 +01:00
cyril lopez
fdd6d3aaa8 Created InputTextAreaWithErrors and add a DefaultInput if the type does not exist in the InputsIndex 2018-02-02 17:20:35 +01:00
Jim LAURIE
f247b78eec
Merge pull request #559 from M1chaelTran/bugfix/552 
close #552
 2018-02-02 17:05:10 +01:00
cyril lopez
3e12bae5ef Created InputTextArea component 2018-02-02 17:01:00 +01:00
cyril lopez
bb122c5134
Merge pull request #562 from strapi/add/input-toggle 
Add/input toggle
 2018-02-02 16:34:31 +01:00
cyril lopez
dc4e380787 Simplified the object needed for InputDescription and InputErros message 2018-02-02 16:12:30 +01:00
cyril lopez
ced682764a Add documentation 2018-02-02 16:03:49 +01:00
cyril lopez
da58b0aec1 Created InputsIndex component that references all the inputs available 2018-02-02 15:38:57 +01:00
cyril lopez
9d62c5d046 Created InputToggleWithErrors component 
Fix InputTextWithErrors & InputNumberWithErrors props so it is cleaner
 2018-02-02 15:25:20 +01:00
M1chaelTran
1d24e2b873 close #552 2018-02-03 00:30:01 +11:00
cyril lopez
96ba8e16fc Created InputToggle 2018-02-02 13:07:38 +01:00
Jim Laurie
a8c59f999a Fix user update via API and content-type-builder 2018-02-02 12:59:34 +01:00
cyril lopez
260428711d Merge branch 'master' of github.com:strapi/strapi into improve/lib-input 2018-02-02 12:13:26 +01:00
cyril lopez
0de28c23a4 Fix indentation 2018-02-02 12:12:25 +01:00
Jørgensen
dffa0b03e3
Merge branch 'master' into master 2018-02-02 08:04:42 +01:00
cyril lopez
618db05a1d Add InputTextWithErrors documentation and change inputTextWithErrors props 2018-02-01 18:47:51 +01:00
cyril lopez
6bddd33ba8 Fix doc typo 2018-02-01 17:25:52 +01:00
cyril lopez
f01182c53a Add InputNumber documentation 2018-02-01 17:18:17 +01:00
cyril lopez
4bcbe8e446 Created InputNumberWithError component 2018-02-01 17:04:08 +01:00
cyril lopez
09b7a13095 Created InputNumber component 2018-02-01 16:49:25 +01:00
cyril lopez
93e1147f96 Created InputErrors component 2018-02-01 16:37:52 +01:00
cyril lopez
e5f74a7022 Created InputDescription component and associated doc 2018-02-01 15:32:07 +01:00
cyril lopez
d212c7aba0 Created InputText and InputTextWithErrors components 2018-02-01 14:30:22 +01:00
Jim LAURIE
0705d4fdf5
Merge pull request #554 from strapi/alpha.9.1 
Install analytics plugin by default on strapi new project
 2018-02-01 12:57:02 +01:00
Jim LAURIE
4e2f844cc9
Merge branch 'master' into alpha.9.1 2018-02-01 12:22:26 +01:00
cyril lopez
17746742bf Add Label documentation 
Change Label value props to message so it s more explicit
 2018-02-01 11:42:36 +01:00
Jim Laurie
f9a818e49c 3.0.0-alpha.9.1 v3.0.0-alpha.9.1 2018-02-01 11:08:15 +01:00
Jim Laurie
ec5c19a8d4 Handle no core plugins installation on strapi new 
Install analytics plugin by default on strapi project
 2018-02-01 11:06:26 +01:00
cyril lopez
a1e890f0e1 Created Label component 2018-02-01 11:03:44 +01:00
Jim LAURIE
65ed0d5641
Merge pull request #471 from joshtechnologygroup/hot_fix_-467 
Fixes https://github.com/strapi/strapi/issues/467
 2018-01-31 16:14:50 +01:00
Amit Yadav
7aa83dd897
Merge branch 'master' into hot_fix_-467 2018-01-31 19:25:08 +05:30
Amit Yadav
aabecd2fec
Removed async/await as it had to impact 2018-01-31 19:22:52 +05:30
Jim LAURIE
b8ed7f63f6
Merge pull request #547 from strapi/update/roadmap 
Update ROADMAP.md
 2018-01-31 14:14:51 +01:00
Jim LAURIE
06be00a3d5
Merge branch 'master' into update/roadmap 2018-01-31 13:57:48 +01:00