yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-10 17:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,454 Commits 115 Branches 488 Tags
Commit Graph

3454 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cyril lopez
8581e774b8 Clean svg 2018-02-20 12:31:31 +01:00
cyril lopez
ed46226872 Fix css 2018-02-20 12:29:27 +01:00
cyril lopez
2475b10538 Merge branch 'plugin/img-upload-front' of github.com:strapi/strapi into plugin/img-upload-front 2018-02-20 12:17:16 +01:00
cyril lopez
9b62413044 Fix PR review 2018-02-20 12:16:11 +01:00
cyril lopez
1e82268f25 Add Translations to plugin upload 2018-02-20 11:53:18 +01:00
cyril lopez
03378761e2 Created ListPage component 2018-02-20 11:34:15 +01:00
cyril lopez
269b228841 Merge branch 'master' of github.com:strapi/strapi into improve-ctm 2018-02-20 11:02:06 +01:00
Jim LAURIE
1af0377590
Merge pull request #668 from abdonrd/cancel-to-reset 
Rename cancel to reset
 2018-02-20 10:33:49 +01:00
Abdón Rodríguez Davila
a70192ec7f Fix the file indent 2018-02-20 10:20:04 +01:00
Abdón Rodríguez Davila
f1b2eed015 Rename cancel to reset 2018-02-20 10:20:04 +01:00
Jim Laurie
de3da8eaf7 Fix conflicts 2018-02-19 19:56:23 +01:00
Jim Laurie
44ec9e9e02 Route count uploads 2018-02-19 19:54:45 +01:00
cyril lopez
15f573585f Add default Props to Pagefooter 2018-02-19 17:48:54 +01:00
cyril lopez
ef2c076a84 Fix Li css 2018-02-19 17:47:11 +01:00
cyril lopez
79b9a01c14 Add Pagination 2018-02-19 17:41:05 +01:00
cyril lopez
28c3155e5f Created PageFooter component 
Component that handles the entries limit number and the page navigation
 2018-02-19 17:05:23 +01:00
Jim Laurie
9ef00e217d Delete file upload 2018-02-19 16:00:37 +01:00
Jim Laurie
cf029dac07 Create db entry on upload and get uploads 2018-02-19 15:41:26 +01:00
cyril lopez
9a13f1e0d0 Handle delete file 2018-02-19 15:14:32 +01:00
Jim Laurie
848db478e3 Create route to upload on local server 2018-02-19 14:26:20 +01:00
cyril lopez
601661ae92 Created FileIcon componen 2018-02-19 14:23:47 +01:00
cyril lopez
976ac68543 Add CopytoClipboard 2018-02-19 13:48:02 +01:00
cyril lopez
85f3b5c6d2 Desgin upload list 2018-02-19 13:10:35 +01:00
Jim LAURIE
a1019a0335
Merge pull request #657 from strapi/3.0.0-alpha.10.2 
3.0.0 alpha.10.2
 2018-02-19 12:55:54 +01:00
Jim LAURIE
3fb12f16ba
Merge branch 'master' into 3.0.0-alpha.10.2 2018-02-19 12:28:51 +01:00
Jim LAURIE
c98338942b
Merge pull request #649 from strapi/relations/polymorphic 
Relations/polymorphic
 2018-02-19 11:49:51 +01:00
Jim Laurie
0a5e80be93 3.0.0-alpha.10.2 v3.0.0-alpha.10.2 2018-02-19 11:38:20 +01:00
Jim LAURIE
e2be148071
Merge branch 'master' into relations/polymorphic 2018-02-19 11:32:06 +01:00
Jim LAURIE
97acced7da
Merge pull request #663 from denislutz/docImprove 
Some minor doc improvements on english level
 2018-02-19 11:09:51 +01:00
Jim LAURIE
71298adb53
Merge branch 'master' into docImprove 2018-02-19 10:58:23 +01:00
Jim LAURIE
771ea7662b
Merge pull request #665 from jamesdbruner/patch-2 
Renaming 'Cancel' to 'Reset'
 2018-02-19 10:38:03 +01:00
Jim LAURIE
2f704ea3c3
Merge branch 'master' into patch-2 2018-02-19 10:26:42 +01:00
Jim LAURIE
1277517159
Merge pull request #658 from strapi/fix-update-provider-email 
Fix update email provider
 2018-02-19 10:26:26 +01:00
Jim LAURIE
d0c7d8768b
Merge pull request #666 from igghera/master 
Fix #660: Allow side menu to scroll when content requires it
 2018-02-18 17:44:45 +01:00
Jim LAURIE
8f06a9c250
Merge branch 'master' into master 2018-02-18 17:09:00 +01:00
Jim LAURIE
8e060c3fdb
Merge pull request #662 from lucaperret/master 
fix(generate-new): prevent delete the node_modules dir
 2018-02-18 17:08:49 +01:00
Jim LAURIE
115283ac37
Merge branch 'master' into master 2018-02-18 16:54:33 +01:00
Denis Lutz
79128d35d1 fix writing mistakes 2018-02-18 16:17:19 +01:00
Denis Lutz
95bbc50553 Merge branch 'master' into docImprove 2018-02-18 16:03:06 +01:00
Andrea Gherardi
25a22dfe05 Fix #660: Allow side menu to scroll when content requires it 
Depending on screen resolution, when adding many content types the side
menu can't fit them all. This commit simply uses absolute positioning
and overflow-y: auto to allow vertical scrolling when it's needed.
 2018-02-18 09:30:28 +01:00
James
5a97c09a70
Renaming 'Cancel' to 'Reset' 
Helps clarify what the button actually does. Otherwise it seems like nothing is happening.
 2018-02-17 16:08:08 -07:00
Jim LAURIE
18a65a7435
Merge pull request #664 from jamesdbruner/patch-1 
Grammar edits
 2018-02-17 21:24:28 +01:00
James
7c1582cb7e
Grammar edits 2018-02-17 13:08:07 -07:00
Denis Lutz
c325fec851 some doc improvements on english level 2018-02-17 09:34:34 +01:00
Luca Perret
d0457c887a fix(generate-new): prevent delete the node_modules dir 2018-02-16 19:50:28 +01:00
cyril lopez
915c62d2ec Init Li component 2018-02-16 17:19:57 +01:00
cyril lopez
c01c31909f Create List and ListHeader components 2018-02-16 16:53:01 +01:00
cyril lopez
f35d53e653 Create EntriesNumber component and add dynamic to get files 2018-02-16 15:39:35 +01:00
Jim LAURIE
232d6cfe6e
Merge pull request #653 from oad-earth/master 
polish language
 2018-02-16 15:37:50 +01:00
Jim Laurie
4d1f973093 Merge branch 'plugin/img-upload-front' of github.com:strapi/strapi into file-upload-backend 2018-02-16 15:32:58 +01:00