atomaka
/
my-boxen
1
0
Fork 0
Code Releases Activity
434 Commits 2 Branches 0 Tags 62 MiB
Commit Graph

434 Commits

Author SHA1 Message Date
Adam Ochonicki e77d54d397 Merge pull request #460 from pedrogimenez/update-readme 
Add Node 0.10
 2013-11-24 06:50:22 -08:00
Pedro Gimenez 526fc8fc6e Add Node 0.10 2013-11-24 02:49:16 +01:00
Adam Ochonicki c1589412c3 Merge pull request #457 from celkins/patch-1 
Node.js v0.4 no longer provided by default
 2013-11-22 12:28:26 -08:00
Christopher Elkins 740a4f4f05 Node.js v0.4 no longer provided by default 
as of 2fc3983825
 2013-11-22 12:26:54 -08:00
Adam Ochonicki 2fc3983825 Merge pull request #455 from boxen/remove-node-0.4 
Remove node v0.4 because it fails on 10.9
 2013-11-21 10:08:54 -08:00
Adam Ochonicki 758260e785 Remove node v0.4 because it fails on 10.9 2013-11-21 12:37:55 -05:00
Will Farrington dc0fa7d279 Merge pull request #448 from indirect/cred_helper_encoding 
force UTF-8 encoding in credential helper
 2013-11-16 02:23:45 -08:00
Andre Arko a8f0b60571 force UTF-8 encoding 2013-11-15 23:12:00 -08:00
Andrew Tomaka ba3de7e943 Merge branch 'master' of https://github.com/boxen/our-boxen into mine 
Conflicts:
	Puppetfile.lock
 2013-11-14 09:35:44 -05:00
Andrew Tomaka 3e9f07e29e Update all personal stuff in boxen 2013-11-14 09:27:24 -05:00
Andrew Tomaka cc69b3d8d0 Remove Thunderbird 2013-11-13 22:00:03 -05:00
Andrew Tomaka aac960aaeb Update Adium 2013-11-13 21:57:08 -05:00
Andrew Tomaka e4f7572489 Add mosh 2013-11-13 21:56:57 -05:00
Andrew Tomaka bda4ab5c98 Add Spotify 2013-11-05 01:13:55 -05:00
Andrew Tomaka 14d7bb2cb9 Update virtualbox/vagrant; install eclipse 2013-11-04 01:32:24 -05:00
Will Farrington b6d0b4175f Merge pull request #426 from boxen/mavericks-updates 
Mavericks-related updates
 2013-11-03 14:17:57 -08:00
Rafael Mendonça França 7a482c9918 Update some modules 2013-11-03 19:34:32 -02:00
Adam Ochonicki e17ecb112f Merge pull request #361 from mdelagralfo/git-credential-fix 
fixing git credential helper for GitHub Enterprise
 2013-11-02 10:28:28 -07:00
Adam Ochonicki 35139159f5 Merge pull request #372 from fschwiet/patch-1 
Update faq.md based on question
 2013-11-02 10:26:58 -07:00
Rafael Mendonça França fea5f0b005 Merge pull request #433 from jjbohn/patch-1 
Add Ruby 2.0.0 to README
 2013-10-31 10:59:40 -07:00
John Bohn a89f288539 Add Ruby 2.0.0 to README 
It's provided now.
 2013-10-31 12:57:55 -05:00
Andrew Tomaka c6c7bc3a12 add alfred and imagemagick 2013-10-27 17:09:49 -04:00
Will Farrington fa853cb374 Update a bunch of gems 2013-10-22 15:56:30 -07:00
Will Farrington 9ed5f33bb6 Update a bunch of modules 2013-10-22 15:55:18 -07:00
Rafael Mendonça França e2e184f80d Upgrade boxen to 2.0.4 2013-10-22 16:39:59 -02:00
Andrew Tomaka 540873a5d4 Install vlc 2013-10-20 21:28:16 -04:00
Andrew Tomaka fa79b8145d Add whatpulse install 2013-10-13 23:43:31 -04:00
Peter Rhoades 907cab4b74 Merge pull request #405 from boxen/nginx-config-update 
Should user repo_dir variable in nginx template
 2013-10-13 05:46:23 -07:00
Rafael Mendonça França d015bde434 Upgrade boxen gem to 2.0.3 to fix the public email issue 
Fixes boxen/boxen#111
 2013-10-12 21:33:27 -03:00
Morgan Delagrange cf69886ac9 updating github enterprise support for 2fa 2013-10-09 15:23:57 -05:00
Andrew Tomaka d17e5b0da8 Remove dashboard 2013-09-30 01:51:41 -04:00
Peter Rhoades 4e3fd770c9 Should user repo_dir variable here incase of over-ride in project definition 2013-09-24 17:11:18 +01:00
Andrew Tomaka 94a0532f8c Add VPN software. 2013-09-23 10:21:55 -04:00
Adam Ochonicki 8723a1e651 Formatting 2013-09-22 20:01:34 -04:00
Andrew Tomaka 76341b6ad1 Add caffeine to avoid sleep during updates... 2013-09-18 23:14:18 -04:00
Andrew Tomaka aff49d1320 Source Code Pro font 2013-09-12 22:09:11 -04:00
Yossef Mendelssohn 93e300a317 Merge pull request #387 from boxen/pull_less 
don't auto-update on some local-only operations
 2013-09-09 14:45:31 -07:00
Andrew Tomaka b6626b6484 Add python 2013-09-07 01:21:54 -04:00
Andrew Tomaka fda756eed6 Update firefox 2013-09-07 01:21:48 -04:00
Ben Toews f0726ce4ed Merge pull request #396 from boxen/two_factor_support 
Add two-factor support
 2013-09-06 13:51:58 -07:00
Ben Toews c3a5ff956f bump boxen and change credential script to support 2fa. 2013-09-06 14:47:03 -06:00
Andrew Tomaka 0625bee94f Link vim plugin directory to dotfiles 2013-08-26 04:05:16 -04:00
Andrew Tomaka b0f39a9eff Temporarily set global nodejs 2013-08-25 22:26:59 -04:00
Andrew Tomaka 3c4e28364e Add qt for capybara-webkit 2013-08-25 16:04:36 -04:00
Andrew Tomaka 50951e58eb Enable firewall 2013-08-25 13:41:16 -04:00
Yossef Mendelssohn 4a946c2b86 also turn off pulling for service manipulation 2013-08-25 13:05:05 -04:00
Yossef Mendelssohn 15e1b5990f switch around the no-pull arg check 2013-08-25 13:04:58 -04:00
Yossef Mendelssohn fb99e60ca9 add more args to turn off pulling 2013-08-25 13:04:45 -04:00
Yossef Mendelssohn 97c386a836 undo accidental changes to master 
This reverts commits 5b4b7223c2,
fe2933519c, and
9f2cfbaed0.

This gets us back to 11ea991577.
 2013-08-25 13:03:44 -04:00
Yossef Mendelssohn 5b4b7223c2 also turn off pulling for service manipulation 2013-08-25 13:00:17 -04:00