atomaka/my-boxen
1
0
Fork 0
Code Releases Activity
324 commits 2 branches 0 tags 62 MiB
Commit graph

324 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nicklas Gummesson
f80a4b735e Bump dnsmasq to v1.0.1 2014-01-14 00:26:36 +01:00
Adam Ochonicki
04ac6a5b6f Merge pull request #490 from jjasghar/patch-1 
Update README.md
 2014-01-01 13:12:46 -08:00
JJ Asghar
4b14611313 Update README.md 
I found a superfluous space, and also because you are _in_ the directories you need to `./script/boxen` each time.
 2014-01-01 13:12:55 -06:00
Adam Ochonicki
ae7b1dffbe OSX -> OS X 2013-12-29 12:41:40 -05:00
Adam Ochonicki
e1f2d125f2 Merge pull request #485 from afeld/patch-1 
Add XCode instructions for Mavericks
 2013-12-29 09:40:48 -08:00
Aidan Feldman
e644595ef1 update XCode instructions re: boxen-web 2013-12-29 00:14:43 -06:00
Rafael Mendonça França
d492477da4 Merge pull request #489 from johnbellone/patch-2 
Update script/bootstrap sudo to pass environment variables.
 2013-12-27 08:17:30 -08:00
John Bellone
79a74a6555 Update script/bootstrap sudo to pass environment variables. 
When executing a boxen run from inside the corporate firewall we need to pass
proxies through to sudo so that bundler will be installed properly as root.
 2013-12-26 12:49:03 -05:00
Aidan Feldman
65e9a26852 add xcode instructions for mavericks 2013-12-22 00:58:55 -05:00
David Goodlad
20e241539a Merge pull request #481 from grosser/grosser/fetch 
remove unused variable
 2013-12-18 15:52:24 -08:00
grosser
982d687ce6 remove unused variable 2013-12-18 15:46:19 -08:00
David Goodlad
ffde15f0c9 Merge pull request #478 from mattr-/clarify-install 
Clarify the installation steps after bootstrapping
 2013-12-12 20:28:39 -08:00
Adam Ochonicki
717ea347ce Merge pull request #477 from mattr-/explain-repo-location 
Clarify where to create the new git repo.
 2013-12-12 06:29:17 -08:00
Matt Rogers
7e186198ef Clarify the installation steps after bootstrapping 
Make it clearer on how to install a boxen from the command line after the
bootstrapping steps are done.
 2013-12-11 21:58:52 -06:00
Matt Rogers
7b529c00d5 Clarify where to create the new git repo. 
Be more explicit about where the new repo should be located. It's much
easier to set up a repo on the internet. This was implied before and now
it's explicit.

The first time I helped a colleague set this up, we used a local repo.
Since we didn't know what we were doing, we screwed it up pretty badly.
This bit of text might allow others not to make the same mistake we did.
 2013-12-11 21:26:54 -06:00
Will Farrington
c799af5869 Merge pull request #475 from seanknox/master 
Unbreak boxen-git-credential on 10.8 systems
 2013-12-09 12:55:34 -08:00
Sean Knox
eec889719e Short term hack to unbreak boxen-git-credential on 10.8 systems 2013-12-09 11:57:40 -08:00
Will Farrington
c1d35b99e4 Merge pull request #471 from indirect/master 
ensure bootstrap uses system ruby
 2013-12-05 16:10:07 -08:00
Andre Arko
7c0f1c9086 set shebang in gem bins to system ruby 2013-12-05 16:04:14 -08:00
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
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
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
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
Peter Rhoades
4e3fd770c9 Should user repo_dir variable here incase of over-ride in project definition 2013-09-24 17:11:18 +01:00
Adam Ochonicki
8723a1e651 Formatting 2013-09-22 20:01:34 -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
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
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
Yossef Mendelssohn
fe2933519c switch around the no-pull arg check 2013-08-25 12:59:03 -04:00