yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-15 04:08:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,273 Commits 116 Branches 489 Tags
Commit Graph

373 Commits

Author SHA1 Message Date
Jim LAURIE
3853e78452
Merge branch 'master' into bug/1590 2018-08-09 17:37:54 +02:00
Jim LAURIE
b4d97fb9db 3.0.0-alpha.13.1 2018-08-09 13:39:34 +02:00
Alberto Maturano
186eb4de47 Parse environment variables on build configuration 
Move existing code to a shared library and invoke it on the build
process to parse environment variables on configuration files.

Looking for a consistent behavior.

close #1590
 2018-08-06 12:38:20 -05:00
Jim LAURIE
1fc9513d80 Change lodash version 2018-08-06 16:03:09 +02:00
Aurelsicoko
120f515e5e Better design many-to-many and add jump link 2018-07-31 16:57:16 +02:00
Jim LAURIE
a0c49e3340 Fix package conflicts 2018-07-26 16:19:28 +02:00
Jim LAURIE
09a2a4b73d 3.0.0-alpha.13.0.1 2018-07-26 16:12:17 +02: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
db8a47a016 Merge branch 'master' of github.com:strapi/strapi into rename-hook-middleware 2018-07-17 08:53:36 +02:00
David Thomas
c785248b2c Fix removal of the filter keyword for field type comparison 2018-07-13 19:25:40 -04:00
David Thomas
422530ceed Update fieldType comparison operator to strict 2018-07-13 18:00:47 -04:00
David Thomas
b3b2b32dd8 Merge branch 'master' of github.com:strapi/strapi 2018-07-13 17:52:43 -04:00
Jim LAURIE
d79a16b18c Fix hook lazy loading 2018-07-13 16:59:57 +02:00
Jim LAURIE
9bf04f5fef Fix conflict 2018-07-13 15:42:14 +02:00
Jim LAURIE
634165c379 Fix strapi utils hook detection 2018-07-12 17:27:32 +02:00
Alberto Maturano
beeaa55bd5 Fix temp directory reference for Yarn 
Also: fix logic detecting installation with Yarn and fix minor linter
errors.

related #1548 & #1463
 2018-07-11 22:44:04 -05: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
8a0bca029a Fix yarn not exist 2018-07-10 18:02:37 +02:00
Jim LAURIE
a6d48caad9 3.0.0-alpha.12.7 2018-07-10 15:37:47 +02:00
David Thomas
6143c3e1ca Skip number conversion on string fields 
Fixes #1524
 2018-07-08 09:50:48 -04:00
Jim LAURIE
383538e44b
Merge branch 'master' into review-logs 2018-07-03 17:35:08 +02:00
Jim LAURIE
f2f06cd966 Merge branch 'yarn-install' of github.com:strapi/strapi into yarn-install 2018-07-03 17:10:40 +02:00
Jim LAURIE
74adea6a40
Merge branch 'master' into yarn-install 2018-07-03 17:10:00 +02:00
Jim LAURIE
13013a40b4 Improve find npm global strapi performance 2018-07-03 16:43:08 +02:00
cyril lopez
ed89c8404d Fix install 2018-07-02 14:59:50 +02:00
Jim LAURIE
534b17f77f 3.0.0-alpha.12.6 2018-06-26 18:23:36 +02:00
cyril lopez
00f5af980e Fix project création in dev mode 2018-06-22 16:46:48 +02:00
Jim LAURIE
f6f077a996 Review app start logs 2018-06-22 16:28:54 +02:00
cyril lopez
41ebaa36e8 Remove yarn check when creating an application in dev mode 2018-06-22 15:07:12 +02:00
cyril lopez
f056c44dd6 Fix conflicts 2018-06-22 14:17:32 +02:00
soupette
e1790c31ef Manage to install strapi with yarn 2018-06-21 15:07:50 +02:00
Jim LAURIE
684a90ca56
Merge branch 'master' into bug/graphql-do-not-formatted-values-of-type-object 2018-06-19 16:28:56 +02:00
Jim LAURIE
92bdb4e758 3.0.0-alpha.12.5 2018-06-18 16:49:28 +02:00
Kamal Bennani
cd53ef5ddf
correctly determines if a value is valid candidate to become a number 2018-06-17 23:34:25 +02:00
Jim Laurie
69157dbba2 3.0.0-alpha.12.4 2018-06-13 17:39:37 +02:00
cyril lopez
6403df2960
Merge branch 'master' into bulk-actions 2018-06-08 12:21:11 +02:00
Kamal Bennani
ec1872b031
Do not format value of type array and object because it will turn to zero 2018-06-08 02:37:24 +02:00
Jim Laurie
2a449532ec 3.0.0-alpha.12.3 2018-06-06 17:34:07 +02:00
soupette
a7411bbd9d Fix conflicts in Strapi.js 2018-06-05 19:12:25 +02:00
soupette
8832a5baab Delete many and update relations 
Co-authored-by aurelsicoko@gmail.com
 2018-06-05 18:35:19 +02:00
Cyril lopez
cb895ab586 Fix PR feedback 2018-06-04 17:46:08 +02:00
soupette
b559f62e25 Fix boolean filters for mysql 2018-05-31 15:06:20 +02:00
soupette
48514fa8c4 Fix strapi utils convert params function 2018-05-25 15:57:07 +02:00
soupette
3847fd8c67 Fix filter for decimal 2018-05-25 13:21:57 +02:00
Jim Laurie
31c0d7457a 3.0.0-alpha.12.2 2018-05-17 16:54:27 +02:00
Jim Laurie
4fe7b6176e Fix conflicts & lint 2018-05-16 12:07:02 +02:00
Aurelsicoko
49c61d2ca5 Rework one-to-one business logic and use getValuePrimaryKey util with Mongoose 2018-05-10 12:19:33 +02:00
Jim LAURIE
c09f5138a2
Merge branch 'master' into eslint 2018-05-07 16:03:35 +02:00