yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-01 12:53:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,930 Commits 113 Branches 491 Tags
Commit Graph

131 Commits

Author SHA1 Message Date
cyril lopez
936bdf7949
Merge branch 'master' into fix-setup 2018-04-12 17:30:50 +02:00
soupette
3176f02a25 Fixes #858 2018-04-12 17:28:13 +02:00
cyril lopez
8e3e385f26 Init drag and drop files 2018-03-14 22:20:39 +01:00
cyril lopez
ac3ea588fa Add eslint to strapi-helper-plugin! 2018-03-14 09:59:42 +01:00
cyril lopez
82b779aa6f Fix conflict and start fixineg eslint on helper plugin 2018-03-09 16:41:24 +01:00
cyril lopez
edc9f82b34 Add controls to wysiwyg start to fix eslint for helper components 2018-03-08 12:56:44 +01:00
Brandon Cheng
a3700a93d5
Fix undefined rootAdminpath in admin dev mode 
It looks like rootAdminpath is used in the development webpack config
file (copied from one of the other webpack configs), but its definition
was omitted accidentally.

Fixes #415
 2018-01-22 08:53:15 -05:00
Aurelsicoko
3c9e18564d Report changes from branch hotfix/deploy 2018-01-19 15:58:29 +01:00
Aurelsicoko
086b42f079 Improve deployment workflow and fix setup 2018-01-19 14:50:34 +01:00
Aurelsicoko
ecc7fe0b83 Fix backend URL in development mode 2018-01-17 14:13:31 +01:00
Jim Laurie
7a4cb0e507 Fix data path in connectivity functions 2018-01-17 09:14:34 +01:00
Aurelsicoko
83e0ffd323 Merge duplicate code and add verbose option on setup command 2018-01-16 16:18:33 +01:00
Aurelsicoko
adb11a0b8b Merge branch 'master' of github.com:strapi/strapi into fix/deploy 2018-01-16 16:02:02 +01:00
Aurelsicoko
9031ff1799 Fix webpack public path and production configuration templating 2018-01-15 17:45:22 +01:00
cyril lopez
0a62a4e6dc Fix install plugin page 2018-01-15 16:43:08 +01:00
Aurelsicoko
247caae4b4 Omit publicPath and update publicPath on the fly 2018-01-15 14:31:04 +01:00
Aurelsicoko
16c253a846 Fix Travis 2018-01-15 11:31:19 +01:00
Aurelsicoko
4b39785a8a Copy plugins.json content instead of faking the copy 2018-01-12 16:41:59 +01:00
Aurelsicoko
cc455ee309 Only try to require configuration server when there is an app 2018-01-12 14:53:20 +01:00
Aurelsicoko
8d0a8379d0 Update path generation for admin and plugins 2018-01-12 14:46:02 +01:00
Aurelsicoko
216a1b3bbb Remove host configuration in admin build 2018-01-12 11:38:03 +01:00
Aurelsicoko
440b44ed27 Update documentation and improve plugins.json generation logic 2018-01-09 18:39:50 +01:00
Aurelsicoko
ce61844427 Use relative URL instead of absolute to load plugin and set administration origin 2018-01-09 17:09:54 +01:00
Aurelsicoko
6916134ee1 Update setup script to deploy and index.html rewrite 2018-01-08 16:34:41 +01:00
Jim Laurie
f52f149add Fix install plugin 2017-12-22 17:36:27 +01:00
Aurelsicoko
47f41820bf Fix registerPlugin condition 2017-12-20 13:57:24 +01:00
Jim Laurie
832617159d Fix auto set config if doent exist 2017-12-12 15:13:27 +01:00
Jim Laurie
f404a96c5c Fix conflicts 2017-12-11 13:51:16 +01:00
Aurelsicoko
88fb2ee89c Fix default middleware configurations & allowed headers 2017-12-11 12:26:16 +01:00
Jim Laurie
519239c35c Fix find one generated api mongoose 2017-12-11 12:18:14 +01:00
Jim Laurie
b4cae064d5 Fix conflict 2017-12-08 12:30:10 +01:00
Jim Laurie
f0393d37b6 Add documentation 2017-12-08 12:27:48 +01:00
cyril lopez
96506e5643 Fix middleware usp .policies of undefined 2017-12-08 11:21:51 +01:00
Jim Laurie
b7712cf512 Fix conflicts 2017-12-07 17:04:24 +01:00
Aurelsicoko
4444d806d6 Replace PNG logo to SVG & handle email/password type in Content Manager list 2017-12-06 13:44:58 +01:00
Jim Laurie
ce00536663 Fix conflict 2017-12-06 11:44:48 +01:00
Jim Laurie
d5d08e16f9 Identify admin by headers and send custom error response 2017-12-06 11:38:00 +01:00
Aurelsicoko
c216771adb Resolve conflicts 2017-12-05 15:30:16 +01:00
Aurelsicoko
110c209431 Be able to create an user from the Content Manager 2017-12-05 15:28:31 +01:00
cyril lopez
8920fda350 fix login bug 2017-12-05 15:16:33 +01:00
Aurelsicoko
87350ef2f1 Fix babel-polyfill dependencies and improve email appearance 2017-12-05 12:10:08 +01:00
Aurelsicoko
ef99f5095c Build plugin email 2017-12-04 15:23:35 +01:00
Aurelsicoko
2b86bde1b4 Fix build due to layout 2017-12-04 14:29:16 +01:00
Aurelsicoko
ac2c2b55e9 Fix setup and apply design changes 2017-11-25 14:08:06 +01:00
Jim Laurie
f719d7f1fb Fix conflict 2017-11-23 15:05:05 +01:00
Aurelsicoko
a10fc2ee0d Fix setup 2017-11-20 17:04:48 +01:00
Aurelsicoko
47f75f601b Fix run setup 2017-11-20 15:01:49 +01:00
Jim Laurie
e45b8c1f94 Update clean pre commit auto generated files 2017-11-20 11:08:57 +01:00
cyril lopez
51194f28b5 Fix conflict 2017-11-17 17:22:41 +01:00
Aurelsicoko
d844fe6374 Fix development workflow 2017-11-17 16:23:11 +01:00