yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-31 09:56:44 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,790 Commits 119 Branches 507 Tags
Commit Graph

361 Commits

Author SHA1 Message Date
Alexandre Bodin
a27d5f210d v3.0.0-beta.20.2 2020-05-05 14:56:13 +02:00
Alexandre Bodin
6a6d53b402 v3.0.0-beta.20.1 2020-04-28 10:00:23 +02:00
soupette
71eec181fe Upagrade react helmet 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:10 +02:00
soupette
13d4c58bbe Update reducer injector in all plugins 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:05 +02:00
Alexandre Bodin
9d8944ebfe v3.0.0-beta.20 2020-04-16 15:10:53 +02:00
Alexandre Bodin
cc9d23c3ac Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-07 20:24:39 +02:00
Alexandre Bodin
8d56e0c12f v3.0.0-beta.19.5 2020-04-01 11:27:56 +02:00
Alexandre Bodin
50df7365d6 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 12:04:04 +02:00
Alexandre Bodin
24bd311678 v3.0.0-beta.19.4 2020-03-30 09:57:05 +02:00
soupette
818927f7b5 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-23 14:33:17 +01:00
Dacre Denny
45d83ea3f5
Removed unused 'cb' callback on send method of Email service and Email providers (#5371) 
Signed-off-by: dacre-denny <dacre@mooce.co.nz>
 2020-03-20 14:02:47 +01:00
soupette
f3bcddcf89 Identify front-end core files 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-06 13:33:32 +01:00
soupette
bdc2758613 Merge branch 'develop' of github.com:strapi/strapi into features/media-lib 2020-03-06 11:44:20 +01:00
soupette
8a8929e97c v3.0.0-beta.19.3 2020-03-06 10:02:36 +01:00
Alexandre Bodin
e1a7074a4e Merge branch 'develop' into features/media-lib 2020-03-05 14:39:29 +01:00
Alexandre Bodin
b3e18e1de6 v3.0.0-beta.19.2 2020-03-05 14:32:42 +01:00
soupette
f1de079d77 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-05 10:22:49 +01:00
Alexandre Bodin
8e91e5abaf v3.0.0-beta.19.1 2020-03-04 18:42:31 +01:00
soupette
d6bc4e1941 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-04 14:52:29 +01:00
Alexandre Bodin
e222792181 v3.0.0-beta.19 2020-03-04 14:24:23 +01:00
HichamELBSI
b5947621fc Merge branch 'master' into develop 2020-03-04 09:32:13 +01:00
Alexandre Bodin
7a8c865051 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 15:18:08 +01:00
soupette
ccc92b90a5 Add required info into the plugin object and update plugin generator 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-28 11:40:55 +01:00
Alexandre Bodin
3bcbde8f0b v3.0.0-beta.18.8 2020-02-26 12:01:37 +01:00
soupette
f924a53a8a Add pluginLogo to the plugin object in order to prevent fetching the logo from github 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-02-11 17:15:53 +01:00
Alexandre Bodin
8a970562c9 Merge branch 'master' into develop 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 19:15:20 +01:00
Jim LAURIE
638ddd201e
Merge branch 'master' into update-zh-hans-translations 2020-02-07 09:56:09 +01:00
cyril lopez
8745d2373a
Merge branch 'master' into feat/update-pl-translations 2020-02-06 14:39:05 +01:00
ruibaby
ff489ce051 feat: updated zh-Hans translations. 
Signed-off-by: ruibaby <i@ryanc.cc>
 2020-02-04 15:55:02 +08:00
Alexandre Bodin
349b28c291 Merge branch 'master' into develop 2020-01-31 18:21:42 +01:00
Alexandre Bodin
283a0db1ed Upgrade rimraf 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-31 16:56:50 +01:00
Virginie Ky
bb9ff9e47a Merge branch 'master' into develop 2020-01-31 15:10:07 +01:00
Alexandre Bodin
761ad68392 v3.0.0-beta.18.7 2020-01-30 16:15:25 +01:00
Virginie Ky
4ff189ac00 Merge branch 'master' into develop 2020-01-29 11:35:55 +01:00
Alexandre Bodin
4f5a0e7679 Cleanup eslint configs 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-27 10:49:57 +01:00
soupette
96e092b300 Change the way we load plugins 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-23 16:46:50 +01:00
Alexandre Bodin
1106c07795 v3.0.0-beta.18.6 2020-01-23 08:13:13 +01:00
Mariusz Wachowski
4e5326490e feat: updated pl translations 
Signed-off-by: Mariusz Wachowski <wachowski.mariusz@gmail.com>
 2020-01-22 21:54:08 +01:00
soupette
eb00b7e0ea Add newline-before-return rule 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 16:31:05 +01:00
soupette
b3ba8c27ef Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 16:12:46 +01:00
soupette
f50f89f0a8 Update eslint configuration 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-01-21 16:03:31 +01:00
Alexandre Bodin
2ee13c0a12 v3.0.0-beta.18.5 2020-01-21 15:44:44 +01:00
Jim LAURIE
df1fed99ec docs: update copyright date to 2020 2020-01-08 15:41:08 +01:00
Alexandre Bodin
f0028241c8 v3.0.0-beta.18.4 2020-01-07 17:00:28 +01:00
Jozef Cipa
61972f6292
Merge branch 'master' into feature/slovak-translations 2020-01-06 18:22:48 +01:00
Jaroslav Vrána
d65db853ea
Merge branch 'master' into feature/adminTranslationCs 2020-01-02 21:29:51 +01:00
Jaroslav Vrána
3d590e5762 fix: typo 2020-01-02 21:24:51 +01:00
jozefcipa
760a3d5dd8 Add slovak translations 2019-12-30 16:22:25 +01:00
Alexandre Bodin
c2650b085c v3.0.0-beta.18.3 2019-12-23 10:17:40 +01:00
Alexandre Bodin
8586b3dd39 v3.0.0-beta.18.2 2019-12-19 11:17:14 +01:00