yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-02 02:44:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,215 Commits 121 Branches 507 Tags
Commit Graph

1724 Commits

Author SHA1 Message Date
Alexandre Bodin
6bb7a7f198 v3.0.0 2020-05-26 15:09:32 +02:00
cyril lopez
b1b055fb0b
Merge branch 'master' into chore/fix-front-issues 2020-05-26 10:47:17 +02:00
soupette
b1b7941434 Fixes #5982 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-05-26 10:03:46 +02:00
Thiago Augusto
5003e47717
Adding private field support to UID (#6331) 
Signed-off-by: Thiago Augusto <thiago.android88@gmail.com>
 2020-05-26 09:46:48 +02:00
Alexandre Bodin
004c881c61 Merge branch 'develop' 2020-05-25 15:21:37 +02:00
soupette
633744a29c Fix ctb react-select ui 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-05-20 12:09:55 +02:00
cyril lopez
18409f043e
Merge branch 'develop' into fix/ctb-default-date-input 2020-05-12 09:19:20 +02:00
Alexandre Bodin
c90e3eb67b Merge branch 'develop' of github.com:strapi/strapi into develop 2020-05-07 13:14:35 +02:00
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
Alexandre Bodin
63c56d96f2 Check pluralize name in ctb 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-05-07 00:56:33 +02:00
virginieky
3a0f396ab3
Merge branch 'develop' into fix/ctb-default-date-input 2020-05-05 15:35:22 +02:00
HichamELBSI
e2bb3916a2 Fix default value for Date input in CTB 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-05-05 15:25:18 +02:00
Alexandre Bodin
72ad156f20 Merge branch 'master' into develop 2020-05-05 15:01:11 +02:00
Alexandre Bodin
a27d5f210d v3.0.0-beta.20.2 2020-05-05 14:56:13 +02:00
HichamELBSI
4b286aedf6 Reserved names api call 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-30 15:14:22 +02:00
Alexandre Bodin
0c0b65ecf2 Update with feedbacks 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-30 13:55:15 +02:00
Alexandre Bodin
fe2a683f9f Only check used names on creation 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-30 13:55:15 +02:00
Alexandre Bodin
d67d731ea9 Add alreadyUse and forbidden content type check on name 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-30 13:55:15 +02:00
Alexandre Bodin
a0c87af098 Fix test, add missing global 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-30 13:55:15 +02:00
Alexandre Bodin
7e41e28bf8 Add checks for timestamps attributes to avoid conflicts with timestamps option 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-30 13:55:15 +02:00
Alexandre Bodin
42c149e8bc Add reserved name check 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-30 13:55:15 +02:00
Alexandre Bodin
431715138a Init restricted-names API 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-30 13:55:15 +02:00
Ky
56fc6a3264 ctb component booleanbox alignment 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-29 23:49:27 +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
c11cc6ab97 apply design review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-29 11:47:38 +02:00
Alexandre Bodin
ed616333b2 Init new configuration management 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-29 11:06:35 +02:00
Ky
83f2022e20 Merge branch 'develop' of github.com:strapi/strapi into front/ui-improvements 2020-04-28 15:22:20 +02:00
Ky
f828314acc apply pr review 
Signed-off-by: Ky <virginie.ky@gmail.com>
 2020-04-28 15:20:41 +02:00
Alexandre Bodin
6a6d53b402 v3.0.0-beta.20.1 2020-04-28 10:00:23 +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
8f22ee2c5a Fix PR feedback 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-24 12:07:07 +02:00
soupette
8dcaf1b065 Fix styled compo lint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 15:49:51 +02:00
soupette
81454df46f Fix lint 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:12 +02:00
soupette
a34c0ca7d9 Remove react-datetime dep and Date compo in helper plugin 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:11 +02:00
soupette
dc0da4a125 Upgrade react-redux 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-22 14:01:10 +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
soupette
8ddf955af2 Fixes #5781 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-16 12:00:26 +02:00
soupette
873f810099 Fixes #5771 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-04-16 11:32:24 +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
76b6549ee4 Merge branch 'master' into develop 2020-04-07 20:21:37 +02:00
Jean-Sébastien Herbaux
a583d1b859
Fix/#3184/fix server crashs on database change (#5703) 
* Don't set connection field on create/edit operation on content-types & components

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Make sure that every component has a valid connection attribute

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove connection check on components load

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove default connections from core & webhook stores but make sure it's defined in the application lifecycle

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix component's associations that can be undefined instead of empty in populateBareAssociations

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove "default" connection from plugins' models

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove connection attribute from generated models (cli)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Mutate each component instead of reassign

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Build core_store and webhook model based on the current config

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Add connection to templates conditionally (based on args)

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Set default value for description to undefined instead of empty string

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove unnecessary complexity

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Update getStarted models

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Fix attributes parsing for generate:model

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Removed tpl option from generate:model/api

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>

* Remove tpl option from cli

Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-04-07 16:31:44 +02:00
Yassir Barchi
3a42a49162
Add RegExp as text type attribute validation option (#5648) 
* feat: add Regexp for attribute value validation

strapi-plugin-content-type-builder

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* feat: add Regexp for attribute value validation

strapi-plugin-content-manager

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* fix error on submit

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* add regex pattern validation

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* add api validation

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* fix lint issues

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* remove redundant code

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* fix en.json build issue

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>

* add the reset input logic to the regex field

Signed-off-by: Yassir Barchi <dev.yassir@gmail.com>
 2020-04-07 10:41:46 +02:00
HichamELBSI
c285c2a88e Fix some UI issues in the ML 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
 2020-04-03 17:15:09 +02:00
Alexandre Bodin
ff15757685 Merge tag 'v3.0.0-beta.19.5' 
v3.0.0-beta.19.5
 2020-04-01 11:31:04 +02:00
Alexandre Bodin
8d56e0c12f v3.0.0-beta.19.5 2020-04-01 11:27:56 +02:00