urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.ikiwiki.info

master
Joey Hess 2016-08-03 15:06:31 -04:00
parent 3f78c41770 fd468ef947
commit f582a0fcf2
Failed to extract signature
5 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/git.mdwn
View File

@ -84,6 +84,7 @@ think about merging them. This is recommended. :-)
* [[users/mjd]] `https://github.com/mjdominus/ikiwiki.git` ([[browse|https://github.com/mjdominus/ikiwiki]])
* [[users/kjs]] `git://src.kalleswork.net/ikiwiki.git`
* bfree `git://github.com/bfree/ikiwiki.git`
* [[users/leg]] `git://at.magma-soft.at/ikiwiki.info`
## branches

3
doc/ikiwikiusers.mdwn
View File

@ -106,6 +106,9 @@ Projects & Organizations
* [Piratas XYZ](http://piratas.xyz) - one of [pirate party of brazil](http://partidopirata.org)'s sites
* [Bürgerinitiative S4-Ausbau](https://www.s4-ausbau.de/) - A initative in the larger munich area to improve the public transport line S4
* [MagmaSoft](http://magma-soft.at/), as well as the support site and the [Software Wiki](http://at.magma-soft.at/sw/)
* [[voice in time|http://voice-in-time.com]] a voice recording studio located in Hamburg, Germany (rather complex build using ikiwiki only, providing CGI access for the customer)
* [[nb instrument|http://nb-instrument.com]] a workshop for beautifully handcrafted musical instruments, located in Hamburg, Germany (also one of our rather complex builds using ikiwiki only, providing CGI access for the customer)
* [[coido architects|http://coido.de]] architectural company, located in Hamburg, Germany and Rotterdam, Netherlands (also rather complex build adding masonry and gallery scripts and some pjaxing to the picture, providing CGI access for the customer)
Personal sites and blogs
========================

3
doc/todo/BrowserID.mdwn
View File

@ -23,3 +23,6 @@ Some additional information on BrowserID:
> program (haskell would be fine ;),
> of <https://wiki.mozilla.org/Identity/BrowserID#Assertion_Verification>.
> --[[Joey]]
BrowserID, or Mobilla Persona, is shutting down with 30th of November 2016.
Seen at <https://login.persona.org/about> --[[leg]]

1
doc/users/SamHathaway.mdwn 100644
View File

@ -0,0 +1 @@
Hey, this is my user page.

1
doc/users/schmonz.mdwn
View File

@ -17,6 +17,7 @@ pages="!*/Discussion and ((link(users/schmonz) and plugins/* and !plugins/openid
authentication](http://www.columbia.edu/acis/rad/authmethods/wind/) plugin)
* [A small personal site](http://www.anglofish.net/) (happily hosted at
[Branchable](http://www.branchable.com/))
* [A wiki about Agile in distributed teams](http://shapemywork.com/)
## Non-public