You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2021/06/27 20:49:22 UTC

[wicket-site] branch asf-site updated (dc7ac3d -> c72de49)

This is an automated email from the ASF dual-hosted git repository.

adelbene pushed a change to branch asf-site
in repository https://gitbox.apache.org/repos/asf/wicket-site.git.


    from dc7ac3d  Use .asf.yaml
     new 151c89f  updated 'Built with wicket' json
     new c72de49  Merge branch 'asf-site' of github.com:apache/wicket-site into asf-site

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 content/atom.xml    | 4 ++++
 content/tumblr.json | 2 +-
 tumblr.json         | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

[wicket-site] 02/02: Merge branch 'asf-site' of github.com:apache/wicket-site into asf-site

Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

adelbene pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/wicket-site.git

commit c72de49462f629498cb83424511c9122afe75da8
Merge: 151c89f dc7ac3d
Author: Andrea Del Bene <ad...@apache.org>
AuthorDate: Sun Jun 27 22:49:08 2021 +0200

    Merge branch 'asf-site' of github.com:apache/wicket-site into asf-site

 .asf.yaml                |  3 +++
 content/atom.xml         | 24 ++++++++++++---------
 content/learn/index.html | 48 +++++++-----------------------------------
 learn/index.md           | 54 ++++++++----------------------------------------
 4 files changed, 33 insertions(+), 96 deletions(-)

diff --cc content/atom.xml
index 6d47304,f157816..0c834d7
--- a/content/atom.xml
+++ b/content/atom.xml
@@@ -3,7 -3,7 +3,11 @@@
      <title>Apache Wicket</title>
      <link href="http://wicket.apache.org/atom.xml" rel="self"/>
      <link href="http://wicket.apache.org/"/>
++<<<<<<< HEAD
 +    <updated>2021-06-27T22:41:41+02:00</updated>
++=======
+     <updated>2021-04-19T12:25:00+03:00</updated>
++>>>>>>> dc7ac3db43b90dd9c2e64c1791a90e91fdde8c74
      <id>http://wicket.apache.org/</id>
      <author>
          <name>Apache Wicket</name>

[wicket-site] 01/02: updated 'Built with wicket' json

Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

adelbene pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/wicket-site.git

commit 151c89fa56b2f8ec159218271c15a8590c0972ef
Author: Andrea Del Bene <ad...@apache.org>
AuthorDate: Sun Jun 27 22:42:21 2021 +0200

    updated 'Built with wicket' json
---
 content/atom.xml    | 2 +-
 content/tumblr.json | 2 +-
 tumblr.json         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/content/atom.xml b/content/atom.xml
index 5577fee..6d47304 100644
--- a/content/atom.xml
+++ b/content/atom.xml
@@ -3,7 +3,7 @@
     <title>Apache Wicket</title>
     <link href="http://wicket.apache.org/atom.xml" rel="self"/>
     <link href="http://wicket.apache.org/"/>
-    <updated>2021-04-06T21:51:48+02:00</updated>
+    <updated>2021-06-27T22:41:41+02:00</updated>
     <id>http://wicket.apache.org/</id>
     <author>
         <name>Apache Wicket</name>
diff --git a/content/tumblr.json b/content/tumblr.json
index 90cd6f1..66eb9f8 100644
--- a/content/tumblr.json
+++ b/content/tumblr.json
@@ -1 +1 @@
-{"tumblelog":{"title":"Built with Apache Wicket","description":"Shows and links to web sites and applications built with <a href=\"http:\/\/wicket.apache.org\">Apache Wicket<\/a>","name":"builtwithwicket","timezone":"Europe\/Dublin","cname":false,"feeds":[]},"posts-start":0,"posts-total":138,"posts-type":false,"posts":[{"id":"644377398966730752","url":"https:\/\/builtwithwicket.tumblr.com\/post\/644377398966730752","url-with-slug":"https:\/\/builtwithwicket.tumblr.com\/post\/644377398966 [...]
+{"tumblelog":{"title":"Built with Apache Wicket","description":"Shows and links to web sites and applications built with <a href=\"http:\/\/wicket.apache.org\">Apache Wicket<\/a>","name":"builtwithwicket","timezone":"Europe\/Dublin","cname":false,"feeds":[]},"posts-start":0,"posts-total":139,"posts-type":false,"posts":[{"id":"655177616108732417","url":"https:\/\/builtwithwicket.tumblr.com\/post\/655177616108732417","url-with-slug":"https:\/\/builtwithwicket.tumblr.com\/post\/655177616108 [...]
diff --git a/tumblr.json b/tumblr.json
index 90cd6f1..66eb9f8 100644
--- a/tumblr.json
+++ b/tumblr.json
@@ -1 +1 @@
-{"tumblelog":{"title":"Built with Apache Wicket","description":"Shows and links to web sites and applications built with <a href=\"http:\/\/wicket.apache.org\">Apache Wicket<\/a>","name":"builtwithwicket","timezone":"Europe\/Dublin","cname":false,"feeds":[]},"posts-start":0,"posts-total":138,"posts-type":false,"posts":[{"id":"644377398966730752","url":"https:\/\/builtwithwicket.tumblr.com\/post\/644377398966730752","url-with-slug":"https:\/\/builtwithwicket.tumblr.com\/post\/644377398966 [...]
+{"tumblelog":{"title":"Built with Apache Wicket","description":"Shows and links to web sites and applications built with <a href=\"http:\/\/wicket.apache.org\">Apache Wicket<\/a>","name":"builtwithwicket","timezone":"Europe\/Dublin","cname":false,"feeds":[]},"posts-start":0,"posts-total":139,"posts-type":false,"posts":[{"id":"655177616108732417","url":"https:\/\/builtwithwicket.tumblr.com\/post\/655177616108732417","url-with-slug":"https:\/\/builtwithwicket.tumblr.com\/post\/655177616108 [...]