summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFiles
* Don't offer to edit the website.Guilhem Moulin2015-05-311
|
* Update links to website.Guilhem Moulin2015-05-311
|
* Wiki-preview discriptions completed with some notesGustav Eek2015-04-242
| | | | | | The descritpion on how to set up a wiki preview is completed with how to handle the need for to test absolute links through update the */etc/hosts* file.
* Temporary link changesGustav Eek2015-04-241
| | | | | | | | | Of course the navigation bar links on the wiki can not yet point to the addresses to be. The template page.tmpl is modified so that navigation links point to relative path pages. When fripost.org and wiki.fripost.org are served from the same instance, then the navigation bar URL's should be updated again.
* Merge branch 'website-separation'Gustav Eek2015-04-2419
|\ | | | | | | | | Conflicts: templates/page.tmpl
| * Modifications between absolute and relative pathsGustav Eek2015-04-244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In website documents, *http://fripost.org/<document>* corresponding to *./website/<document>*, links refering to the wiki, *http://fripost.org/<document>* corresponding to *./<document>*, need absolute paths and vise verse. This commit contains changes due to that. Note that links in wiki documents refering to website documents does not strictly need to follow the absolute path rule: both *http://fripost.org/kontakt* and *./website/kontakt* works equally well. Note also that URL's to fripost.org are written as "http://..." instead of "https://". The reason is that my local lab setup does not have security enabled.
| * Merge branch 'move-website' into website-separationge-website-separationGustav Eek2015-04-243
| |\
| | * Revert "Suggestions to look modifications"Gustav Eek2015-04-241
| | | | | | | | | | | | This reverts commit b4043f739fbbe30bdbe553f30b0e902f726b1232.
| | * Update cert for imap.fripost.org:993ge-move-websiteGuilhem Moulin2015-03-022
| | |
| | * Suggestions to look modificationsGustav Eek2015-03-011
| | |
| | * Website merge, some structure added to the ticketGustav Eek2015-01-201
| | | | | | | | | | | | | | | Some structure is added to the tracker ticket, and some concerns are raised.
| * | The attempt actually worksGustav Eek2015-04-230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To complete a previous git commit message. Configure the web server forwarding rules correctly will make static content to be served correctly. This is the Nginx configuration snippet: ---- server { server_name fripost.localhost; location / { root /home/gustav/public_html/fripost-wiki/website; location /static { root /home/gustav/public_html/fripost-wiki; } } } server { server_name wiki.fripost.localhost; location / { root /home/gustav/public_html/fripost-wiki; } } ---- The extra rule for `/static` did the thing.
| * | Some menu items moved around in page templateGustav Eek2015-04-231
| | | | | | | | | | | | | | | For obvious reasons, the certificates links does not need to be on the top navigation field. It is moved to the drop down item.
| * | Atempt to do a separation that does not workGustav Eek2015-01-207
| |/ | | | | | | | | | | | | | | | | | | | | | | | | This is an atemp to separation of http://wiki.fripost.org and http://fripost.org. The wiki content is left untouched. All website content (apart from *hem.mdwn*) is moved into a directory, *website*, and *hem.mdwn* is named *website.mdwn*. Then the website is reached through *https://fripost.org* simply by making the webserver point those request to root *<path-to-fripost-wiki>/website*. The *website.mdwn* will be *<path-to-fripost-wiki>/website/index.html* and default target.
| * Website merge, dictionary and idea addedGustav Eek2015-01-204
| | | | | | | | | | | | | | In *from_wiki* a list with language tips and translations was found, which is now added as *dictionary.mdwn*. Also the idea *sidospår.txt* is brought up under *hjalpa_till.mdwn*
| * Website merge, ideological texts addedGustav Eek2015-01-205
| | | | | | | | | | | | | | | | | | | | | | 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-203
| | | | | | | | | | | | | | 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-193
| | | | | | | | | | | | 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-193
| | | | | | | | | | | | | | 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-195
| | | | | | | | | | | | | | | | 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-194
| | | | | | | | | | The certificate pages *certs.asc* and *certs.mdwn* are added. Links to certificates are added to the main navigation bar in *page.tmpl*.
| * Basic preparation modification to page templateGustav Eek2015-01-191
| | | | | | | | | | Some URL's in *page.tmpl* are modified for compatibility with generic installations. Also some preparation for website migration are done.
* | Use HTML entities in the template file.Guilhem Moulin2015-04-241
| |
* | ikiwiki refuses to copy symlinks.Guilhem Moulin2015-04-242
| | | | | | | | | | (For security reasons.) So we remove the symlink jquery.min.js → jquery-$VERSION.min.js and rename that file instead.
* | Remove test template.Guilhem Moulin2015-04-241
| |
* | Ignore _build and dist directories.Guilhem Moulin2015-04-241
| |
* | Upgrade response.js from 1.3.0 to 1.4.2.Guilhem Moulin2015-04-241
| |
* | Upgrade MathJax from 2.4.0 to 2.5.1.Guilhem Moulin2015-04-241
| |
* | Upgrade HTML5 Shiv from 3.7.0 to 3.7.2.Guilhem Moulin2015-04-243
| |
* | Upgrade jquery from 2.1.1 to 2.1.3.Guilhem Moulin2015-04-244
| |
* | Upgrade Bootstrap from v3.2.0 to 3.3.4.Guilhem Moulin2015-04-2414
| |
* | Add backup files to the gitignore.Guilhem Moulin2015-04-241
| |
* | Remove backup file.Guilhem Moulin2015-04-242
| |
* | Revert of commit 56cc100b through fdb79bd1bGustav Eek2015-04-235
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Revert "Creation test of page 'static/css/bootstrap.css/some-page'" This reverts commit fdb79bd1bd2dcbcf74d6b3b8e8e548cabc7e5565. - Revert "Creation of link test in sandbox" This reverts commit 376a11735fa2f7e5bce368c6b0c579c7eaf807d7. - Revert "Creation of link test in sandbox" This reverts commit 9781c062d686d65db5f925bbc686d338f24c2512. - Revert "Creation test of page 'static/some-page'" This reverts commit 8a4393522023aea8a16bbe138b58480d9bc4cc1c. - Revert "Creation of link test in sandbox" This reverts commit 7a9dcda0660c2cc9719a6042950d520941bd92bc. - Revert "Creation test of page 'static'" This reverts commit 56cc100b4a9dd75010962b383ff5cde06d3f66b7.
* | Creation test of page 'static/css/bootstrap.css/some-page'gustaveek2015-04-232
| |
* | Creation of link test in sandboxgustaveek2015-04-231
| |
* | Creation of link test in sandboxgustaveek2015-04-231
| |
* | Creation test of page 'static/some-page'gustaveek2015-04-231
| |
* | Creation of link test in sandboxgustaveek2015-04-231
| |
* | Creation test of page 'static'gustaveek2015-04-231
| |
* | Creation of link test in sandboxgustaveek2015-04-231
| |
* | Comment on helping out page added.Gustav Eek2015-04-191
| |
* | Update of activity day reports about the Mars 22 activityGustav Eek2015-04-182
| | | | | | | | | | Also the "Hjälpa till" document is updated according to notes from the activity day.
* | Kalendar updatedGustav Eek2015-04-182
| |
* | typoGuilhem Moulin2015-03-091
| |
* | Reflecting the changes in the frequency of meetings decided recentlymoza2015-03-091
| |
* | (no commit message)Grégoire2015-02-231
| |
* | attachment uploadGrégoire2015-02-231
| |
* | (no commit message)Grégoire2015-02-231
| |
* | attachment uploadGrégoire2015-02-231
| |