yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-31 01:47:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,002 Commits 118 Branches 507 Tags
Commit Graph

199 Commits

Author SHA1 Message Date
Jim LAURIE
3f15b07aa0
Merge branch 'master' into fix/1483 2018-10-09 12:25:07 +02:00
Jim LAURIE
87c3af3d1e 3.0.0-alpha.14.3 2018-10-08 17:14:19 +02:00
Jim LAURIE
d586442fbd Fix deep delete relation for oneWay and when there is no relations 2018-10-08 12:25:44 +02:00
Jim LAURIE
870b31ce5c Fix typo update bookshelf service 2018-10-04 17:17:25 +02:00
Jim LAURIE
46c9b0f966 3.0.0-alpha.14.2 2018-09-26 11:08:10 +02:00
Alberto Maturano
154fc28a57 Normalize to standar file permissions 
As a result of taking a look on PR #1967 I realized there is 819
executable files in this repository. It is obvious this is an error.
 2018-09-24 12:33:09 -05:00
Jim LAURIE
6c897555a0
Merge branch 'master' into improvement/pluralize-routes 2018-09-18 13:47:13 +02:00
Jim LAURIE
4d8ace2db7 3.0.0-alpha.14.1.1 2018-09-13 18:39:37 +02:00
Jim LAURIE
f10335d717 3.0.0-alpha.14.1 2018-09-12 12:41:11 +02:00
soupette
b2d55b13a3 Fix pinput file 2018-09-07 12:47:45 +02:00
Jim LAURIE
cecef7385f 3.0.0-alpha.14 2018-08-27 16:30:16 +02:00
soupette
8003982b08 Fix conflicts 2018-08-22 14:17:09 +02:00
Luca
784e330b23
Merge branch 'master' into fix/NODE_ENV 2018-08-10 13:29:04 +02:00
soupette
688defca70 Fix conflict 2018-08-10 12:52:11 +02:00
Jim LAURIE
b4d97fb9db 3.0.0-alpha.13.1 2018-08-09 13:39:34 +02:00
Pierre Burgy
6a7ff7ff6d Pluralize routes 2018-08-08 14:59:10 +02:00
Luca
732fdcd732
fix(generate-api): update before.js env 2018-08-07 22:46:10 +02:00
Jim LAURIE
1fc9513d80 Change lodash version 2018-08-06 16:03:09 +02:00
Jim LAURIE
ba99e0f24d
Merge branch 'master' into feature/spanishTranslation 2018-07-31 13:38:18 +02:00
soupette
be73140600 Use toggle and fix editPage render loop 2018-07-27 16:15:26 +02:00
Jim LAURIE
09a2a4b73d 3.0.0-alpha.13.0.1 2018-07-26 16:12:17 +02:00
Alberto Maturano
1cf5dac2a6 Improve spanish translation 
- Fix minor errors and improve translation after review it in context
(comments from PR #1566)

- Missing ES translations (issue #1621)

- Normalize tone using a formal style
 2018-07-25 12:18:58 -05:00
Jim LAURIE
927a900f5b 3.0.0-alpha.13 2018-07-25 17:31:16 +02:00
Leon Kyneur
92b045f647 Include yarn.lock in packages .gitignore 2018-07-22 09:26:48 +08:00
Jim LAURIE
60663d2105
Merge branch 'master' into add-test-api 2018-07-20 10:34:54 +02:00
Jim LAURIE
9840247d1c Test generated API endpoint 2018-07-19 14:46:03 +02:00
Jim LAURIE
cf8184e223 Use hook prefix and rename 2018-07-11 16:23:14 +02:00
Jim LAURIE
fa94d12e4f 3.0.0-alpha.12.7.1 2018-07-10 18:10:42 +02:00
Jim LAURIE
a6d48caad9 3.0.0-alpha.12.7 2018-07-10 15:37:47 +02:00
Jim LAURIE
d09b0b1550 API search bookshelf 2018-07-05 11:28:55 +02:00
Jim LAURIE
d44262e94b API search mongoose 2018-07-05 10:22:43 +02:00
Jim LAURIE
534b17f77f 3.0.0-alpha.12.6 2018-06-26 18:23:36 +02:00
Jim LAURIE
bde30af875 Fix delete SQL entry with relations fix #1419 2018-06-21 19:42:03 +02:00
Jim LAURIE
92bdb4e758 3.0.0-alpha.12.5 2018-06-18 16:49:28 +02:00
Jim Laurie
69157dbba2 3.0.0-alpha.12.4 2018-06-13 17:39:37 +02:00
Jim Laurie
e773d5d0d0 Fix route count 2018-06-08 22:52:41 +02:00
Jim Laurie
2a449532ec 3.0.0-alpha.12.3 2018-06-06 17:34:07 +02:00
Okaris
d5cca40270 Added count to api template for bookshelf 2018-06-01 08:16:54 +03:00
Okaris
89c97e6cae Added count to api template 2018-05-29 16:07:17 +03:00
Jim Laurie
31c0d7457a 3.0.0-alpha.12.2 2018-05-17 16:54:27 +02:00
Aurelsicoko
4831610188 Fix toggle lang register page 2018-05-17 13:37:39 +02:00
Jim Laurie
4069a3bdaf Fix fail build on publish npm release 2018-05-16 15:22:20 +02:00
Jim Laurie
4fe7b6176e Fix conflicts & lint 2018-05-16 12:07:02 +02:00
Aurelsicoko
44cbc4098a Avoid server error during delete when the entry doesn't exist 2018-05-09 17:41:19 +02:00
Aurelsicoko
7e7b0f1d2f Move relation management into a separate file for Bookshelf 2018-05-09 16:08:58 +02:00
Aurelsicoko
dfec0b630b Add updateRelations on models and update generated API to use this method 2018-05-09 12:52:32 +02:00
Jim LAURIE
c09f5138a2
Merge branch 'master' into eslint 2018-05-07 16:03:35 +02:00
Jim Laurie
8f5443db17 3.0.0-alpha.12.1.3 2018-05-07 10:46:43 +02:00
soupette
666673961a Lint strapi-generate-api 2018-05-04 17:39:37 +02:00
soupette
2a30a20e7e Important! fix monorepo setup build command 2018-05-03 17:39:24 +02:00