Rebase#1

Merged

ghbolivar merged 408 commits intoghbolivar:masterfrom keystonejs:master

Feb 24, 2019

+8,106-7,080

This pull request is big! We're only showing the most recent 250 commits

Commits on Aug 16, 2017

Commits on Aug 17, 2017

Merge pull request #4170 from keystonejs/greenkeeper-updtr-1.0.0
JedWatson
authored

Commits on Aug 18, 2017

Merge pull request #4311 from keystonejs/greenkeeper-debug-2.6.8
export-mike
authored
Merge pull request #4216 from keystonejs/greenkeeper-enzyme-2.8.2
export-mike
authored
Merge pull request #4328 from keystonejs/greenkeeper-mocha-3.4.2
export-mike
authored
Merge pull request #4303 from keystonejs/greenkeeper-express-4.15.3
export-mike
authored
Merge pull request #4258 from keystonejs/greenkeeper-glamor-2.20.25
export-mike
authored
Merge pull request #4326 from keystonejs/greenkeeper-morgan-1.8.2
export-mike
authored
Merge pull request #4292 from keystonejs/greenkeeper-proxyquire-1.8.0
export-mike
authored
Merge pull request #4331 from keystonejs/greenkeeper-sinon-2.3.2
export-mike
authored
Merge branch 'master' into docs
export-mike
committed

Commits on Aug 23, 2017

Merge pull request #4420 from keystonejs/docs
Noviny
authored

Commits on Sep 6, 2017

Merge pull request #4357 from keystonejs/fix-default-view-folder
Kevin Brown
authored

Commits on Sep 7, 2017

Commits on Sep 8, 2017

Commits on Sep 10, 2017

Merge pull request #4433 from christroutner/master
jstockwin
authored

Commits on Sep 20, 2017

Merge pull request #4370 from jankei/master
Noviny
authored
Merge pull request #4174 from sktt/bugfix/FileFieldLink
Noviny
authored
Correcting password type check in PasswordType
Vito Belgiorno-Zegna
committed

Commits on Sep 21, 2017

Merge pull request #4157 from keystonejs/feature/extract-password-validation
Vito Belgiorno-Zegna
authored
Merge branch 'master' into safe-require
Vito Belgiorno-Zegna
committed

Commits on Sep 22, 2017

Merge pull request #4140 from keystonejs/safe-require
Vito Belgiorno-Zegna
authored
fix:typo in handleError in screens/Item/index.js
petertdinh
authored

Commits on Sep 23, 2017

Merge pull request #4441 from petertdinh/patch-1
Noviny
authored

Commits on Sep 25, 2017

Commits on Sep 27, 2017

Merge pull request #3995 from keystonejs/greenkeeper-babel-polyfill-6.23.0
Vito Belgiorno-Zegna
authored
Commenting out redundant code in www dir
Vito Belgiorno-Zegna
committed
Removing path from server/initViewEngine
Vito Belgiorno-Zegna
committed
Removing commented out PropTypes import
Vito Belgiorno-Zegna
committed
Merge pull request #4447 from keystonejs/fix-eslint
Vito Belgiorno-Zegna
authored
Removing redundant import
Vito Belgiorno-Zegna
committed
Merge pull request #4448 from keystonejs/fix-eslint
Vito Belgiorno-Zegna
authored

Commits on Sep 28, 2017

Merge branch 'master' into greenkeeper-aphrodite-1.2.0
Vito Belgiorno-Zegna
committed

Commits on Sep 29, 2017

Merge pull request #4077 from keystonejs/greenkeeper-aphrodite-1.2.0
Vito Belgiorno-Zegna
authored

Commits on Oct 1, 2017

Merge pull request #4432 from t100n/issue-3979
Noviny
authored

Commits on Oct 2, 2017

Merge pull request #4348 from keystonejs/greenkeeper-react-images-0.5.4
JedWatson
authored
[WIP] Updating packages (only minors and patches)
Vito Belgiorno-Zegna
committed
[WIP] Updating more packages (minor & patch)
Vito Belgiorno-Zegna
committed
Updating last of the minor and patch packages
Vito Belgiorno-Zegna
committed

Commits on Oct 3, 2017

Removing old aphropdite references
JedWatson
committed
Merge branch 'master' into easy-upgrades
Vito Belgiorno-Zegna
committed

Commits on Oct 6, 2017

Fixing some "Prop types declarations should be sorted alphabetically" (react/sort-prop-types) errors, allowing npm run lint to run
molomby
committed

Commits on Oct 9, 2017

Merge pull request #4457 from keystonejs/molomby/linting-errors
molomby
authored

Commits on Oct 10, 2017

Merge branch 'master' into easy-upgrades
Vito Belgiorno-Zegna
committed
Changes to the few dependencies that were depending on [email protected]:
Vito Belgiorno-Zegna
committed

Commits on Oct 16, 2017

Commits on Oct 17, 2017

Fixed in Adapters.FS
Aldlevine
committed

Commits on Oct 20, 2017

Merge branch 'master' of https://github.com/keystonejs/keystone into fix-custom-nav-links
Francesco Panciroli
committed
nerfed strongly worded comment
zacharysang
committed

Commits on Oct 24, 2017

Documentation about customizing the navigation bar
Francesco Panciroli
committed

Commits on Oct 30, 2017

Merge branch 'master' into easy-upgrades
Vito Belgiorno-Zegna
committed

Commits on Oct 31, 2017

Add packages.js build
Vito Belgiorno-Zegna
committed
Fix Password validateInput breaking tests related to security updates
Vito Belgiorno-Zegna
committed
Merge branch 'jm-fork' into master
bladey
authored
Revert "Merge branch 'jm-fork' into master"
bladey
committed
Merge pull request #4453 from keystonejs/easy-upgrades
Vito Belgiorno-Zegna
authored

Commits on Nov 13, 2017

(feat) implements image thumbnails for the File type
cadriel
committed

Commits on Nov 16, 2017

moved thumb check to field level
cadriel
committed

Commits on Jan 7, 2018

Fix for known security vulnerability in marked 0.3.6 dependency
Vito Belgiorno-Zegna
committed

Commits on Feb 25, 2018

Merge pull request #4387 from frapan/fix-custom-nav-links
Noviny
authored
Fix autocleanup for cloudinary fixes 3476 (#4205 )
Noviny
authored
Deprecate currency setting (#4132 )
Noviny
authored
fix paginate to return on count error (#4167 )

ramonfritsch
authored and
Noviny
committed
Update README.md (#4569 )

danielavilas
authored and
Noviny
committed
Should check undefined instead, otherwise value === 0 will not be able to show (#4524 )

gemscng
authored and
Noviny
committed
Update application-updates.md (#4582 )

G. Kay Lee
authored and
Noviny
committed
Update yo-generator.md (#4581 )

G. Kay Lee
authored and
Noviny
committed

Commits on Feb 26, 2018

Update Readme.md (#4583 )

petertdinh
authored and
Noviny
committed

Commits on Feb 27, 2018

Merge pull request #4509 from cadriel/feature/file-thumbnails
jossmac
authored

Commits on Mar 1, 2018

replace hardcode keystone to path admin variable (#4586 )

radames
authored and
Noviny
committed
replace knox git dependency with knox-s3 (#4574 )

cvn
authored and
Noviny
committed

Commits on Mar 6, 2018

Upgrade moment for CVE-2017-18214 (#4592 )

DeviaVir
authored and
Noviny
committed

Commits on Apr 10, 2018

Merge pull request #4169 from saul-mtz/patch-1
JedWatson
authored

Commits on Apr 15, 2018

Fix website (#4615 )
Noviny
authored

Commits on May 28, 2018

fixing one test at a time
dominikwilkowski
committed

Commits on May 30, 2018

Commits on May 31, 2018

fixing admin ui tests (thanks to Vito)
dominikwilkowski
committed

Commits on Jun 12, 2018

Commits on Jun 15, 2018

Fix #4652 : Remove EOL Node releases from Travis testing
stennie
committed

Commits on Jun 21, 2018

show color swatch on color field
mikehazell
committed

Commits on Jun 22, 2018

Commits on Jun 25, 2018

Commits on Jun 30, 2018

Fix bug in Safari where XHR form submission fails with empty file input (#4673 )

erikvdplas
authored and
stennie
committed

Commits on Jul 1, 2018

Include keystone.version in startup message (#4692 )
stennie
authored

Commits on Jul 2, 2018

Remove unused title markdown from README.md
stennie
committed

Commits on Jul 6, 2018

Commits on Jul 7, 2018

Added session max age cookie to match keystone.uid cookie expiry

Chris Mills
authored and
stennie
committed
smooth scroll spped now based on current scroll position

Anton Kuzniatsou
authored and
stennie
committed
Restore/repair S3 image uploading in tinymce

Tathanen
authored and
stennie
committed
Use custom root for S3 paths

Tathanen
authored and
stennie
committed
Check that req.session.cookie exists before setting maxAge
stennie
committed
Make listing browser versions a more obvious PR testing requirement
stennie
committed
Enhance numeric fields

ttsirkia
authored and
stennie
committed
Replace / with . to delimiter the file extension

ocalvet
authored and
stennie
committed
Update part-4.md

Nugator
authored and
stennie
committed
Fix typo: s/gloing/going/
stennie
committed
Update options.md (#4621 )

isjia
authored and
stennie
committed
Fixed typo (#4597 )

1337cookie
authored and
stennie
committed
Added letsencrypt configuration docs for #4181

zacharysang
authored and
stennie
committed
Added more info on Application updates with required relationships.

Kevin Brown
authored and
stennie
committed
Documented breaking change to pre:routes behaviour.

Kevin Brown
authored and
stennie
committed
Update package.json reference to rc1
stennie
committed
Upgrade qs to 6.5.2
stennie
committed
Add pointer to Keystone 4 beta/RC release notes
stennie
committed
- Upgrade to Mongoose 4.13.14: https://github.com/Automattic/mongoose/blob/master/History.md#41314--2018-05-25
stennie
committed

Commits on Jul 10, 2018

Commits on Jul 12, 2018

Fix #4708 : Update Getting Started page
stennie
committed

Commits on Jul 23, 2018

added semver notations to dependencies

dominikwilkowski
authored and
stennie
committed
fixed typo

dominikwilkowski
authored and
stennie
committed
Improve sanity checking for signin "from" param
stennie
committed
Merge branch 'master' into signin
stennie
authored
Minor fixes and improvements to the location field type (#4455 )

molomby
authored and
dominikwilkowski
committed
Update to multer 1.3.1 and automatically clean uploaded files (#4704 )

JedWatson
authored and
dominikwilkowski
committed
Merge branch 'master' into signin
dominikwilkowski
authored
Merge pull request #4720 from stennie/signin
dominikwilkowski
authored
Reviewed Getting Started documentation (#4721 )

Nathan Simpson
authored and
stennie
committed

Commits on Jul 25, 2018

updating package bundle
dominikwilkowski
committed
bumped version 📣🎉
dominikwilkowski
committed
FIxing broken links in README.md

nathsimpson
authored and
stennie
committed

Commits on Jul 26, 2018

Commits on Jul 27, 2018

Commits on Jul 30, 2018

Fixed a typo in Project-Options.md

eyal0803
authored and
stennie
committed
Fixed links to configuration pages

eduard-malakhov
authored and
stennie
committed
Link to 4.x release history
stennie
committed

Commits on Aug 1, 2018

Merge pull request #2 from keystonejs/master
Nathan Simpson
authored
Merge pull request #3 from nathansimpson95/fourOhFour
Nathan Simpson
authored

Commits on Aug 2, 2018

Merge pull request #4756 from nathansimpson95/master
dominikwilkowski
authored

Commits on Sep 2, 2018

Update index.md

codyspate
authored and
stennie
committed
Update part-4.md

lvntruong
authored and
stennie
committed

Commits on Sep 5, 2018

Fix #4762 : Bump kerberos & letsencrypt-express dependencies
stennie
committed

Commits on Sep 25, 2018

Correct typo in templates/views/addEvent.pug

gverni
authored and
stennie
committed
Fix typo in part 4 of tutorial (thanks @ebrahimamer )
stennie
committed

Commits on Oct 2, 2018

Commits on Oct 4, 2018

Fix #4818 : Add redirect for /guide/config
stennie
committed
documentation updates

jimulle
authored and
stennie
committed
Merge branch 'master' into add-alt-text-to-delete-button
autoboxer
authored

Commits on Oct 5, 2018

Merge pull request #4813 from jimulle/add-alt-text-to-delete-button
autoboxer
authored

Commits on Oct 6, 2018

DOCS: Fix typo for TextArray Field

kennedybaird
authored and
stennie
committed

Commits on Oct 12, 2018

Commits on Oct 13, 2018

docs(syntax): update an upper-case (#4810 )

clement-is
authored and
autoboxer
committed
incorrect link to database docs (#4833 )

kennedybaird
authored and
autoboxer
committed

Commits on Oct 14, 2018

fix: fields explorer invalid capitilisations (#4834 )

kennedybaird
authored and
autoboxer
committed

Commits on Oct 29, 2018

Bug - Fix UTC DateColumn vaue display (#4841 )

alsoicode
authored and
autoboxer
committed
Fixed typo in paginate() docs (#4839 )

Vultraz
authored and
autoboxer
committed

Commits on Nov 5, 2018

Refer to the newest release "4.0.0"

Hannes Sverrisson
authored and
stennie
committed

Commits on Dec 2, 2018

Completed opening sentence

agmt5989
authored and
stennie
committed

Commits on Dec 5, 2018

Added option to hide Today button in Date field (#4869 )

marcin-lawrowski
authored and
autoboxer
committed

Commits on Dec 10, 2018

Fixed dependsOn setting when applied to a boolean field set to false by default (#4867 )

marcin-lawrowski
authored and
autoboxer
committed

Commits on Dec 19, 2018

UPDATE deleteItem action with custom error message (#4683 )

RecuencoJones
authored and
autoboxer
committed
Return a 500 error when item.remove fails (#4832 )

laurenskling
authored and
autoboxer
committed
Build S3 upload name when not present (#4871 )

Tathanen
authored and
autoboxer
committed
Fix markup typo in quick start docs. (#4854 )

itzaks
authored and
autoboxer
committed
Urlfield enahancement (#4856 )

gemscng
authored and
autoboxer
committed