yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-10-21 04:51:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,524 Commits 111 Branches 504 Tags
Commit Graph

70 Commits

Author SHA1 Message Date
Jim LAURIE
693ea6ed93
Merge branch 'master' into fix/reattempt-1851 2018-11-22 18:18:20 +01:00
ByoungYong Kim
6bc3009537 Fixed a bug 2018-11-17 22:55:41 +01:00
ByoungYong Kim
fa2c6f37aa
Merge branch 'master' into fix/reattempt-1851 2018-11-17 20:27:08 +01:00
Alberto Maturano
f87da6631f refactor: Remove never executed conditional part 
Also, the variable should be array type, not numeric...
 2018-11-15 15:56:03 -06:00
Jim LAURIE
63666a1ab2 Auto open admin first start 2018-11-08 21:07:33 +01:00
ByoungYong Kim
a51b030e82 Made hold public base url and Auth controller utilize the value. 2018-10-09 13:03:59 +02:00
Alberto Maturano
0e164d6da8 Don't parse npm scripts for dynamic config 
Fix the fix merged with #1575

The original patch was done over a block of code moved on #1667
resulting in re-introducing code that now is not invoqued and continue
with the bug reported on #916.

This patch take the original changes and put them in the current correct
place.
 2018-09-21 16:27:35 -05:00
Jim LAURIE
184c49ef2c
Merge branch 'master' into fix-916 2018-09-14 15:47:25 +02:00
Jim LAURIE
44daf8d962
Merge branch 'master' into 3.0.0-alpha.14.1 2018-09-13 14:51:31 +02:00
Alberto Maturano
bd94d7a7bb Fix bug on conditional code 
`'server.proxy' || {}` is **always** returning `server.proxy`. The real
intention is pass `{}` as default value for `_.get`.
 2018-09-12 12:55:30 -05:00
Jim LAURIE
45dfc328c2 Fix admin in dev mode 2018-09-12 15:47:28 +02:00
Jim LAURIE
31391ec711
Merge branch 'master' into enhancement/front-start 2018-09-07 15:14:55 +02:00
DMehaffy
6dd705a178 Remove lines that aren't needed 
Per Jim, removed some lines we don't need.
 2018-08-30 02:46:44 -07:00
DMehaffy
1991857842 Update per PR Feedback 2018-08-29 08:01:55 -07:00
DMehaffy
282d1a3749 Fix typo :( 2018-08-28 02:40:08 -07:00
DMehaffy
76befdbc26 Fix strapi can't find proxy config 
Thank you @MartinMuzatko for your help
 2018-08-28 01:12:53 -07:00
DMehaffy
d16191576a Add semicolons per feedback 2018-08-27 08:05:44 -07:00
DMehaffy
fb6a38c593 Update based on PR Feedback 2018-08-27 07:44:36 -07:00
DMehaffy
617324abee Basic global proxy support 2018-08-27 06:27:42 -07:00
Aurélien GEORGET
50244f0089
Merge branch 'master' into enhancement/front-start 2018-08-21 10:33:03 +02:00
Jim LAURIE
3853e78452
Merge branch 'master' into bug/1590 2018-08-09 17:37:54 +02:00
Aurelsicoko
cf3d0f65e2 Use create-react-app script to open browser 2018-08-08 15:21:18 +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
06262e9657 Fix load hook 2018-08-03 12:06:54 +02:00
Ben Ackroyd
275f50bf73 Don't parse npm scripts for dynamic config 
Fixes #916
 2018-07-15 19:54:52 +10:00
Jim LAURIE
7d12a89f8f Fix custom hook load 2018-07-12 12:36:45 +02:00
Jim LAURIE
cf8184e223 Use hook prefix and rename 2018-07-11 16:23:14 +02:00
soupette
6633b14ef3 Add lint to strapi 2018-05-04 17:02:27 +02:00
Luukth
4f83965fa9
Update configurations.js 
Fix for issue #800
this.config.url will now contain the host from the configuration file.
 2018-04-26 16:00:05 +02:00
Aurelsicoko
c0b18fa29c Load as a hook and load it at the end 2018-03-28 20:13:09 +02:00
cyril lopez
19648b1a13 Allow to disable GA 2018-03-23 12:44:17 +01:00
Aurelsicoko
2f8169c792 Hide specific model fields from response 2018-02-06 18:09:04 +01:00
Aurelsicoko
b04a495bc4 Prefix plugin global name 2018-01-16 17:54:35 +01:00
Aurelsicoko
9031ff1799 Fix webpack public path and production configuration templating 2018-01-15 17:45:22 +01:00
Aurelsicoko
b208b0aa92 Change table naming for plugins 2017-12-18 14:07:35 +01:00
Aurelsicoko
0230184619 Apply same algorithm to clearRelation method 2017-12-15 18:04:56 +01:00
Aurelsicoko
74e1f0529d Fix specific case in one-to-one relation 2017-12-13 14:36:07 +01:00
Aurelsicoko
b08a4d811c Use local global to expose model for Bookshelf & move globalId definition in the core 2017-12-13 11:38:38 +01:00
Aurelsicoko
88fb2ee89c Fix default middleware configurations & allowed headers 2017-12-11 12:26:16 +01:00
Aurelsicoko
d050e4df28 Fix redirect and load custom middleware 2017-12-07 12:08:13 +01:00
Jim Laurie
80e4c1087c Fix conflict 2017-12-05 10:28:53 +01:00
cyril lopez
341561006c Fix conflict 2017-11-28 15:46:53 +01:00
Jim Laurie
a2c8e212fc Use default config middleware and load plugins middlewares 2017-11-24 15:15:02 +01:00
Jim Laurie
ab62578fac Fix API assign 2017-11-21 10:07:49 +01:00
cyril lopez
51194f28b5 Fix conflict 2017-11-17 17:22:41 +01:00
Aurelsicoko
2050c3ec8f Ensure server start where there are no locales 2017-11-17 17:20:59 +01:00
Jim Laurie
24e4dd9bbc Load db hook if plugin model exist 2017-11-17 14:23:26 +01:00
Aurelsicoko
d67c64a82a Update build configurations structure and improve DX 2017-11-11 17:22:18 +01:00
Aurelsicoko
bc7f89719c Retrieve usage 2017-11-08 15:03:55 +01:00
Aurelsicoko
de162b3201 Use koa-router-joi instead of koa-joi-router 2017-10-23 10:48:19 +02:00