Skip to content
Commits on Oct 2, 2015
Commits on Sep 30, 2015
  1. docker-machine and docker-swarm

    committed
Commits on Sep 12, 2015
  1. Switched to brew-cask

    committed
Commits on Sep 10, 2015
  1. Synced up with upstream

    committed
Commits on Jan 11, 2015
  1. Upgraded seil

    committed
  2. Merge remote-tracking branch 'upstream/master'

    committed
    Conflicts:
    	Puppetfile.lock
Commits on Dec 13, 2014
  1. updated dependencies

    committed
  2. Merge branch 'master' of https://github.com/boxen/our-boxen

    committed
    Conflicts:
    	Gemfile.lock
    	Puppetfile
    	Puppetfile.lock
  3. Using separate dotfiles installation

    committed
Commits on Sep 11, 2014
  1. Merge remote-tracking branch 'upstream/master'

    committed
    Conflicts:
    	Puppetfile.lock
  2. Updated dependencies

    committed
Commits on Aug 7, 2014
Commits on Aug 3, 2014
  1. Merge remote-tracking branch 'upstream/master'

    committed
    Conflicts:
    	Gemfile.lock
    	Puppetfile.lock
Commits on Aug 2, 2014
Commits on Jul 19, 2014
  1. Updated

    committed
Commits on Jul 6, 2014
  1. Merge remote-tracking branch 'upstream/master'

    committed
    Conflicts:
    	Gemfile
    	Gemfile.lock
    	Puppetfile.lock
    	script/bootstrap
    	vendor/puppet/cache/boxen-puppet-dnsmasq-1.0.0.tar.gz
Commits on Feb 26, 2014
  1. boot2docker via homebrew

    committed
  2. Added git-flow homebrew package

    committed
Commits on Jan 26, 2014
  1. Update vagrant dep

    committed
Commits on Jan 25, 2014
Commits on Dec 23, 2013
  1. Installed intellij 13.0.1

    committed
    Also got modern_space_cadet and pckeyboardhack working
Commits on Dec 14, 2013
  1. Updates

    committed
Commits on Dec 7, 2013
  1. Merge branch 'master' of https://github.com/smh/my-boxen

    committed
    Conflicts:
    	Gemfile.lock
    	Puppetfile
    	Puppetfile.lock
    	manifests/site.pp
    	modules/people/manifests/smh.pp
  2. Merge remote-tracking branch 'upstream/master' into merge-upstream

    committed
    Conflicts:
    	Gemfile
    	Gemfile.lock
    	Puppetfile
    	Puppetfile.lock
    	README.md
    	modules/projects/templates/shared/nginx.conf.erb
    	script/boxen-git-credential
  3. Updated keyremap4macbook, etc

    committed
Commits on Oct 27, 2013
  1. vagrant-vmware-fusion

    committed
  2. Updated plugins

    committed
  3. Ensure .zshrc is linked

    committed
  4. jshintrc and ctags-exuberant

    committed
  5. Updated deps

    committed
    Added tig homebrew package
Something went wrong with that request. Please try again.