yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-07-17 14:02:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,041 Commits 115 Branches 484 Tags
Commit Graph

121 Commits

Author SHA1 Message Date
cyril lopez
51194f28b5 Fix conflict 2017-11-17 17:22:41 +01:00
Jim Laurie
7a0d05346b Fix conflict 2017-11-15 12:16:27 +01:00
Aurelsicoko
6f4086be2e Merge from master 2017-11-14 11:53:51 +01:00
Aurelsicoko
2ceed9b1cf Add rimraf as dependency 2017-11-14 11:44:38 +01:00
Aurelsicoko
98cbcd6940 Don't execute npm prune on every npm install 2017-11-13 19:38:16 +01:00
Aurelsicoko
d0c3f7f8b5 Avoid to rebuild on path change and override build configuration 2017-11-11 22:14:05 +01:00
Jim Laurie
fe57abdb2f Merge branch 'master' of github.com:strapi/strapi into user-permissions 2017-11-10 10:06:23 +01:00
Jim Laurie
790cee753e 3.0.0-alpha.6.7 2017-11-08 15:46:28 +01:00
Jim Laurie
ef601d6e9a 3.0.0-alpha.6.6 2017-11-07 17:20:06 +01:00
Jim Laurie
30e39254a6 Change strapi version to alpha.6.5 2017-11-06 15:52:36 +01:00
cyril lopez
4325102586 Update generate-plugin package by removing unnecessary Button component 2017-11-06 11:53:41 +01:00
Jim Laurie
77013bc4b2 Fix conflicts 2017-11-03 12:00:08 +01:00
Jim Laurie
6c376456fb Fix conflicts 2017-11-03 11:51:55 +01:00
cyril lopez
1f4a531929 Add bindActionCreators import in ExamplePage 2017-10-30 14:24:22 +01:00
cyril lopez
532d19fa11 Fix ExamplePage container 2017-10-30 14:14:03 +01:00
cyril lopez
743e635d7a Fix ExamplePage container 2017-10-27 14:33:39 +02:00
cyril lopez
cf70c5e003 Update generate-plugin 2017-10-25 18:49:29 +02:00
cyril lopez
31691009db Refacto ExtendComponent and modify generate-plugin 2017-10-25 16:14:57 +02:00
cyril lopez
d77456e78c Update strapi-generate-plugin 2017-10-23 16:12:37 +02:00
Aurelsicoko
b0d2a3c838 3.0.0-alpha.6.4 2017-10-23 12:24:44 +02:00
Aurelsicoko
3bb952d58f Update dependencies 2017-10-18 18:39:32 +02:00
Aurelsicoko
9586a8cabc 3.0.0-alpha.6.3 2017-10-16 15:13:28 +02:00
Aurelsicoko
b5955739da 3.0.0-alpha.6.2 2017-10-16 12:29:47 +02:00
Aurelsicoko
5d06875a20 3.0.0-alpha.6.1 2017-10-16 11:44:29 +02:00
Aurelsicoko
287b5e17f9 3.0.0-alpha.6 2017-10-16 11:07:41 +02:00
Aurelsicoko
51d936b559 Resolve conflicts 2017-09-25 18:28:45 +02:00
Aurelsicoko
9ef6618f3a Run test on port 1338 and remove deprecated PropTypes warning 2017-09-20 11:12:04 +02:00
cyril lopez
7c6a3f4687 Fix conflict 2017-09-14 15:10:08 +02:00
Pierre Burgy
e76752c1a4 Remove useless text in plugin generator 2017-09-13 23:09:07 +02:00
Pierre Burgy
cb9730283a Merge alpha.5 2017-09-08 14:48:06 +02:00
Pierre Burgy
83e6a6bcc4 Merge 2017-09-08 13:46:50 +02:00
Aurelsicoko
0affa346ce 3.0.0-alpha.5.5 2017-08-25 14:52:03 +02:00
Aurelsicoko
b64015f23a 3.0.0-alpha.5.4 2017-08-25 14:00:40 +02:00
Aurelsicoko
463345998c 3.0.0-alpha.5.3 2017-08-24 18:50:09 +02:00
Aurelsicoko
fb0296c912 3.0.0-alpha.5.1 2017-08-24 16:40:15 +02:00
Aurelsicoko
3aec65e332 Update generate admin path 2017-08-24 10:21:24 +02:00
Aurelsicoko
e91a6a9012 3.0.0-alpha.5 2017-08-23 19:04:11 +02:00
Pierre Burgy
9caf5b8203 Move admin files in strapi-admin folder 2017-08-22 18:29:02 +02:00
Pierre Burgy
2e4bc3e50c Improve plugin generator for react router 4 2017-08-22 17:57:54 +02:00
cyril lopez
7532670f93 Created empty view for homepage 2017-08-16 18:47:02 +02:00
Pierre Burgy
2b7440b75b Merge branch 'alpha.5' of https://github.com/strapi/strapi into plugin/content-manager 2017-08-16 17:09:09 +02:00
Pierre Burgy
120f84a9bc Delete not found container in plugin generator 2017-08-14 11:32:48 +02:00
Pierre Burgy
9defae7162 Add package-lock.json in gitignore files 2017-08-11 09:58:00 +02:00
Jim Laurie
c3f561fded Fix conflict alpha5 2017-08-02 11:25:18 +02:00
Pierre Burgy
0be5c4d02c Merge branch 'alpha.5' of https://github.com/strapi/strapi into plugin/content-manager 2017-07-31 17:45:04 +02:00
aurelsicoko
937a4839bd Fix path to retrieve defaults settings and remove useless files 2017-07-31 12:12:51 +02:00
aurelsicoko
8e55bd14a2 Move dictionary and update dependencies 2017-07-31 12:08:02 +02:00
aurelsicoko
202cf6f5a8 Resolve conflicts 2017-07-28 18:56:28 +02:00
aurelsicoko
4f7efef381 Update core architecture 2017-07-24 19:58:03 +02:00
Pierre Burgy
77a8bcfd78 Change strapi-helper-version in plugin generator 2017-07-21 18:23:37 +02:00