yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-08 16:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,044 Commits 120 Branches 493 Tags
Commit Graph

1149 Commits

Author SHA1 Message Date
Alexandre Bodin
f192d5e171 Merge branch 'master' into develop 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-07 13:14:23 +02:00
Alexandre Bodin
55c006a6b1 v3.0.0-beta.20.3 2020-05-07 13:02:11 +02:00
Vanessa
022b228279
Fix issue #5934 - add path folder for thumbnail and breakpoints images (#6078) 
Signed-off-by: Lith <lith@amykron.com>
 2020-05-07 09:28:26 +02:00
Ky
55c86b57b2 update getHeaderLabel unit tests 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-05-06 16:49:07 +02:00
Ky
005d060730 Merge branch 'develop' of github.com:strapi/strapi into front/media-lib-loader 2020-05-05 16:23:51 +02:00
Ky
b5dfa46d31 apply PR review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-05-05 16:23:05 +02:00
Alexandre Bodin
72ad156f20 Merge branch 'master' into develop 2020-05-05 15:01:11 +02:00
Alexandre Bodin
a3304c7b88 Merge tag 'v3.0.0-beta.20.2' 
v3.0.0-beta.20.2

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-05 15:00:38 +02:00
Alexandre Bodin
a27d5f210d v3.0.0-beta.20.2 2020-05-05 14:56:13 +02:00
Ky
def471ef5f apply PR review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-05-05 14:46:17 +02:00
Ky
c02abe90fc rename const 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-05-05 01:07:26 +02:00
Ky
18ac81057b Merge branch 'develop' of github.com:strapi/strapi into front/media-lib-loader 2020-05-05 00:54:56 +02:00
Ky
03d86c53fc split media lib HomePage into compos 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-05-05 00:52:47 +02:00
Alexandre BODIN
6419a4e664
Merge pull request #5927 from strapi/chore/strapi-database-lifecycle 
Chore/strapi database lifecycle
 2020-05-04 17:34:58 +02:00
Alexandre Bodin
9cb850e212 Merge branch 'master' into develop 2020-05-04 12:19:51 +02:00
Convly
a615f16bb5 Move orm condition directly into the pruneObsoleteRelations query 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-05-04 11:27:52 +02:00
Convly
8a2050add0 Apply PR feedback and fix tests 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-05-04 11:11:23 +02:00
Convly
4046e4227c Assign type value directly in configurator properties 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-05-04 11:11:23 +02:00
Convly
079ad89781 Prune obsolete files relations on startup 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-05-04 11:11:22 +02:00
Alexandre Bodin
c364fcd0e2 Move lifecycles to sub field and added documentation 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-04 10:55:08 +02:00
Ky
8c4cb54d23 apply PR review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-05-04 10:50:53 +02:00
cyril lopez
d5b989121e
Merge branch 'develop' into front/media-lib-loader 2020-04-30 17:16:57 +02:00
Ky
db7b8655b5 apply PR review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-30 11:56:09 +02:00
Ky
ec71ed2c92 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-29 15:45:30 +02:00
Ky
8a75ba4c34 CTM editview alignment 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-29 15:28:16 +02:00
Alexandre Bodin
da910b0b39 Fix create new project cli option for mongo not handled correctly 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Fix typos

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Add tests for env helpers

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

Typo

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:44 +02:00
Ky
dfd277ab25 design review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-28 16:58:13 +02:00
Ky
83f2022e20 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-04-28 15:22:20 +02:00
Alexandre Bodin
6a6d53b402 v3.0.0-beta.20.1 2020-04-28 10:00:23 +02:00
virginieky
a43386a6de
Merge branch 'develop' into front/media-lib-loader 2020-04-27 23:52:37 +02:00
Ky
8b1b68242a Media lib listView loadingBar and loadingIndicator 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-27 23:48:43 +02:00
Ky
18cd135268 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-04-27 17:51:19 +02:00
cyril lopez
62c01a08e5
Merge branch 'master' into develop 2020-04-27 17:50:25 +02:00
Alexandre BODIN
5dac3e4866
Add metris to the media lib with ratelimit (#5946) 
* Add daily sender

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>

* Add media lib events and ratelimiter wrapper

Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-27 16:08:55 +02:00
Ky
4cd1b6c124 Merge branch 'front/ui-improvements' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-26 18:55:03 +02:00
Ky
9384a00a96 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-26 18:13:20 +02:00
soupette
5a41f68f2b Merge branch 'master' of github.com:strapi/strapi into develop 2020-04-24 15:34:45 +02:00
soupette
c44dd2dbd8 Add front-end media lib usage events 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-23 14:18:58 +02:00
soupette
81454df46f Fix lint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:12 +02:00
soupette
6d9bc79726 Upgrade react-intl dependency to latest 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:08 +02:00
soupette
b71647a7d7 Remove unneeded packages 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:07 +02:00
soupette
bf1040f9b9 Upgrade reactstrap dependency. Fixes #5837 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-17 14:00:53 +02:00
Alexandre Bodin
9d8944ebfe v3.0.0-beta.20 2020-04-16 15:10:53 +02:00
HichamELBSI
2f7f9f5f25 Allow deselect files 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-16 12:43:55 +02:00
soupette
0e3fdfc0ca Change format in input file 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-16 11:52:51 +02:00
Alexandre Bodin
b44a57d408 Use path.extname if mime-type doesnt find extension 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-16 10:50:18 +02:00
HichamELBSI
bbd4fcb7e3 Fix toggle all 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-16 10:29:25 +02:00
Alexandre Bodin
e8bac9c9a9 Merge branch 'features/media-lib' of github.com:strapi/strapi into features/media-lib 2020-04-15 19:15:26 +02:00
Alexandre Bodin
7123f68737 Allow to create the media.update webhook + fix default width and height 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-15 19:15:21 +02:00
virginieky
94eca0a21e
Merge pull request #5810 from strapi/media-lib/cm-delete-file 
Fix input media delete
 2020-04-15 19:04:09 +02:00