Permalink
Switch branches/tags
Nothing to show
Commits on Oct 2, 2015
Commits on Sep 30, 2015
  1. docker-machine and docker-swarm

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

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

    smh committed Sep 10, 2015
Commits on Jan 11, 2015
  1. Upgraded seil

    smh committed Jan 11, 2015
  2. Merge remote-tracking branch 'upstream/master'

    smh committed Jan 11, 2015
    Conflicts:
    	Puppetfile.lock
Commits on Dec 13, 2014
  1. updated dependencies

    smh committed Dec 13, 2014
  2. Merge branch 'master' of https://github.com/boxen/our-boxen

    smh committed Dec 13, 2014
    Conflicts:
    	Gemfile.lock
    	Puppetfile
    	Puppetfile.lock
Commits on Sep 11, 2014
  1. Merge remote-tracking branch 'upstream/master'

    smh committed Sep 11, 2014
    Conflicts:
    	Puppetfile.lock
  2. Updated dependencies

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

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

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

    smh committed Jul 6, 2014
    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

    smh committed Feb 26, 2014
  2. Added git-flow homebrew package

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

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

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

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

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

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

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

    smh committed Oct 27, 2013
  2. Updated plugins

    smh committed Sep 21, 2013
  3. Ensure .zshrc is linked

    smh committed Jul 21, 2013
  4. jshintrc and ctags-exuberant

    smh committed Jul 21, 2013
  5. Updated deps

    smh committed May 25, 2013
    Added tig homebrew package