diff --git a/MacInstallation.md b/MacInstallation.md index a6e47436..c2b9d80d 100644 --- a/MacInstallation.md +++ b/MacInstallation.md @@ -1,3 +1,5 @@ +If you are doing an upgrade and or recent pull for changes you will need to change your default ruby package from 2.1.1 to ruby 2.1.2 + install homebrew \curl -sSL https://get.rvm.io | bash -s stable --rails diff --git a/UbuntuInstallation.md b/UbuntuInstallation.md index 348ad5c1..77b14757 100644 --- a/UbuntuInstallation.md +++ b/UbuntuInstallation.md @@ -1,3 +1,12 @@ +If you are doing an upgrade and or recent pull for changes you will need to change your default ruby package from 2.1.1 to ruby 2.1.2 +to do this use this command + rvm install ruby-2.1.2 +once the download is finished select that package as your default + rvm default ruby-2.1.2 +then + bundle install +now you are good to go with normal execution + Firstly this walkthrough is done with a 14.04 32bit install of Ubuntu. All commands that I could are terminal based. diff --git a/WindowsInstallation.md b/WindowsInstallation.md index 0e8dcd4e..8d91762e 100644 --- a/WindowsInstallation.md +++ b/WindowsInstallation.md @@ -1,5 +1,7 @@ First off, Metamaps runs on Ruby On Rails. Ruby 1.9.3 and Rails 3.2. You'll need to get Ruby and Rails installed on your computer if you don't already have it. We recommend using the Rails Installer, which you can download from Mac or Windows at http://railsinstaller.org/en (see the notes below about Ubuntu). This will get you set up perfectly with the right versions of Ruby, and Rails for running your local version of Metamaps. +If you are doing an upgrade and or recent pull for changes you will need to change your default ruby package from 2.1.1 to ruby 2.1.2 + It uses postgreSQL 9.2 as a database. You can install that for your computer from here: http://www.enterprisedb.com/products-services-training/pgdownload . During installation you can choose whatever database password you like. Make sure to note it down! Once you install those, open a 'command prompt with ruby and rails'. diff --git a/app/assets/images/RibbonDonateBitcoin.png b/app/assets/images/RibbonDonateBitcoin.png new file mode 100644 index 00000000..4ef580d9 Binary files /dev/null and b/app/assets/images/RibbonDonateBitcoin.png differ diff --git a/app/views/layouts/_lightboxes.html.erb b/app/views/layouts/_lightboxes.html.erb index 1cf1681e..1e6ac712 100644 --- a/app/views/layouts/_lightboxes.html.erb +++ b/app/views/layouts/_lightboxes.html.erb @@ -170,6 +170,10 @@

Financial contributions are greatly appreciated in support of our work. All financial contributions are transparently governed and recorded in our value accounting system.

+ + //TODO add bitcoin wallet payment link. + DonatewithBitCoin +