From fde696d632f8d98e8277f303d76c3b09443e1f94 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 16 Feb 2012 19:48:22 +0100 Subject: Sync with HEAD of submodules: basewiki directives javascript openid-selector smiley templates. --- basewiki | 2 +- directives | 2 +- javascript | 2 +- openid-selector | 2 +- smiley | 2 +- templates | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/basewiki b/basewiki index c3390aa..400f837 160000 --- a/basewiki +++ b/basewiki @@ -1 +1 @@ -Subproject commit c3390aa6cbb6738a980cfd819ca9d4c953016aa3 +Subproject commit 400f837c143e03ab7b183fb26070d0b72fbc23d7 diff --git a/directives b/directives index 57bccb3..310150a 160000 --- a/directives +++ b/directives @@ -1 +1 @@ -Subproject commit 57bccb327efdb9fff0ff55ff07be3aed5b31e63f +Subproject commit 310150aea29904bc6a929ddcfbc191362ec19714 diff --git a/javascript b/javascript index 52ea951..6f8e5a5 160000 --- a/javascript +++ b/javascript @@ -1 +1 @@ -Subproject commit 52ea951b1fbfb236cb4d609318f2a8aff094518c +Subproject commit 6f8e5a58a2694b1d51dd3c473e57d8c27fc1680d diff --git a/openid-selector b/openid-selector index f832ce3..9a4dc5c 160000 --- a/openid-selector +++ b/openid-selector @@ -1 +1 @@ -Subproject commit f832ce33462ebcb5cc31ac657f4e28192a02f305 +Subproject commit 9a4dc5c570327a0504d3dc62fd27aee06ea13ddb diff --git a/smiley b/smiley index 43a1d0d..6e9eca2 160000 --- a/smiley +++ b/smiley @@ -1 +1 @@ -Subproject commit 43a1d0d6461a1bab3930bcfb1a7821e098ca6902 +Subproject commit 6e9eca2a56b5cfa7650afb13e228e731f3d32648 diff --git a/templates b/templates index 3d5555a..bde35ac 160000 --- a/templates +++ b/templates @@ -1 +1 @@ -Subproject commit 3d5555a00f4a6e974af26e852ee483c6c327c8eb +Subproject commit bde35ace94b9cc6ef00fcd20b359dc17f0caa464 -- cgit v1.2.3 From 395a181654f479fd6bfef70b7f4d9031e5d726d1 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 23 Feb 2012 18:15:51 +0100 Subject: Sync with HEAD of submodule: javascript. --- javascript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javascript b/javascript index 6f8e5a5..80e48d9 160000 --- a/javascript +++ b/javascript @@ -1 +1 @@ -Subproject commit 6f8e5a58a2694b1d51dd3c473e57d8c27fc1680d +Subproject commit 80e48d9d608fc8426fe23f3f1a300a662c944493 -- cgit v1.2.3 From 4c0e3f5ea9e98d3400383fcc47b3bb2b47bd5d08 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 1 Mar 2012 01:01:36 +0100 Subject: Separate defaults from options (the latter applied last, overriding custom settings), and extend with more defaults and options. --- include.mk | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/include.mk b/include.mk index 1a0e04a..e0583e8 100644 --- a/include.mk +++ b/include.mk @@ -1,6 +1,17 @@ +IKIWIKI_SHARED_DEFAULTS ?= \ + --plugin goodstuff \ + --plugin underlay \ + --plugin theme \ + --set theme=goab \ + --plugin h1title \ + --plugin favicon \ + --plugin typography \ + --set typographyattributes=ie \ + --set exclude='^.*\.(rb|scss)$$' \ + IKIWIKI_SHARED_OPTIONS ?= \ - --templatedir '$(CURDIR)/shared/templates' \ - --set underlaydirbase='$(CURDIR)/shared' \ - --underlaydir '$(CURDIR)/shared/basewiki' \ - --libdir '$(CURDIR)/shared/perl' \ - --set exclude='^.*\.(rb|scss)$$' + --templatedir '$(CURDIR)/shared/templates' \ + --set underlaydirbase='$(CURDIR)/shared' \ + --underlaydir '$(CURDIR)/shared/basewiki' \ + --libdir '$(CURDIR)/shared/perl' \ + --set-yaml add_underlays='- $(CURDIR)/styling' \ -- cgit v1.2.3 From 3ad71262f915a8ff542abd0a71bcd1bc32c1efa2 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Thu, 1 Mar 2012 01:01:52 +0100 Subject: Sync with HEAD of submodule: perl. --- perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl b/perl index 4c6d6ac..0c71a17 160000 --- a/perl +++ b/perl @@ -1 +1 @@ -Subproject commit 4c6d6acb341627ee58bc80498d333f5f3fa4f483 +Subproject commit 0c71a177cbe4594025f6dfc8ae6daf3f7ff19650 -- cgit v1.2.3 From 03bf07feafc4e6bd5ff4ecacab4b0ca73e5a0f06 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 10 Mar 2012 05:41:13 +0100 Subject: Sync with HEAD of submodule: themes. --- themes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes b/themes index 7f5e441..72d9d12 160000 --- a/themes +++ b/themes @@ -1 +1 @@ -Subproject commit 7f5e44139b28eb62bd4787c163b40f9d1a67c94f +Subproject commit 72d9d12f40b3da54136d28f1ba109e17563e87cb -- cgit v1.2.3 From efcab289f951f4c7d7a7f73f4f4476fece6fa4e1 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 24 Mar 2012 00:58:24 +0100 Subject: Sync with HEAD of submodule: themes. --- themes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes b/themes index 72d9d12..ee5cc34 160000 --- a/themes +++ b/themes @@ -1 +1 @@ -Subproject commit 72d9d12f40b3da54136d28f1ba109e17563e87cb +Subproject commit ee5cc3491b0423e5581e27fbbcf07db9313f97e6 -- cgit v1.2.3 From 289e0e2c2ba90e690dc8ce9c1558ca0b9cf679d7 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 24 Mar 2012 01:12:29 +0100 Subject: Sync with HEAD of submodule: themes. --- themes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes b/themes index ee5cc34..e858a96 160000 --- a/themes +++ b/themes @@ -1 +1 @@ -Subproject commit ee5cc3491b0423e5581e27fbbcf07db9313f97e6 +Subproject commit e858a96161d13dcaf0d622a50ba1e0d13106f78c -- cgit v1.2.3 From f883dcfd58c1b6811d341c22e553ebc7f53b9aa5 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 4 Aug 2012 15:46:04 +0200 Subject: Sync with HEAD of submodules, and add new submodule osm. --- .gitmodules | 3 +++ attachment | 2 +- basewiki | 2 +- directives | 2 +- javascript | 2 +- openid-selector | 2 +- osm | 1 + perl | 2 +- templates | 2 +- themes | 2 +- 10 files changed, 12 insertions(+), 8 deletions(-) create mode 160000 osm diff --git a/.gitmodules b/.gitmodules index 526a65f..884df93 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,3 +28,6 @@ [submodule "jquery"] path = jquery url = git://source.jones.dk/ikiwiki/jquery +[submodule "osm"] + path = osm + url = git://source.jones.dk/ikiwiki/osm diff --git a/attachment b/attachment index 101beb1..f31bfdf 160000 --- a/attachment +++ b/attachment @@ -1 +1 @@ -Subproject commit 101beb116501b49d69c158413037601ae4f22035 +Subproject commit f31bfdf3ace0020f10d6157c1e3b1a89365c4340 diff --git a/basewiki b/basewiki index 400f837..a46ebd1 160000 --- a/basewiki +++ b/basewiki @@ -1 +1 @@ -Subproject commit 400f837c143e03ab7b183fb26070d0b72fbc23d7 +Subproject commit a46ebd14e13dd1f42d446d0eda7ee7a98a6781ef diff --git a/directives b/directives index 310150a..0686e55 160000 --- a/directives +++ b/directives @@ -1 +1 @@ -Subproject commit 310150aea29904bc6a929ddcfbc191362ec19714 +Subproject commit 0686e55e2a02a8e50cac8ac21a51d938a4cb0784 diff --git a/javascript b/javascript index 80e48d9..45f99af 160000 --- a/javascript +++ b/javascript @@ -1 +1 @@ -Subproject commit 80e48d9d608fc8426fe23f3f1a300a662c944493 +Subproject commit 45f99afe7c1ffb2429741eb214ad4fa6f40062c0 diff --git a/openid-selector b/openid-selector index 9a4dc5c..cfee2a1 160000 --- a/openid-selector +++ b/openid-selector @@ -1 +1 @@ -Subproject commit 9a4dc5c570327a0504d3dc62fd27aee06ea13ddb +Subproject commit cfee2a1e2966a3d75e6079b899c29a8cca33d2df diff --git a/osm b/osm new file mode 160000 index 0000000..c4dbd05 --- /dev/null +++ b/osm @@ -0,0 +1 @@ +Subproject commit c4dbd05e1305f0c021a56495dc28c604362a6cea diff --git a/perl b/perl index 0c71a17..e857ff5 160000 --- a/perl +++ b/perl @@ -1 +1 @@ -Subproject commit 0c71a177cbe4594025f6dfc8ae6daf3f7ff19650 +Subproject commit e857ff5315b319074dd2e4df7b3e70f2a3605715 diff --git a/templates b/templates index bde35ac..8ef0907 160000 --- a/templates +++ b/templates @@ -1 +1 @@ -Subproject commit bde35ace94b9cc6ef00fcd20b359dc17f0caa464 +Subproject commit 8ef09078369a28fa6f74153ef742e90da67d4004 diff --git a/themes b/themes index e858a96..c656f05 160000 --- a/themes +++ b/themes @@ -1 +1 @@ -Subproject commit e858a96161d13dcaf0d622a50ba1e0d13106f78c +Subproject commit c656f05be249eca9ccb4b927d98e3295fe3fa013 -- cgit v1.2.3 From 468ffa7e6396295047319a1a93ef2c0fd37bf5ce Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 4 Aug 2012 18:50:32 +0200 Subject: Sync with HEAD of submodule themes. --- themes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes b/themes index c656f05..2dde2a6 160000 --- a/themes +++ b/themes @@ -1 +1 @@ -Subproject commit c656f05be249eca9ccb4b927d98e3295fe3fa013 +Subproject commit 2dde2a6d1ab0405c775819934ac1328097ceb3e2 -- cgit v1.2.3 From ccc9976fb7916bce057165c5cbab7c38a8e91945 Mon Sep 17 00:00:00 2001 From: Jonas Smedegaard Date: Sat, 4 Aug 2012 19:21:50 +0200 Subject: Drop IKIWIKI_SHARED_OPTIONS (merge into IKIWIKI_SHARED_DEFAULTS. --- include.mk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/include.mk b/include.mk index e0583e8..bff485a 100644 --- a/include.mk +++ b/include.mk @@ -8,10 +8,9 @@ IKIWIKI_SHARED_DEFAULTS ?= \ --plugin typography \ --set typographyattributes=ie \ --set exclude='^.*\.(rb|scss)$$' \ - -IKIWIKI_SHARED_OPTIONS ?= \ --templatedir '$(CURDIR)/shared/templates' \ --set underlaydirbase='$(CURDIR)/shared' \ --underlaydir '$(CURDIR)/shared/basewiki' \ --libdir '$(CURDIR)/shared/perl' \ --set-yaml add_underlays='- $(CURDIR)/styling' \ + -- cgit v1.2.3