Zak Rogoff [Thu, 5 Jun 2014 21:15:05 +0000 (17:15 -0400)]
Trying adding Join to donate.
Zak Rogoff [Thu, 5 Jun 2014 21:14:42 +0000 (17:14 -0400)]
Trying adding Join to donate.
Zak Rogoff [Thu, 5 Jun 2014 18:05:40 +0000 (14:05 -0400)]
Fixing typo and clarifying that I'm talking about public keys in Intro to Section 4: Learn the Web of Trust.
Zak Rogoff [Thu, 5 Jun 2014 17:58:58 +0000 (13:58 -0400)]
Tweaking the changes I just made to 5d (online identity) and section 4 intro (web of trust) in index and propagating the to other versions, along with addition of second infographic share graphic in section 6 sidebar.
Zak Rogoff [Thu, 5 Jun 2014 17:49:01 +0000 (13:49 -0400)]
Adding sharing guide and key and copy of infographic sharing image at the bottom of the page to mac version.
Zak Rogoff [Thu, 5 Jun 2014 17:48:31 +0000 (13:48 -0400)]
Adding sharing guide and key and copy of infographic sharing image at the bottom of the page to mac version.
Zak Rogoff [Thu, 5 Jun 2014 17:44:56 +0000 (13:44 -0400)]
Adding sharing guide and key and copy of infographic sharing image at the bottom of the page to mac version.
Zak Rogoff [Thu, 5 Jun 2014 17:08:48 +0000 (13:08 -0400)]
Tweaking FSF section at top.
Zak Rogoff [Thu, 5 Jun 2014 17:04:40 +0000 (13:04 -0400)]
Adding a troubleshoot to 2.b.
Zak Rogoff [Thu, 5 Jun 2014 17:00:31 +0000 (13:00 -0400)]
Adding back GPGTools and GPG4Win, which got cut somehow.
Zak Rogoff [Thu, 5 Jun 2014 16:58:42 +0000 (12:58 -0400)]
Adding back GPGTools and GPG4Win, which got cut somehow.
Zak Rogoff [Thu, 5 Jun 2014 16:40:22 +0000 (12:40 -0400)]
Adding donate button to bottom of guide in index.
Zak Rogoff [Thu, 5 Jun 2014 16:39:00 +0000 (12:39 -0400)]
Adding donate button to bottom of guide in index.
Zak Rogoff [Thu, 5 Jun 2014 15:37:27 +0000 (11:37 -0400)]
Removing fossamail.
Zak Rogoff [Thu, 5 Jun 2014 15:18:13 +0000 (11:18 -0400)]
Changing phrasing around Thunderbird.
Zak Rogoff [Thu, 5 Jun 2014 14:46:09 +0000 (10:46 -0400)]
Fixing missing adele address.
Ana Isabel Carvalho [Thu, 5 Jun 2014 13:14:14 +0000 (14:14 +0100)]
fixed
Ana Isabel Carvalho [Thu, 5 Jun 2014 12:00:17 +0000 (13:00 +0100)]
fixed
Ana Isabel Carvalho [Thu, 5 Jun 2014 11:58:13 +0000 (12:58 +0100)]
fixed
Ana Isabel Carvalho [Thu, 5 Jun 2014 11:38:40 +0000 (12:38 +0100)]
Added the zip with source files.
Zak Rogoff [Thu, 5 Jun 2014 03:57:19 +0000 (23:57 -0400)]
Fixing a broken troubleshooting, and other stuff I dont' remember because my brain is asleep.
Zak Rogoff [Thu, 5 Jun 2014 03:38:40 +0000 (23:38 -0400)]
Copying everything beneath the section 1 intro (which is different for different OS's) from index over to Mac OS and Windows, then adding switch to free software OS to those two.
Zak Rogoff [Thu, 5 Jun 2014 03:34:41 +0000 (23:34 -0400)]
Some small fixes for John in the index, and changes to section 1 in all the stuff
Zak Rogoff [Thu, 5 Jun 2014 03:19:53 +0000 (23:19 -0400)]
Updating intro section and FSF area on mac and windows.
Zak Rogoff [Thu, 5 Jun 2014 03:17:13 +0000 (23:17 -0400)]
Updating intro section and FSF area on mac and windows.
Zak Rogoff [Thu, 5 Jun 2014 03:13:35 +0000 (23:13 -0400)]
Fixing prism-break link.
Zak Rogoff [Thu, 5 Jun 2014 03:12:42 +0000 (23:12 -0400)]
Fixing prism-break link.
Zak Rogoff [Thu, 5 Jun 2014 03:10:15 +0000 (23:10 -0400)]
Fixing orphaned troubleshooting option in index.
Zak Rogoff [Thu, 5 Jun 2014 03:07:55 +0000 (23:07 -0400)]
Fixing orphaned troubleshooting option in index.
Zak Rogoff [Thu, 5 Jun 2014 02:59:54 +0000 (22:59 -0400)]
Editing Free software section in index.
Zak Rogoff [Thu, 5 Jun 2014 02:46:46 +0000 (22:46 -0400)]
Editing intro section and commenting out key ide in index.
Zak Rogoff [Thu, 5 Jun 2014 02:31:59 +0000 (22:31 -0400)]
Working on section six in index.
Zak Rogoff [Thu, 5 Jun 2014 02:27:52 +0000 (22:27 -0400)]
Working on section six in index.
Zak Rogoff [Thu, 5 Jun 2014 02:19:01 +0000 (22:19 -0400)]
Merge branch 'master' of vcs.fsf.org:enc
Zak Rogoff [Thu, 5 Jun 2014 02:18:52 +0000 (22:18 -0400)]
Working on section 6.
Ana Isabel Carvalho [Thu, 5 Jun 2014 02:18:16 +0000 (03:18 +0100)]
fixed
Ana Isabel Carvalho [Thu, 5 Jun 2014 02:09:04 +0000 (03:09 +0100)]
updated mac and windows
Ana Isabel Carvalho [Thu, 5 Jun 2014 02:03:48 +0000 (03:03 +0100)]
Merge branch 'master' of vcs.fsf.org:enc
Conflicts:
static
Ana Isabel Carvalho [Thu, 5 Jun 2014 02:01:08 +0000 (03:01 +0100)]
removed some comments
Zak Rogoff [Thu, 5 Jun 2014 01:49:31 +0000 (21:49 -0400)]
I think I'm mostly doing section 1 stuff.
Zak Rogoff [Thu, 5 Jun 2014 01:48:48 +0000 (21:48 -0400)]
I think this is mostly changes to the intro.
Ana Isabel Carvalho [Thu, 5 Jun 2014 01:45:59 +0000 (02:45 +0100)]
Updated title in infographic page. Removed links to local css. Added hashtag to header.
Ana Isabel Carvalho [Thu, 5 Jun 2014 01:36:13 +0000 (02:36 +0100)]
Added link to download source files for the infographic. Added Hastag to infographics page and homepage
Ana Isabel Carvalho [Thu, 5 Jun 2014 01:16:09 +0000 (02:16 +0100)]
Changed class highlight to notes. Fixed error in footer.wq
Ana Isabel Carvalho [Thu, 5 Jun 2014 00:57:33 +0000 (01:57 +0100)]
Fixing HTML validation errors. Need to be careful with comments inside comments!wq
Zak Rogoff [Thu, 5 Jun 2014 00:56:46 +0000 (20:56 -0400)]
Merge branch 'master' of vcs.fsf.org:enc
Zak Rogoff [Thu, 5 Jun 2014 00:56:42 +0000 (20:56 -0400)]
I don't understand what I am committing.
Ana Isabel Carvalho [Thu, 5 Jun 2014 00:46:26 +0000 (01:46 +0100)]
Images and sources
Ana Isabel Carvalho [Thu, 5 Jun 2014 00:18:23 +0000 (01:18 +0100)]
Reduced images. Updated footer text in index.html and infographics.html.
Ana Isabel Carvalho [Thu, 5 Jun 2014 00:15:15 +0000 (01:15 +0100)]
Merge branch 'master' of vcs.fsf.org:enc
Conflicts:
static
Ana Isabel Carvalho [Thu, 5 Jun 2014 00:13:55 +0000 (01:13 +0100)]
Updated footer (added jplusplus logo). Added illustrations to sections 3, 5 and 6.
Lisa Marie Maginnis [Thu, 5 Jun 2014 00:00:06 +0000 (20:00 -0400)]
Changed http:// to //
Zak Rogoff [Wed, 4 Jun 2014 23:55:00 +0000 (19:55 -0400)]
Working on Section 4.
Ana Isabel Carvalho [Wed, 4 Jun 2014 23:54:18 +0000 (00:54 +0100)]
Merge branch 'master' of vcs.fsf.org:enc
Zak Rogoff [Wed, 4 Jun 2014 23:54:07 +0000 (19:54 -0400)]
Merge branch 'master' of vcs.fsf.org:enc
Zak Rogoff [Wed, 4 Jun 2014 23:54:02 +0000 (19:54 -0400)]
Working on Section 4.
Ana Isabel Carvalho [Wed, 4 Jun 2014 23:53:53 +0000 (00:53 +0100)]
Added illustration for section 5.
Zak Rogoff [Wed, 4 Jun 2014 23:35:45 +0000 (19:35 -0400)]
Merge branch 'master' of vcs.fsf.org:enc
Zak Rogoff [Wed, 4 Jun 2014 23:35:41 +0000 (19:35 -0400)]
Working on section 5.
Ana Isabel Carvalho [Wed, 4 Jun 2014 23:28:51 +0000 (00:28 +0100)]
Merge branch 'master' of vcs.fsf.org:enc
Conflicts:
static
Ana Isabel Carvalho [Wed, 4 Jun 2014 23:26:35 +0000 (00:26 +0100)]
Fixed link to infographic. Changed screenshots in step 1b.
Zak Rogoff [Wed, 4 Jun 2014 23:10:15 +0000 (19:10 -0400)]
Merge branch 'master' of vcs.fsf.org:enc
Zak Rogoff [Wed, 4 Jun 2014 23:10:07 +0000 (19:10 -0400)]
Writing Be Wary of Invalid Keys section.
Ana Isabel Carvalho [Wed, 4 Jun 2014 22:59:50 +0000 (23:59 +0100)]
Merge branch 'master' of vcs.fsf.org:enc
Ana Isabel Carvalho [Wed, 4 Jun 2014 22:58:24 +0000 (23:58 +0100)]
Added a link to the infographic in the header. Revised HTML order for the header: fsf intro comes before the introduction to the guide. Added PGP pathfinder form to section 4.
Dave Thompson [Wed, 4 Jun 2014 21:49:02 +0000 (17:49 -0400)]
Merge branch 'master' of vcs.fsf.org:enc
Dave Thompson [Wed, 4 Jun 2014 21:48:47 +0000 (17:48 -0400)]
Add piwik tracking code.
Ana Isabel Carvalho [Wed, 4 Jun 2014 21:38:50 +0000 (22:38 +0100)]
Merge branch 'master' of vcs.fsf.org:enc
Ana Isabel Carvalho [Wed, 4 Jun 2014 21:37:51 +0000 (22:37 +0100)]
Fixed internal link for step 1.b. Added illustration for step 2.A. Replaced -> with →
Lisa Marie Maginnis [Wed, 4 Jun 2014 20:59:31 +0000 (16:59 -0400)]
testing
Lisa Marie Maginnis [Wed, 4 Jun 2014 20:58:08 +0000 (16:58 -0400)]
testing
Lisa Marie Maginnis [Wed, 4 Jun 2014 20:57:48 +0000 (16:57 -0400)]
testing
Lisa Marie Maginnis [Wed, 4 Jun 2014 20:57:23 +0000 (16:57 -0400)]
testing
Zak Rogoff [Wed, 4 Jun 2014 19:54:57 +0000 (15:54 -0400)]
Merge branch 'master' of vcs.fsf.org:enc
Zak Rogoff [Wed, 4 Jun 2014 19:54:50 +0000 (15:54 -0400)]
Deleting troubleshooting placeholder and updating donation ask.
Ana Isabel Carvalho [Wed, 4 Jun 2014 19:27:59 +0000 (20:27 +0100)]
Merge branch 'master' of vcs.fsf.org:enc
Ana Isabel Carvalho [Wed, 4 Jun 2014 19:26:48 +0000 (20:26 +0100)]
Section 5, part about losing keys is now a step. Commented FAQ and added instructions in the comments about where to change the section color in main.css. Added two more screenshots to section 1b.
Zak Rogoff [Wed, 4 Jun 2014 19:14:39 +0000 (15:14 -0400)]
Fixing where I broke section 4 and onward.
Zak Rogoff [Wed, 4 Jun 2014 19:13:37 +0000 (15:13 -0400)]
Various little changes.
Zak Rogoff [Wed, 4 Jun 2014 18:49:59 +0000 (14:49 -0400)]
Working on section 6.
Zak Rogoff [Wed, 4 Jun 2014 18:45:12 +0000 (14:45 -0400)]
Merge branch 'master' of vcs.fsf.org:enc
Zak Rogoff [Wed, 4 Jun 2014 18:45:05 +0000 (14:45 -0400)]
Not sure what I'm commiting. I'm bad at git.
Ana Isabel Carvalho [Wed, 4 Jun 2014 17:29:01 +0000 (18:29 +0100)]
Merge branch 'master' of vcs.fsf.org:enc
Ana Isabel Carvalho [Wed, 4 Jun 2014 17:28:44 +0000 (18:28 +0100)]
Fixed link to FSF logo in the header.
Ana Isabel Carvalho [Wed, 4 Jun 2014 17:27:17 +0000 (18:27 +0100)]
Merge branch 'master' of vcs.fsf.org:enc
Ana Isabel Carvalho [Wed, 4 Jun 2014 17:27:08 +0000 (18:27 +0100)]
Merge branch 'master' of vcs.fsf.org:enc
Conflicts:
static
Zak Rogoff [Wed, 4 Jun 2014 17:23:03 +0000 (13:23 -0400)]
Working on the contribute to this guide section.
Zak Rogoff [Wed, 4 Jun 2014 17:22:31 +0000 (13:22 -0400)]
Merge branch 'master' of vcs.fsf.org:enc
Zak Rogoff [Wed, 4 Jun 2014 17:22:21 +0000 (13:22 -0400)]
Working on the contribute to this guide section.
Ana Isabel Carvalho [Wed, 4 Jun 2014 17:20:09 +0000 (18:20 +0100)]
Added 'Website under construction' to the header --> it needs to be deleted before launch!
Zak Rogoff [Wed, 4 Jun 2014 17:17:31 +0000 (13:17 -0400)]
Changing paragraphs in the fsf box and adding tracking links.
Zak Rogoff [Wed, 4 Jun 2014 16:50:25 +0000 (12:50 -0400)]
Commenting out signing step.
Zak Rogoff [Wed, 4 Jun 2014 16:47:32 +0000 (12:47 -0400)]
Working on FSF box.
Zak Rogoff [Wed, 4 Jun 2014 16:46:03 +0000 (12:46 -0400)]
Editing FSF text box.
Ana Isabel Carvalho [Wed, 4 Jun 2014 16:04:53 +0000 (17:04 +0100)]
Removed 'http:' from all image sources. Updated the Troubleshooting 'Leave Feedback' text. Commented the 'Join Now' button and added the 'Donate' button. Added a link to Privacy Policy under the Newsletter subscription form.
Ana Isabel Carvalho [Wed, 4 Jun 2014 14:54:57 +0000 (15:54 +0100)]
Removed links to my local js folder. Added more tags to <meta>.
Ana Isabel Carvalho [Wed, 4 Jun 2014 11:29:01 +0000 (12:29 +0100)]
Changed duiv struture for section intro. Added 'Help translate this guide' to top navigation. Added 'Didn't find what you were looking for?' in all troubleshooting parts with a link to leave feeback.
Ana Isabel Carvalho [Wed, 4 Jun 2014 10:32:53 +0000 (11:32 +0100)]
Merge branch 'master' of vcs.fsf.org:enc
Conflicts:
static
Ana Isabel Carvalho [Wed, 4 Jun 2014 10:29:35 +0000 (11:29 +0100)]
Switching links to stylesheet and scripts.js so I can see the site locally.
Zak Rogoff [Wed, 4 Jun 2014 02:12:53 +0000 (22:12 -0400)]
Working on the key-testing section.
projects / enc-live.git / log