enc-live.git
10 years agoI think I'm mostly doing section 1 stuff.
Zak Rogoff [Thu, 5 Jun 2014 01:49:31 +0000 (21:49 -0400)]
I think I'm mostly doing section 1 stuff.

10 years agoI think this is mostly changes to the intro.
Zak Rogoff [Thu, 5 Jun 2014 01:48:48 +0000 (21:48 -0400)]
I think this is mostly changes to the intro.

10 years agoUpdated title in infographic page. Removed links to local css. Added hashtag to header.
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.

10 years agoAdded link to download source files for the infographic. Added Hastag to infographics...
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

10 years agoChanged class highlight to notes. Fixed error in footer.wq
Ana Isabel Carvalho [Thu, 5 Jun 2014 01:16:09 +0000 (02:16 +0100)]
Changed class highlight to notes. Fixed error in footer.wq

10 years agoFixing HTML validation errors. Need to be careful with comments inside comments!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

10 years agoMerge branch 'master' of vcs.fsf.org:enc
Zak Rogoff [Thu, 5 Jun 2014 00:56:46 +0000 (20:56 -0400)]
Merge branch 'master' of vcs.fsf.org:enc

10 years agoI don't understand what I am committing.
Zak Rogoff [Thu, 5 Jun 2014 00:56:42 +0000 (20:56 -0400)]
I don't understand what I am committing.

10 years agoImages and sources
Ana Isabel Carvalho [Thu, 5 Jun 2014 00:46:26 +0000 (01:46 +0100)]
Images and sources

10 years agoReduced images. Updated footer text in index.html and infographics.html.
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.

10 years agoMerge branch 'master' of vcs.fsf.org:enc
Ana Isabel Carvalho [Thu, 5 Jun 2014 00:15:15 +0000 (01:15 +0100)]
Merge branch 'master' of vcs.fsf.org:enc

Conflicts:
static

10 years agoUpdated footer (added jplusplus logo). Added illustrations to sections 3, 5 and 6.
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.

10 years agoChanged http:// to //
Lisa Marie Maginnis [Thu, 5 Jun 2014 00:00:06 +0000 (20:00 -0400)]
Changed http:// to //

10 years agoWorking on Section 4.
Zak Rogoff [Wed, 4 Jun 2014 23:55:00 +0000 (19:55 -0400)]
Working on Section 4.

10 years agoMerge branch 'master' of vcs.fsf.org:enc
Ana Isabel Carvalho [Wed, 4 Jun 2014 23:54:18 +0000 (00:54 +0100)]
Merge branch 'master' of vcs.fsf.org:enc

10 years agoMerge 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

10 years agoWorking on Section 4.
Zak Rogoff [Wed, 4 Jun 2014 23:54:02 +0000 (19:54 -0400)]
Working on Section 4.

10 years agoAdded illustration for section 5.
Ana Isabel Carvalho [Wed, 4 Jun 2014 23:53:53 +0000 (00:53 +0100)]
Added illustration for section 5.

10 years agoMerge branch 'master' of vcs.fsf.org:enc
Zak Rogoff [Wed, 4 Jun 2014 23:35:45 +0000 (19:35 -0400)]
Merge branch 'master' of vcs.fsf.org:enc

10 years agoWorking on section 5.
Zak Rogoff [Wed, 4 Jun 2014 23:35:41 +0000 (19:35 -0400)]
Working on section 5.

10 years agoMerge branch 'master' of vcs.fsf.org:enc
Ana Isabel Carvalho [Wed, 4 Jun 2014 23:28:51 +0000 (00:28 +0100)]
Merge branch 'master' of vcs.fsf.org:enc

Conflicts:
static

10 years agoFixed link to infographic. Changed screenshots in step 1b.
Ana Isabel Carvalho [Wed, 4 Jun 2014 23:26:35 +0000 (00:26 +0100)]
Fixed link to infographic. Changed screenshots in step 1b.

10 years agoMerge branch 'master' of vcs.fsf.org:enc
Zak Rogoff [Wed, 4 Jun 2014 23:10:15 +0000 (19:10 -0400)]
Merge branch 'master' of vcs.fsf.org:enc

10 years agoWriting Be Wary of Invalid Keys section.
Zak Rogoff [Wed, 4 Jun 2014 23:10:07 +0000 (19:10 -0400)]
Writing Be Wary of Invalid Keys section.

10 years agoMerge branch 'master' of vcs.fsf.org:enc
Ana Isabel Carvalho [Wed, 4 Jun 2014 22:59:50 +0000 (23:59 +0100)]
Merge branch 'master' of vcs.fsf.org:enc

10 years agoAdded a link to the infographic in the header. Revised HTML order for the header...
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.

10 years agoMerge branch 'master' of vcs.fsf.org:enc
Dave Thompson [Wed, 4 Jun 2014 21:49:02 +0000 (17:49 -0400)]
Merge branch 'master' of vcs.fsf.org:enc

10 years agoAdd piwik tracking code.
Dave Thompson [Wed, 4 Jun 2014 21:48:47 +0000 (17:48 -0400)]
Add piwik tracking code.

10 years agoMerge branch 'master' of vcs.fsf.org:enc
Ana Isabel Carvalho [Wed, 4 Jun 2014 21:38:50 +0000 (22:38 +0100)]
Merge branch 'master' of vcs.fsf.org:enc

10 years agoFixed internal link for step 1.b. Added illustration for step 2.A. Replaced -> with...
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 →

10 years agotesting
Lisa Marie Maginnis [Wed, 4 Jun 2014 20:59:31 +0000 (16:59 -0400)]
testing

10 years agotesting
Lisa Marie Maginnis [Wed, 4 Jun 2014 20:58:08 +0000 (16:58 -0400)]
testing

10 years agotesting
Lisa Marie Maginnis [Wed, 4 Jun 2014 20:57:48 +0000 (16:57 -0400)]
testing

10 years agotesting
Lisa Marie Maginnis [Wed, 4 Jun 2014 20:57:23 +0000 (16:57 -0400)]
testing

10 years agoMerge branch 'master' of vcs.fsf.org:enc
Zak Rogoff [Wed, 4 Jun 2014 19:54:57 +0000 (15:54 -0400)]
Merge branch 'master' of vcs.fsf.org:enc

10 years agoDeleting troubleshooting placeholder and updating donation ask.
Zak Rogoff [Wed, 4 Jun 2014 19:54:50 +0000 (15:54 -0400)]
Deleting troubleshooting placeholder and updating donation ask.

10 years agoMerge branch 'master' of vcs.fsf.org:enc
Ana Isabel Carvalho [Wed, 4 Jun 2014 19:27:59 +0000 (20:27 +0100)]
Merge branch 'master' of vcs.fsf.org:enc

10 years agoSection 5, part about losing keys is now a step. Commented FAQ and added instructions...
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.

10 years agoFixing where I broke section 4 and onward.
Zak Rogoff [Wed, 4 Jun 2014 19:14:39 +0000 (15:14 -0400)]
Fixing where I broke section 4 and onward.

10 years agoVarious little changes.
Zak Rogoff [Wed, 4 Jun 2014 19:13:37 +0000 (15:13 -0400)]
Various little changes.

10 years agoWorking on section 6.
Zak Rogoff [Wed, 4 Jun 2014 18:49:59 +0000 (14:49 -0400)]
Working on section 6.

10 years agoMerge branch 'master' of vcs.fsf.org:enc
Zak Rogoff [Wed, 4 Jun 2014 18:45:12 +0000 (14:45 -0400)]
Merge branch 'master' of vcs.fsf.org:enc

10 years agoNot sure what I'm commiting. I'm bad at git.
Zak Rogoff [Wed, 4 Jun 2014 18:45:05 +0000 (14:45 -0400)]
Not sure what I'm commiting. I'm bad at git.

10 years agoMerge branch 'master' of vcs.fsf.org:enc
Ana Isabel Carvalho [Wed, 4 Jun 2014 17:29:01 +0000 (18:29 +0100)]
Merge branch 'master' of vcs.fsf.org:enc

10 years agoFixed link to FSF logo in the header.
Ana Isabel Carvalho [Wed, 4 Jun 2014 17:28:44 +0000 (18:28 +0100)]
Fixed link to FSF logo in the header.

10 years agoMerge branch 'master' of vcs.fsf.org:enc
Ana Isabel Carvalho [Wed, 4 Jun 2014 17:27:17 +0000 (18:27 +0100)]
Merge branch 'master' of vcs.fsf.org:enc

10 years agoMerge 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

10 years agoWorking on the contribute to this guide section.
Zak Rogoff [Wed, 4 Jun 2014 17:23:03 +0000 (13:23 -0400)]
Working on the contribute to this guide section.

10 years agoMerge branch 'master' of vcs.fsf.org:enc
Zak Rogoff [Wed, 4 Jun 2014 17:22:31 +0000 (13:22 -0400)]
Merge branch 'master' of vcs.fsf.org:enc

10 years agoWorking on the contribute to this guide section.
Zak Rogoff [Wed, 4 Jun 2014 17:22:21 +0000 (13:22 -0400)]
Working on the contribute to this guide section.

10 years agoAdded 'Website under construction' to the header --> it needs to be deleted before...
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!

10 years agoChanging paragraphs in the fsf box and adding tracking links.
Zak Rogoff [Wed, 4 Jun 2014 17:17:31 +0000 (13:17 -0400)]
Changing paragraphs in the fsf box and adding tracking links.

10 years agoCommenting out signing step.
Zak Rogoff [Wed, 4 Jun 2014 16:50:25 +0000 (12:50 -0400)]
Commenting out signing step.

10 years agoWorking on FSF box.
Zak Rogoff [Wed, 4 Jun 2014 16:47:32 +0000 (12:47 -0400)]
Working on FSF box.

10 years agoEditing FSF text box.
Zak Rogoff [Wed, 4 Jun 2014 16:46:03 +0000 (12:46 -0400)]
Editing FSF text box.

10 years agoRemoved 'http:' from all image sources. Updated the Troubleshooting 'Leave Feedback...
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.

10 years agoRemoved links to my local js folder. Added more tags to <meta>.
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>.

10 years agoChanged duiv struture for section intro. Added 'Help translate this guide' to top...
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.

10 years agoMerge branch 'master' of vcs.fsf.org:enc
Ana Isabel Carvalho [Wed, 4 Jun 2014 10:32:53 +0000 (11:32 +0100)]
Merge branch 'master' of vcs.fsf.org:enc

Conflicts:
static

10 years agoSwitching links to stylesheet and scripts.js so I can see the site locally.
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.

10 years agoWorking on the key-testing section.
Zak Rogoff [Wed, 4 Jun 2014 02:12:53 +0000 (22:12 -0400)]
Working on the key-testing section.

10 years agoWorking on the key-testing section.
Zak Rogoff [Wed, 4 Jun 2014 02:10:56 +0000 (22:10 -0400)]
Working on the key-testing section.

10 years agoWorking on the key-testing section.
Zak Rogoff [Wed, 4 Jun 2014 02:09:40 +0000 (22:09 -0400)]
Working on the key-testing section.

10 years agoWorking on the key-testing section.
Zak Rogoff [Wed, 4 Jun 2014 02:06:42 +0000 (22:06 -0400)]
Working on the key-testing section.

10 years agoI don't remember what I'm committing.
Zak Rogoff [Wed, 4 Jun 2014 00:40:44 +0000 (20:40 -0400)]
I don't remember what I'm committing.

10 years agoI don't remember what I'm commiting.
Zak Rogoff [Wed, 4 Jun 2014 00:37:18 +0000 (20:37 -0400)]
I don't remember what I'm commiting.

10 years agoFix for the introduction div to section 6.
Ana Isabel Carvalho [Tue, 3 Jun 2014 20:11:45 +0000 (21:11 +0100)]
Fix for the introduction div to section 6.

10 years agoFixed links to static content.
Ana Isabel Carvalho [Tue, 3 Jun 2014 19:55:29 +0000 (20:55 +0100)]
Fixed links to static content.

10 years agoFixing error in url. Should be working now!
Ana Isabel Carvalho [Tue, 3 Jun 2014 18:23:50 +0000 (19:23 +0100)]
Fixing error in url. Should be working now!

10 years agoFixed links to point to static.fsf.org.
Ana Isabel Carvalho [Tue, 3 Jun 2014 18:18:47 +0000 (19:18 +0100)]
Fixed links to point to static.fsf.org.

10 years agoFleshing out section 6.
Zak Rogoff [Tue, 3 Jun 2014 17:13:15 +0000 (13:13 -0400)]
Fleshing out section 6.

10 years agoCreating new files for mac and windows, and working on Section 1 in all three version...
Zak Rogoff [Tue, 3 Jun 2014 16:44:30 +0000 (12:44 -0400)]
Creating new files for mac and windows, and working on Section 1 in all three versions. Right now the mac and windows files include only section 1, because it is where almost all the differences are.

10 years agoCreating new files for mac and windows, and working on Section 1 in all three version...
Zak Rogoff [Tue, 3 Jun 2014 16:41:24 +0000 (12:41 -0400)]
Creating new files for mac and windows, and working on Section 1 in all three versions. Right now the mac and windows files include only section 1, because it is where almost all the differences are.

10 years agoCreating new files for mac and windows, and working on Section 1 in all three version...
Zak Rogoff [Tue, 3 Jun 2014 16:40:47 +0000 (12:40 -0400)]
Creating new files for mac and windows, and working on Section 1 in all three versions. Right now the mac and windows files include only section 1, because it is where almost all the differences are.

10 years agoAdded information to the FSF introduction: a paragraph from fsf.org/about, form to...
Ana Isabel Carvalho [Tue, 3 Jun 2014 12:19:40 +0000 (13:19 +0100)]
Added information to the FSF introduction: a paragraph from fsf.org/about, form to subscribe to the newsletter. Reorganized the divs for each step. Different layout for the header.

10 years agoAdded alt attribute to the screenshot in step1.a.
Ana Isabel Carvalho [Mon, 2 Jun 2014 16:36:52 +0000 (17:36 +0100)]
Added alt attribute to the screenshot in step1.a.

10 years agoUpdated HTML to fix validation errors (coulnd't use ---- in comments). Added tags...
Ana Isabel Carvalho [Mon, 2 Jun 2014 16:30:37 +0000 (17:30 +0100)]
Updated HTML to fix validation errors (coulnd't use ---- in comments). Added tags and description for SEO purposes. Added first screenshot to step 1a.

10 years agoUpdated text with latest version of Textual Guide (http://libreplanet.org/wiki/GPG_gu...
Ana Isabel Carvalho [Mon, 2 Jun 2014 11:42:11 +0000 (12:42 +0100)]
Updated text with latest version of Textual Guide (libreplanet.org/wiki/GPG_guide). Added comments to explain the structure in index.html. Updated languages menu (english is the only option at the moment). Added a section at the top of the page for the FSF introduction text. Added hooks to each section and step to allow linking to specific parts of the page. Updated html to make the troubleshooting parts collapsible (wip).

10 years agoRemoved in-between sections that didn't make sense (sematically) and created extra...
Ana Isabel Carvalho [Sun, 1 Jun 2014 17:01:42 +0000 (18:01 +0100)]
Removed in-between sections that didn't make sense (sematically) and created extra white space.

10 years agoAdded Draft Guide Text (from libreplanet.org/wiki/GPG_guide/Textual_Draft) to index...
Ana Isabel Carvalho [Sun, 1 Jun 2014 16:23:24 +0000 (17:23 +0100)]
Added Draft Guide Text (from libreplanet.org/wiki/GPG_guide/Textual_Draft) to index.html, navigation and footer with the guide's license details.

10 years agoTesting.
Ana Isabel Carvalho [Sat, 31 May 2014 17:36:37 +0000 (18:36 +0100)]
Testing.

10 years agoAdded index.html for filler
Lisa Marie Maginnis [Thu, 22 May 2014 20:53:45 +0000 (16:53 -0400)]
Added index.html for filler

10 years agoAdded submodule for static.fsf.org
Lisa Marie Maginnis [Thu, 22 May 2014 20:26:44 +0000 (16:26 -0400)]
Added submodule for static.fsf.org