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

9273 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cyril lopez
6aaa064822 Update package 2018-02-15 09:47:53 +01:00
cyril lopez
91c3825ad4 fix conflict 2018-02-14 21:19:27 +01:00
Jim Laurie
16ace0ed5d Fix indent configs js examples 2018-02-14 17:14:11 +01:00
Jim Laurie
00230f0f8f Hot fix provider login 
Co-authored-by: soupette <cyril.lpz@gmail.com>
 2018-02-14 17:02:44 +01:00
Jim LAURIE
cba73114b9
Merge pull request #642 from strapi/3.0.0-alpha.10 
3.0.0-alpha.10.1
 2018-02-14 11:20:24 +01:00
Jim Laurie
25d8217986 3.0.0-alpha.10.1 v3.0.0-alpha.10.1 2018-02-14 11:03:00 +01:00
cyril lopez
2a842adfee Design InputFileWithErrors 2018-02-13 19:49:10 +01:00
cyril lopez
0013e90eb0 Created InputFileWithErrors component and add it to the index 2018-02-13 18:56:53 +01:00
cyril lopez
8e73ff6e0b Finish ImgPreview dynamic 2018-02-13 18:46:54 +01:00
cyril lopez
d769cf21da Handle drag and drop files events 2018-02-13 18:29:47 +01:00
Jim LAURIE
f0f06543a5
Merge pull request #638 from strapi/fix-config-user 
Fix config user and front things
 2018-02-13 17:11:15 +01:00
cyril lopez
989541b91e Created ImgPreviewArrow component 
component that allows to navigate between pictures
 2018-02-13 16:46:51 +01:00
cyril lopez
055ff7a244 add drop dynamic 2018-02-13 16:28:58 +01:00
Jim Laurie
bbc2493f07 Fix front-end before release 
Fix eye position input password
Add notification on settings update plugin users permissions
Fix error display on login page

Co-authored-by: soupette <cyril.lpz@gmail.com>
 2018-02-13 16:26:27 +01:00
Jim Laurie
c52fe7165b Fix get email settings reset password 2018-02-13 15:59:06 +01:00
Aurelsicoko
128a3a67e6 Merge branch 'master' of github.com:strapi/strapi into relations/polymorphic 2018-02-13 15:13:06 +01:00
Jim Laurie
957e7a08cb Environment agnostic for users-permissions configs 2018-02-13 15:04:21 +01:00
Jim LAURIE
520c0bfcc8
Merge pull request #620 from strapi/fix-filter-doc 
Fix filter documentation
 2018-02-13 13:21:39 +01:00
Jim LAURIE
df48e85ff5
Merge branch 'master' into fix-filter-doc 2018-02-13 11:28:24 +01:00
Jim LAURIE
63f2c83a64
Merge pull request #628 from strapi/configs-databases 
Handle configuration in database
 2018-02-13 11:28:11 +01:00
Jim LAURIE
4ab9907bd7
Merge branch 'master' into configs-databases 2018-02-13 11:10:05 +01:00
Jim LAURIE
039efc0b42
Merge pull request #632 from lucaperret/feat/tmp-connection 
Feat/tmp connection
 2018-02-13 11:09:53 +01:00
cyril lopez
167f892519 Create InputfileDetails component 2018-02-12 19:49:28 +01:00
Luca
a3f300e34a
Merge branch 'master' into feat/tmp-connection 2018-02-12 19:30:18 +01:00
Luca Perret
3eb09a54d5 use tmp path for temporal connectivity check 2018-02-12 19:14:36 +01:00
Luca Perret
9f6a57245b allowing docker volume on node_modules 2018-02-12 19:08:37 +01:00
Aurelsicoko
134fa960cd Limit populate object where model is equal 2018-02-12 19:04:36 +01:00
cyril lopez
dc4a462405 Display icon if file is not picture 2018-02-12 19:02:23 +01:00
Aurelsicoko
46ff89e404 Make polymorphic associations possible 2018-02-12 18:54:34 +01:00
cyril lopez
a06441cd53 Check for file type 2018-02-12 18:46:45 +01:00
cyril lopez
9ff491ebf1 Design label 2018-02-12 18:20:43 +01:00
Jim LAURIE
5f3bbb0b44
Merge pull request #627 from strapi/enhancement/tutorials-doc 
Enhancement/tutorials doc
 2018-02-12 18:12:47 +01:00
Jim LAURIE
a1e8eb5467
Merge branch 'master' into enhancement/tutorials-doc 2018-02-12 17:45:01 +01:00
Jim Laurie
1a7e3b70f6 Add store data documentation 2018-02-12 17:43:16 +01:00
Jim LAURIE
0af9b111e2
Merge pull request #629 from strapi/enhancement/README.md 
Move Heroku button in README.md
 2018-02-12 16:52:24 +01:00
Jim Laurie
b74dd97bec Fix get null config bookshelf 2018-02-12 15:16:23 +01:00
cyril lopez
010c3f8072 Design ImgPReview slider and remoive dynamic 2018-02-12 15:12:58 +01:00
Jim Laurie
f155736012 Fix mask for admin routes 2018-02-12 14:38:54 +01:00
Pierre Burgy
d5470f0d07 Move Heroku button in README.md 2018-02-12 14:35:53 +01:00
Jim Laurie
7607d20310 Fix PR feedback 2018-02-12 14:10:20 +01:00
Jim Laurie
5bf1e51422 Fix conflicts 2018-02-12 13:25:43 +01:00
Pierre Burgy
54e0dd1d84 Add tutorials in doc 2018-02-12 12:07:36 +01:00
Jim LAURIE
6207a67da2
Merge pull request #626 from strapi/enhancement/README.md 
Add Heroku deploy button in README.md
 2018-02-12 11:59:27 +01:00
Pierre Burgy
859a96df3a Add Heroku deploy button in documentation README.md 2018-02-12 11:48:29 +01:00
Pierre Burgy
7ef60701fe Change version in README.md documentation 2018-02-12 11:43:55 +01:00
Pierre Burgy
ae6d88bca4 Add Heroku deploy button in README.md 2018-02-12 11:39:31 +01:00
cyril lopez
aaff3e8f87 Init Inputfile component 
Handle preview for both existing files and uploaded ones
 2018-02-12 11:23:02 +01:00
Jim LAURIE
bde677735b
Merge branch 'master' into fix-filter-doc 2018-02-09 20:25:32 +01:00
inder redni
87e35d3f95 polish language | strapi-plugin-content-manager 2018-02-09 20:11:40 +01:00
Jim LAURIE
589679ce9b
Merge pull request #618 from strapi/design/icons 
Update icons and logo
 2018-02-09 18:35:27 +01:00