summaryrefslogtreecommitdiffstats
path: root/tracker/Merge_wiki_website_and_website.mdwn
Commit message (Collapse)AuthorAgeFiles
* Website merge, ideological texts addedGustav Eek2015-01-201
| | | | | | | | | | | Two ideologically important texts were found in the org-mode based website's *from_wiki* directory: *princip.txt* and *fscons.txt*, a suggestion to declaration of principals for Fripost and an article text for FSCONS 2010. An *ideology* category (directory) is created with an overview page, *ideology.mdwn* and to content pages *princip.mdwn* and *fscons-2010.mdwn*. The index, *index.mdwn* is updated accordingly.
* Website merge, The about page is finetuned.Gustav Eek2015-01-201
| | | | | | | Most of the about page, *organisation.org*, was migrated already, available as *om.mdwn*. Minor modifications are made to *om.mdwn*. A notification page *notice.mdwn* is added, containing some notes from various org-mode pages. The notice page is orphan at this point.
* Website merge, membership page incorporatedGustav Eek2015-01-191
| | | | | | The content of the page *medlemskap.org* is added as *medlemskap.mdwn*, and the link in the template *page.tmpl* is updated.
* Merge website, the English text incorporatedGustav Eek2015-01-191
| | | | | | | All content of *index.en.org*, *kontakt.en.org*, and *medlemskap.en.org* is combined into one single English page, *english.mdwn*, that should be part of the website. The template *page.tmpl* is updated accordingly.
* Merge website, FAQ incorporatedGustav Eek2015-01-191
| | | | | | | | Some restructuring has happened with the FAQ's. The org-mode based *faq.org* was mostly available as a general FAQ page, *faq.mdwn*, already. The specific *faq-medlemskap.mdwn* together with some parts of the technical FAQ, *e-post.mdwn* is merged with the general FAQ. Finally the wiki index page is updated accordingly.
* Website merge, certificate pages mergedGustav Eek2015-01-191
| | | | | The certificate pages *certs.asc* and *certs.mdwn* are added. Links to certificates are added to the main navigation bar in *page.tmpl*.
* Ticket for org-mode pages merging addedGustav Eek2015-01-191