yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-31 18:08:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,755 Commits 121 Branches 507 Tags
Commit Graph

794 Commits

Author SHA1 Message Date
soupette
cf2bd304cf Upgrade buffet.js. Add icon to inputs label 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-03-04 11:59:26 +01:00
Alexandre Bodin
1a472c98a7 v3.5.2 2021-03-01 11:24:44 +01:00
Pierre Noël
e436a34d46
fix knex, pg, mysql versions (#9511) 2021-02-24 21:59:18 +01:00
Convly
3cc49c4ea8 v3.5.1 2021-02-23 11:23:21 +01:00
soupette
706baae9ec Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-18 14:58:33 +01:00
soupette
fb1845bb1c Merge branch 'features/i18n' of github.com:strapi/strapi into features/i18n-front 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-02-18 14:44:01 +01:00
Alexandre Bodin
469991f9f2 Merge branch 'master' into features/i18n 2021-02-18 14:36:32 +01:00
Alexandre Bodin
d02a7ba2fa v3.5.0 2021-02-18 11:28:28 +01:00
Alexandre Bodin
443ace7c62 Add route & handler + lifecycles 2021-02-12 12:23:51 +01:00
dependabot[bot]
04d1ac3de5
Bump sqlite3 from 5.0.0 to 5.0.1 (#9389) 
Bumps [sqlite3](https://github.com/mapbox/node-sqlite3) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/mapbox/node-sqlite3/releases)
- [Changelog](https://github.com/mapbox/node-sqlite3/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mapbox/node-sqlite3/compare/v5.0.0...v5.0.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-02-12 09:20:36 +01:00
Alexandre Bodin
68f3e2bee2 Init i18n fields 2021-02-11 16:48:01 +01:00
Alexandre Bodin
544f98b8ee v3.4.6 2021-02-03 19:32:36 +01:00
mfrachet
1f2f4c2986 Merge branch 'features/i18n' of github.com:strapi/strapi into features/i18n-front 2021-02-02 13:38:48 +01:00
Alexandre Bodin
5524d72396 Merge branch 'master' into features/i18n 2021-01-28 11:35:17 +01:00
Alexandre Bodin
4f9cc8a22c v3.4.5 2021-01-26 11:59:47 +01:00
soupette
9960ceb837 Merge branch 'chore/ctb' of github.com:strapi/strapi into features/i18n-front 2021-01-26 10:07:07 +01:00
soupette
8f958553b9 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-26 10:06:16 +01:00
HichamELBSI
c4131b07e5 Undo FormModal reducer to create the error 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-01-25 16:21:41 +01:00
Pierre Noël
3729f69e08 init i18n plugin 2021-01-22 17:57:15 +01:00
HichamELBSI
95ed2ee412 add redux-thunk to admin 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-01-21 20:00:45 +01:00
HichamELBSI
58a7665c63 Add redux to CTB 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2021-01-21 11:49:25 +01:00
Alexandre Bodin
542786f263 v3.4.4 2021-01-20 17:31:59 +01:00
Convly
3afb864e3d Add admin config option to declare admin host & port 2021-01-18 11:41:20 +01:00
Alexandre Bodin
553d64cafd v3.4.3 2021-01-14 10:46:50 +01:00
Alexandre Bodin
7505de6ad9 v3.4.2 2021-01-13 12:16:44 +01:00
soupette
a97a6622f5 Merge branch 'features/sso' of github.com:strapi/strapi into chore/ctb-improvements 2021-01-12 16:58:07 +01:00
dependabot[bot]
9bdcebf799
Bump pg from 8.4.0 to 8.5.1 (#9098) 
Bumps [pg](https://github.com/brianc/node-postgres) from 8.4.0 to 8.5.1.
- [Release notes](https://github.com/brianc/node-postgres/releases)
- [Changelog](https://github.com/brianc/node-postgres/blob/master/CHANGELOG.md)
- [Commits](https://github.com/brianc/node-postgres/compare/pg@8.4.0...pg@8.5.1)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2021-01-12 09:24:09 +01:00
Convly
5bf9375381 First impl (wip) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2021-01-08 09:52:21 +01:00
soupette
f0f123715a Refacto form util 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2021-01-07 18:14:09 +01:00
Convly
176e1c19c6 Remove useless dependency from getstarted packages.json 2020-12-28 15:05:33 +01:00
HichamELBSI
fec4ac3f04 Fix react-tooltip install 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:32 +01:00
HichamELBSI
d6ebd5a48b Add customRoutes to login page 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-28 15:05:29 +01:00
dependabot[bot]
c6b7c68709
Bump knex from 0.21.13 to 0.21.14 (#8968) 
Bumps [knex](https://github.com/knex/knex) from 0.21.13 to 0.21.14.
- [Release notes](https://github.com/knex/knex/releases)
- [Changelog](https://github.com/knex/knex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/knex/knex/compare/0.21.13...0.21.14)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-28 10:30:59 +01:00
soupette
8b9c3f2052 v3.4.1 2020-12-22 16:52:46 +01:00
DMehaffy
aad1c2fa03
Cleaning up codebase for doc repo move (#8892) 
* [WIP] Cleaning up codebase for doc repo move

WIP

* Fix deleted files, add links to doc repo issues

* Add repo note to readme
 2020-12-18 15:50:37 +01:00
Alexandre Bodin
ea636b4d31 v3.4.0 2020-12-17 13:18:50 +01:00
Alexandre Bodin
aa3d7eb2e0 Merge branch 'master' into feature/relational-fields 2020-12-17 12:58:34 +01:00
dependabot[bot]
5d4e1af5bc
Bump knex from 0.20.15 to 0.21.13 (#8918) 
Bumps [knex](https://github.com/knex/knex) from 0.20.15 to 0.21.13.
- [Release notes](https://github.com/knex/knex/releases)
- [Changelog](https://github.com/knex/knex/blob/master/CHANGELOG.md)
- [Commits](https://github.com/knex/knex/compare/0.20.15...0.21.13)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2020-12-17 11:01:49 +01:00
HichamELBSI
53231b5833 Merge branch 'master' into feature/relational-fields 2020-12-16 10:17:47 +01:00
HichamELBSI
f67b519f2f Merge branch 'master' into rbac/decorrelate-crud 2020-12-14 11:17:41 +01:00
HichamELBSI
0f60d4dc85 Fix RBAC CE 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-10 16:28:44 +01:00
HichamELBSI
a4f0bdecc8 Add x-to-many relation preview tooltip 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-12-02 18:00:06 +01:00
HichamELBSI
303e041a03 Fix PR feedback 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-11-27 15:07:24 +01:00
Alexandre Bodin
c9c936ba41 Merge branch 'master' into feature/relational-fields 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-11-25 16:37:32 +01:00
Alexandre Bodin
9b28991d8a v3.3.4 2020-11-25 16:22:45 +01:00
Pierre Noël
ace487ace8
update gitignore in example and in generate-new (#8707) 
Signed-off-by: Pierre Noël <petersg83@gmail.com>
 2020-11-25 09:54:11 +01:00
soupette
61a3740c06 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-11-23 14:43:07 +01:00
soupette
6e13c3f2a5 Merge branch 'feature/relational-fields' of github.com:strapi/strapi into core/cm-refacto-ediview-container 2020-11-20 10:46:58 +01:00
Alexandre Bodin
5fe7fa2f79 v3.3.3 2020-11-16 16:47:16 +01:00
Alexandre Bodin
17ea510715 v3.3.2 2020-11-10 19:02:11 +01:00