yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-19 06:08:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,273 Commits 118 Branches 489 Tags
Commit Graph

1304 Commits

Author SHA1 Message Date
cyril lopez
439e9723b6 Fix conflict 2018-02-28 15:06:55 +01:00
cyril lopez
9c1b1e661c Created shared HeaderNav component 
Init design upload ConfigPage
Add shared translations for buttons
 2018-02-28 11:38:50 +01:00
cyril lopez
03ee9f10fb Add configurations to list-plugins page 2018-02-28 10:50:07 +01:00
cyril lopez
4c6343bed6 Get app env from the context 2018-02-27 18:43:33 +01:00
cyril lopez
da7382292c Add redux to admin page so we can get the app environments required for the upload config settings 2018-02-27 17:45:12 +01:00
cyril lopez
fb762e7068 Design InputFileDetails 2018-02-27 14:31:41 +01:00
cyril lopez
6d7eb115bc Improve Inputfile files slider dynamic 2018-02-27 13:50:20 +01:00
Abdón Rodríguez Davila
cc20511838 Avoid username capitalize 2018-02-27 10:00:59 +01:00
Jim LAURIE
f0706d474c
Merge branch 'master' into alpha.10.3 2018-02-26 18:15:49 +01:00
Jim Laurie
99559e20ea 3.0.0-alpha.10.3 2018-02-26 17:57:23 +01:00
Jim Laurie
03696df06a Add t-shirt icon in marketplace 2018-02-24 16:22:59 +01:00
Jim LAURIE
ae9880a374
Merge branch 'master' into file-upload-s3 2018-02-23 15:16:04 +01:00
Jim Laurie
543f21cdb1 Fix PR feedback 2018-02-23 14:57:58 +01:00
cyril lopez
5bbe541668 Merge branch 'master' of github.com:strapi/strapi into improve-ctm-edit 2018-02-22 14:01:31 +01:00
Özgür ERSOY
8821818028 turkish language | strapi-plugins 2018-02-22 02:34:00 +03:00
cyril lopez
6d9d272481 Fix conflict 2018-02-21 23:44:00 +01:00
Özgür ERSOY
cabe93a549 turkish language | strapi-admin 2018-02-22 00:50:45 +03:00
cyril lopez
5081061b98
Merge branch 'master' into plugin/img-upload-front 2018-02-20 12:32:45 +01:00
cyril lopez
8581e774b8 Clean svg 2018-02-20 12:31:31 +01:00
cyril lopez
9b62413044 Fix PR review 2018-02-20 12:16:11 +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
de3da8eaf7 Fix conflicts 2018-02-19 19:56:23 +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
3fb12f16ba
Merge branch 'master' into 3.0.0-alpha.10.2 2018-02-19 12:28:51 +01:00
Jim Laurie
0a5e80be93 3.0.0-alpha.10.2 2018-02-19 11:38:20 +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
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
cyril lopez
5538e4ffc2 Handle upload dynamic 2018-02-16 14:17:24 +01:00
cyril lopez
99ca8e7117
Merge branch 'master' into master 2018-02-16 13:39:38 +01:00
cyril lopez
05a229b8fc Allow dynamic content in strapi.notifications 2018-02-16 11:16:51 +01:00
inder redni
d030ed11cb polish language | resolve conflict 2018-02-16 10:43:58 +01:00
inder redni
3ae54bf958 polish language | input-file-component 2018-02-16 10:37:29 +01:00
Freakspot
33826d8e91 Fixed even more spelling mistakes and made some strings prettier 2018-02-16 01:13:20 +01:00
cyril lopez
e120abde4c Init Upload HomePage design 
Refacto and improve PluginHeader and its children components
Add an overrideRendering props to PluginHeaderActions so it can render components different from a simple button.
Create search actions and sagas
Create ContainerFluid component that will be used with other plugins
 2018-02-15 17:46:57 +01:00
inder redni
4a16c4ecff polish language | corrections 2018-02-15 17:21:24 +01:00
Freakspot
095df2dffc Translated most of all basic plugins and the admin into german 2018-02-15 16:26:19 +01:00
cyril lopez
91c3825ad4 fix conflict 2018-02-14 21:19:27 +01:00
Jim Laurie
25d8217986 3.0.0-alpha.10.1 2018-02-14 11:03:00 +01:00
cyril lopez
055ff7a244 add drop dynamic 2018-02-13 16:28:58 +01:00
cyril lopez
167f892519 Create InputfileDetails component 2018-02-12 19:49:28 +01:00
cyril lopez
010c3f8072 Design ImgPReview slider and remoive dynamic 2018-02-12 15:12:58 +01:00
inder redni
f7f8ce3bdb polish language | strapi-admin 2018-02-09 18:03:36 +01:00
Aurelsicoko
7c2317cba2 Update plugins list icon 2018-02-09 17:17:48 +01:00
Aurelsicoko
60821dca69 Update naming and default links icon 2018-02-09 17:16:30 +01:00
Aurelsicoko
36d650effa Update marketplace icon style 2018-02-09 17:09:35 +01:00
Aurelsicoko
b2d85c0b8e Update icon container style 2018-02-09 17:07:10 +01:00
Aurelsicoko
5cbfc6f050 Update logo 2018-02-09 17:01:04 +01:00
Pierre BURGY
b67c5e34a8
Merge branch 'master' into enhancement/database-uri 2018-02-07 15:00:37 +01:00
Pierre Burgy
7f6e5ba5a8 3.0.0-alpha.9.3 2018-02-07 14:22:27 +01:00
Aurelsicoko
0680850277 fix #318 2018-02-06 14:28:12 +01:00