Skip to content
This repository was archived by the owner on Sep 21, 2018. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
122aa1f
refs boilerplate
johanbaath May 2, 2018
4f47234
implement getRefs
johanbaath May 2, 2018
4e518e3
fixes
johanbaath May 2, 2018
c7aaf7d
adjust default titles for refs
johanbaath May 2, 2018
1a47c2f
Progress on select
jonathangus May 2, 2018
a569db1
Merge branch 'feature/refs' of github.com:johanbaath/strapi into feat…
jonathangus May 2, 2018
aa2d4e0
fix jontes misstake
johanbaath May 2, 2018
7ce3a3f
Update with right react select version
jonathangus May 2, 2018
0c91fb5
Merge branch 'feature/refs' of github.com:johanbaath/strapi into feat…
jonathangus May 2, 2018
5cbf608
fixes
johanbaath May 3, 2018
ebcd54f
Merge tag 'v3.0.0-alpha.12.1' into feature/refs
johanbaath May 3, 2018
08a3d43
Added type title field
jonathangus May 3, 2018
81acef4
Merge branch 'feature/refs' of github.com:johanbaath/strapi into feat…
jonathangus May 3, 2018
a80776c
initial support for auto locales
johanbaath May 7, 2018
708d6e4
Merge branch 'feature/refs' of github.com:johanbaath/strapi into feat…
johanbaath May 7, 2018
7da354b
Remove old code
jonathangus May 7, 2018
6712b84
Merge branch 'feature/refs' of github.com:johanbaath/strapi into feat…
jonathangus May 7, 2018
edbb6ee
Change title for refs logic
jonathangus May 8, 2018
a52c876
Be able to specify models in refs field
jonathangus May 8, 2018
a51c1f8
comma dangle
jonathangus May 8, 2018
24d656b
Display changes
jonathangus May 9, 2018
2e92707
bump mongoose for casting fix
johanbaath May 14, 2018
b41c005
fix refs type
johanbaath May 14, 2018
feb63c7
add builds to repo to speed up deploys
johanbaath May 15, 2018
635513b
fix package.json's
johanbaath May 15, 2018
4399692
new manifest
johanbaath May 15, 2018
950fdd6
Revert "add builds to repo to speed up deploys"
johanbaath May 15, 2018
f6519f6
Merge branch 'master' into cabonline
johanbaath May 18, 2018
7c2d4fb
rearrange removeDuplicate logic
johanbaath May 22, 2018
c66ab08
Admin fixes
jonathangus May 23, 2018
0a96439
Merge branch 'cabonline' of github.com:CabonlineTeam/strapi into cabo…
jonathangus May 24, 2018
5a5dd5e
bump react select
jonathangus May 24, 2018
5ee0327
require a base path
johanbaath May 28, 2018
6771bc2
fix basePath
johanbaath May 28, 2018
c72b581
set content-type
johanbaath May 28, 2018
9601f96
Support translateable images and responsive images
jonathangus May 29, 2018
f2692be
Merge branch 'cabonline' of github.com:CabonlineTeam/strapi into cabo…
jonathangus May 29, 2018
a8ec81f
Support having multiple refs field on one page
jonathangus May 31, 2018
ee25a55
null check
jonathangus May 31, 2018
90e53ab
color preview for text fields
jonathangus Jun 1, 2018
4c6c936
fix autofocus wysiwyg bug
johanbaath Jun 13, 2018
534b17f
3.0.0-alpha.12.6
lauriejim Jun 26, 2018
d24e3cb
Merge tag '3.0.0-alpha.12.6' into cabonline-3.0.0-alpha.12.6
johanbaath Jun 28, 2018
d8a31cc
Merge pull request #6 from CabonlineTeam/cabonline-3.0.0-alpha.12.6
johanbaath Jul 6, 2018
6488f51
lock down package versions, update gitignore and add missing files
johanbaath Sep 19, 2018
63e0125
remove linting
johanbaath Sep 19, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Icon
.Spotlight-V100
.Trashes
._*
.vscode


############################
Expand Down Expand Up @@ -116,3 +117,9 @@ _book

packages/strapi-generate-new/files/public/
packages/*/yarn.lock

############################
# Other
############################
layout.json
manifest.json
44 changes: 21 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
{
"private": true,
"version": "3.0.0-alpha.12.5",
"version": "3.0.0-alpha.12.6",
"dependencies": {},
"devDependencies": {
"assert": "~1.3.0",
"axios": "^0.18.0",
"babel-eslint": "^6.1.2",
"chalk": "^2.4.1",
"eslint": "^3.12.2",
"eslint-plugin-babel": "^4.0.0",
"eslint-plugin-react": "^6.8.0",
"eslint-plugin-redux-saga": "^0.3.0",
"gitbook-cli": "^2.3.2",
"istanbul": "~0.4.2",
"jest": "^22.4.3",
"jest-cli": "^22.4.4",
"lerna": "^2.0.0",
"lodash": "^4.17.5",
"mocha": "~2.4.5",
"pre-commit": "~1.1.2",
"redux-saga": "^0.14.3",
"request": "^2.87.0",
"shelljs": "^0.7.7",
"assert": "1.3.0",
"axios": "0.18.0",
"babel-eslint": "6.1.2",
"chalk": "2.4.1",
"eslint": "3.19.1",
"eslint-plugin-babel": "4.1.2",
"eslint-plugin-react": "6.10.3",
"eslint-plugin-redux-saga": "0.3.0",
"gitbook-cli": "2.3.2",
"istanbul": "0.4.5",
"jest": "22.4.4",
"jest-cli": "22.4.4",
"lerna": "2.11.0",
"lodash": "4.17.10",
"mocha": "2.4.5",
"pre-commit": "1.1.3",
"redux-saga": "0.14.8",
"request": "2.88.0",
"shelljs": "0.7.8",
"strapi-lint": "file:packages/strapi-lint"
},
"scripts": {
Expand All @@ -33,7 +33,6 @@
"removesymlinkdependencies": "node ./scripts/removeSymlinkDependencies.js",
"setup:build": "npm run setup --build",
"setup": "npm run clean:all && npm install ./packages/strapi-lint --save-dev && npm install && node ./scripts/setup.js && npm run clean",
"lint": "node ./scripts/lint.js",
"test": "node ./test/start.js",
"prettier": "node ./packages/strapi-lint/lib/internals/prettier/index.js"
},
Expand All @@ -50,8 +49,7 @@
}
],
"pre-commit": [
"clean",
"lint"
"clean"
],
"repository": {
"type": "git",
Expand Down
14 changes: 7 additions & 7 deletions packages/strapi-admin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-admin",
"version": "3.0.0-alpha.12.5",
"version": "3.0.0-alpha.12.6",
"description": "Strapi Admin",
"repository": {
"type": "git",
Expand All @@ -25,14 +25,14 @@
"presetup": "node ./scripts/preSetup.js"
},
"dependencies": {
"react-ga": "^2.4.1",
"remove-markdown": "^0.2.2",
"shelljs": "^0.7.8"
"react-ga": "2.4.1",
"remove-markdown": "0.2.2",
"shelljs": "0.7.8"
},
"devDependencies": {
"sanitize.css": "^4.1.0",
"strapi-helper-plugin": "3.0.0-alpha.12.5",
"strapi-utils": "3.0.0-alpha.12.5"
"sanitize.css": "4.1.0",
"strapi-helper-plugin": "3.0.0-alpha.12.6",
"strapi-utils": "3.0.0-alpha.12.6"
},
"author": {
"name": "Strapi",
Expand Down
14 changes: 7 additions & 7 deletions packages/strapi-bookshelf/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-bookshelf",
"version": "3.0.0-alpha.12.5",
"version": "3.0.0-alpha.12.6",
"description": "Bookshelf hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
Expand All @@ -16,12 +16,12 @@
},
"main": "./lib",
"dependencies": {
"bookshelf": "^0.12.1",
"inquirer": "^5.2.0",
"lodash": "^4.17.4",
"pluralize": "^6.0.0",
"strapi-knex": "3.0.0-alpha.12.5",
"strapi-utils": "3.0.0-alpha.12.5"
"bookshelf": "0.12.1",
"inquirer": "5.2.0",
"lodash": "4.17.4",
"pluralize": "6.0.0",
"strapi-knex": "3.0.0-alpha.12.6",
"strapi-utils": "3.0.0-alpha.12.6"
},
"strapi": {
"isHook": true,
Expand Down
6 changes: 3 additions & 3 deletions packages/strapi-ejs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-ejs",
"version": "3.0.0-alpha.12.5",
"version": "3.0.0-alpha.12.6",
"description": "EJS hook for the Strapi framework",
"homepage": "http://strapi.io",
"keywords": [
Expand All @@ -13,8 +13,8 @@
},
"main": "./lib",
"dependencies": {
"co": "^4.6.0",
"koa-ejs": "^4.1.0"
"co": "4.6.0",
"koa-ejs": "4.1.0"
},
"strapi": {
"isHook": true
Expand Down
2 changes: 1 addition & 1 deletion packages/strapi-email-mailgun/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-email-mailgun",
"version": "3.0.0-alpha.12.5",
"version": "3.0.0-alpha.12.6",
"description": "Mailgun provider for strapi email plugin",
"homepage": "http://strapi.io",
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion packages/strapi-email-sendgrid/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-email-sendgrid",
"version": "3.0.0-alpha.12.5",
"version": "3.0.0-alpha.12.6",
"description": "Sendgrid provider for strapi email",
"homepage": "http://strapi.io",
"keywords": [
Expand Down
4 changes: 2 additions & 2 deletions packages/strapi-email-sendmail/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-email-sendmail",
"version": "3.0.0-alpha.12.5",
"version": "3.0.0-alpha.12.6",
"description": "Sendmail provider for strapi email",
"homepage": "http://strapi.io",
"keywords": [
Expand All @@ -12,7 +12,7 @@
},
"main": "./lib",
"dependencies": {
"sendmail": "^1.2.0"
"sendmail": "1.2.0"
},
"strapi": {
"isProvider": true
Expand Down
8 changes: 4 additions & 4 deletions packages/strapi-generate-admin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-generate-admin",
"version": "3.0.0-alpha.12.5",
"version": "3.0.0-alpha.12.6",
"description": "Generate the default admin panel for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
Expand All @@ -13,9 +13,9 @@
"lib": "./lib"
},
"dependencies": {
"fs-extra": "^4.0.1",
"lodash": "^4.17.4",
"strapi-admin": "3.0.0-alpha.12.5"
"fs-extra": "4.0.1",
"lodash": "4.17.4",
"strapi-admin": "3.0.0-alpha.12.6"
},
"author": {
"email": "hi@strapi.io",
Expand Down
6 changes: 3 additions & 3 deletions packages/strapi-generate-api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-generate-api",
"version": "3.0.0-alpha.12.5",
"version": "3.0.0-alpha.12.6",
"description": "Generate an API for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
Expand All @@ -13,8 +13,8 @@
"lib": "./lib"
},
"dependencies": {
"lodash": "^4.17.4",
"pluralize": "^6.0.0"
"lodash": "4.17.4",
"pluralize": "6.0.0"
},
"scripts": {
"prepublishOnly": "npm prune"
Expand Down
4 changes: 2 additions & 2 deletions packages/strapi-generate-controller/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-generate-controller",
"version": "3.0.0-alpha.12.5",
"version": "3.0.0-alpha.12.6",
"description": "Generate a controller for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [
Expand All @@ -14,7 +14,7 @@
"lib": "./lib"
},
"dependencies": {
"lodash": "^4.17.4"
"lodash": "4.17.4"
},
"scripts": {
"prepublish": "npm prune"
Expand Down
4 changes: 2 additions & 2 deletions packages/strapi-generate-model/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-generate-model",
"version": "3.0.0-alpha.12.5",
"version": "3.0.0-alpha.12.6",
"description": "Generate a model for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [
Expand All @@ -14,7 +14,7 @@
"lib": "./lib"
},
"dependencies": {
"lodash": "^4.17.4"
"lodash": "4.17.4"
},
"scripts": {
"prepublish": "npm prune"
Expand Down
14 changes: 7 additions & 7 deletions packages/strapi-generate-new/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-generate-new",
"version": "3.0.0-alpha.12.5",
"version": "3.0.0-alpha.12.6",
"description": "Generate a new Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
Expand All @@ -13,12 +13,12 @@
"lib": "./lib"
},
"dependencies": {
"enpeem": "^2.2.0",
"fs-extra": "^4.0.0",
"inquirer": "^4.0.2",
"lodash": "^4.17.4",
"strapi-utils": "3.0.0-alpha.12.5",
"uuid": "^3.1.0"
"enpeem": "2.2.0",
"fs-extra": "4.0.0",
"inquirer": "4.0.2",
"lodash": "4.17.4",
"strapi-utils": "3.0.0-alpha.12.6",
"uuid": "3.1.0"
},
"scripts": {
"prepublishOnly": "npm prune"
Expand Down
8 changes: 4 additions & 4 deletions packages/strapi-generate-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-generate-plugin",
"version": "3.0.0-alpha.12.5",
"version": "3.0.0-alpha.12.6",
"description": "Generate an plugin for a Strapi application.",
"homepage": "http://strapi.io",
"keywords": [
Expand All @@ -13,9 +13,9 @@
"lib": "./lib"
},
"dependencies": {
"fs-extra": "^4.0.0",
"lodash": "^4.17.4",
"pluralize": "^6.0.0"
"fs-extra": "4.0.0",
"lodash": "4.17.4",
"pluralize": "6.0.0"
},
"scripts": {
"prepublishOnly": "npm prune"
Expand Down
4 changes: 2 additions & 2 deletions packages/strapi-generate-policy/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-generate-policy",
"version": "3.0.0-alpha.12.5",
"version": "3.0.0-alpha.12.6",
"description": "Generate a policy for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [
Expand All @@ -14,7 +14,7 @@
"lib": "./lib"
},
"dependencies": {
"lodash": "^4.17.4"
"lodash": "4.17.4"
},
"scripts": {
"prepublishOnly": "npm prune"
Expand Down
4 changes: 2 additions & 2 deletions packages/strapi-generate-service/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-generate-service",
"version": "3.0.0-alpha.12.5",
"version": "3.0.0-alpha.12.6",
"description": "Generate a service for a Strapi API.",
"homepage": "http://strapi.io",
"keywords": [
Expand All @@ -14,7 +14,7 @@
"lib": "./lib"
},
"dependencies": {
"lodash": "^4.17.4"
"lodash": "4.17.4"
},
"scripts": {
"prepublishOnly": "npm prune"
Expand Down
12 changes: 6 additions & 6 deletions packages/strapi-generate/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "strapi-generate",
"version": "3.0.0-alpha.12.5",
"version": "3.0.0-alpha.12.6",
"description": "Master of ceremonies for the Strapi generators.",
"homepage": "http://strapi.io",
"keywords": [
Expand All @@ -13,11 +13,11 @@
"lib": "./lib"
},
"dependencies": {
"async": "^2.5.0",
"fs-extra": "^4.0.0",
"lodash": "^4.17.4",
"reportback": "^2.0.1",
"strapi-utils": "3.0.0-alpha.12.5"
"async": "2.5.0",
"fs-extra": "4.0.0",
"lodash": "4.17.4",
"reportback": "2.0.1",
"strapi-utils": "3.0.0-alpha.12.6"
},
"author": {
"name": "Strapi team",
Expand Down
Loading