yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-08-10 17:58:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,761 Commits 115 Branches 488 Tags
Commit Graph

6761 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Laurie
8f5443db17 3.0.0-alpha.12.1.3 2018-05-07 10:46:43 +02:00
soupette
2df4cb3311 Remove npm run lint test in all packages 2018-05-07 09:29:35 +02:00
Jim LAURIE
52271fa769
Merge pull request #1126 from nurikabe/patch-3 
Tweak grammar of error message
 2018-05-06 20:43:53 +02:00
Jim Laurie
38fc1aade7 Fix input relation 2018-05-06 20:34:33 +02:00
Ujal Imanov
d7e6d8ce22
Merge branch 'master' into fix-reload 2018-05-06 13:44:30 +02:00
Evan Owens
185781c65d
Tweak grammar of error message 2018-05-05 10:34:48 -04:00
soupette
bc39a640a5 Lint all packages 2018-05-04 18:27:39 +02:00
soupette
7f653f7e65 Lint all plugins 2018-05-04 18:12:06 +02:00
soupette
b608c5bda4 Lint ctm 2018-05-04 18:10:21 +02:00
soupette
6fe297e252 Lint strapi-mongoose 2018-05-04 18:09:55 +02:00
soupette
e593d03ae5 Lint strapi-knex 2018-05-04 18:03:41 +02:00
soupette
2580e49c4d Lint strapi-helper-plugin 2018-05-04 18:02:35 +02:00
soupette
b5ed16d791 Lint strapi-generate-service 2018-05-04 17:53:35 +02:00
soupette
42310c5b83 Lint strapi-generate-policy 2018-05-04 17:53:01 +02:00
soupette
248db997b4 Lint strapi-generate-model 2018-05-04 17:52:04 +02:00
soupette
50598616f4 Lint strapi-generate-new 2018-05-04 17:50:39 +02:00
soupette
0bfbdf8e72 Lint strapi-generate-model 2018-05-04 17:44:42 +02:00
soupette
2c9aeb61a5 Lint strapi-generate-controller 2018-05-04 17:43:38 +02:00
soupette
666673961a Lint strapi-generate-api 2018-05-04 17:39:37 +02:00
soupette
3f8b7b2177 Lint strapi-generate-api 2018-05-04 17:38:29 +02:00
soupette
f389ea8860 Lint strapi-generate 2018-05-04 17:36:50 +02:00
soupette
e14c1373f9 Lint strapi-ejs 2018-05-04 17:31:21 +02:00
soupette
e9f68a3bc9 Lint in strapi-bookshelf 2018-05-04 17:29:44 +02:00
soupette
6633b14ef3 Add lint to strapi 2018-05-04 17:02:27 +02:00
Abdón Rodríguez Davila
0fbf3cae79 Ignore .editorconfig & .gitattributes in npm plugins & admin 2018-05-04 16:47:07 +02:00
Jim LAURIE
63f40fc356
Merge pull request #1121 from abdonrd/issue-templates 
Fix the issue templates
 2018-05-04 16:11:49 +02:00
Abdón Rodríguez Davila
6b26718f09 Fix issue templates 2018-05-04 16:07:13 +02:00
soupette
f9f78745ca Change test logic 2018-05-04 15:38:42 +02:00
Jim LAURIE
d05f8146a5
Merge pull request #1117 from strapi/update-issue-templates 
Update issue and pr templates
 2018-05-04 15:27:08 +02:00
Jim Laurie
9e0401de25 Update issue and pr templates 2018-05-04 12:44:15 +02:00
soupette
1a68f3ea9f Change test 2018-05-04 11:56:08 +02:00
soupette
74de4da177 Change test 2018-05-04 11:55:34 +02:00
soupette
601143b4d5 Remove eslint dependencie in all packages 2018-05-04 11:08:41 +02:00
Jim LAURIE
495a20728d
Merge pull request #1107 from strapi/eslint-utils-fix 
Add eslint to strapi-utils
 2018-05-04 11:07:50 +02:00
Udschal Imanov
8095cc3e03 Merge branch 'master' into fix-reload 
* master:
  Keep first set permissions & remove duplicate
  3.0.0-alpha.12.2
  Improve the check of the database tables
  Add strapi-knex in generated project dependencies
  Avoid to loose relationship when editing from the many side
  Fix loosing of morph relations on update in CM with Bookshelf
  Fix loose many dominant
  Remove the return to avoid the loop break
  Fix single upload with Bookshelf
  Fix entry create relations
  Remove duplicate permissions
  Fixes #886
  add translations for EN and DE for authenticationDatabase and SSl in admin panel
  add authenticationDatabase and SSL to admin panel
 2018-05-03 22:24:30 +02:00
soupette
942be55c8d Add eslint to strapi-utils 2018-05-03 18:13:22 +02:00
soupette
e808c9420c Merge branch 'eslint' of github.com:strapi/strapi into eslint 2018-05-03 17:47:50 +02:00
soupette
0bd9dd3509 Remove strapi-lint from hooks 2018-05-03 17:46:30 +02:00
soupette
2a30a20e7e Important! fix monorepo setup build command 2018-05-03 17:39:24 +02:00
Jim LAURIE
caff62850a
Merge pull request #1103 from strapi/fix/permissions 
Fix permissions disappear from UI
 2018-05-03 16:56:21 +02:00
Jim LAURIE
58deb0c3e9
Merge branch 'master' into fix/permissions 2018-05-03 16:46:06 +02:00
Jim LAURIE
af7a3c474b
Merge pull request #1079 from stephledev/master 
Add authSource & ssl options to the admin panel
 2018-05-03 16:41:06 +02:00
Aurelsicoko
451ad266fb Keep first set permissions & remove duplicate 2018-05-03 16:26:57 +02:00
Jim LAURIE
e328338181
Merge branch 'master' into master 2018-05-03 16:18:11 +02:00
Jim LAURIE
4db33cec4a
Merge pull request #1081 from strapi/fix/886 
Remove attribute plugin in model
 2018-05-03 16:09:42 +02:00
Jim LAURIE
10eee03393
Merge branch 'master' into fix/886 2018-05-03 15:59:11 +02:00
Jim LAURIE
3c61ed106a
Merge pull request #1100 from strapi/3.0.0-alpha.12.2 
3.0.0-alpha.12.1
 2018-05-03 14:19:16 +02:00
Jim Laurie
c491c61a97 3.0.0-alpha.12.2 v3.0.0-alpha.12.1 2018-05-03 14:15:21 +02:00
Jim LAURIE
30c21aef35
Merge pull request #1085 from strapi/eslint-email-graphql 
Eslint email graphql
 2018-05-03 14:06:39 +02:00
Jim LAURIE
e67da24554
Merge pull request #1098 from strapi/fix/knex 
Add strapi-knex in generated project dependencies
 2018-05-03 12:46:39 +02:00