Skip to content

Commit

Permalink
merge content
Browse files Browse the repository at this point in the history
  • Loading branch information
MuhammadAhsan252 committed Dec 11, 2024
2 parents 1f3bee9 + 85f6fec commit 6ba1374
Show file tree
Hide file tree
Showing 91 changed files with 747 additions and 649 deletions.
12 changes: 7 additions & 5 deletions _about_pages/board-directors.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ layout: page
title: The CalConnect Board of Directors
type: about
---
:page-liquid:

== The CalConnect Board of Directors

_As of November 2022_
Expand All @@ -25,15 +27,15 @@ the future.
|===
a|
.Gershon Janssen
image:/assets/images/Gershon%20Janssen_0.jpg[width=100,height=129]
image:{{'/assets/images/Gershon%20Janssen_0.jpg' | relative_url }}[width=100,height=129]

|*President, Chief Financial Officer, Director* +
Gershon Janssen +
Term: July 2019 - July 2022

a|
.Ronald Tse
image:/assets/images/Ronald%20Tse.jpg[width=100,height=100]
image:{{'/assets/images/Ronald%20Tse.jpg' | relative_url }}[width=100,height=100]

|*Vice President, Director of External Relationships* +
Ronald Tse +
Expand All @@ -42,7 +44,7 @@ Term: July 2020 - July 2023

a|
.Rutger Geelen
image:/assets/images/rutgergeelen_0.png[Rutger Geelen,width=100,height=101]
image:{{'/assets/images/rutgergeelen_0.png' | relative_url }}[Rutger Geelen,width=100,height=101]

|*Chair of the Board of Directors, Director* +
Rutger Geelen +
Expand All @@ -51,7 +53,7 @@ Term: July 2020 - July 2023

a|
.Ken Murchison
image:/assets/images/Ken%20Murchison.jpg[width=100,height=128]
image:{{'/assets/images/Ken%20Murchison.jpg' | relative_url }}[width=100,height=128]

|*Chair of the Technical Coordination Committee* +
Kenneth Murchison +
Expand All @@ -60,7 +62,7 @@ Term: June 2019 - June 2022

a|
.Michael Douglass
image:/assets/images/Douglass.jpg[width=100,height=133]
image:{{'/assets/images/Douglass.jpg' | relative_url }}[width=100,height=133]

a|
*_Technical Architect_* +
Expand Down
4 changes: 3 additions & 1 deletion _about_pages/closed-tcs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ title: Closed technical committees
type: about
permalink: about/technical-committees/closed-tcs
---
:page-liquid:

= Closed Technical Committees

_As of October 2015_
Expand All @@ -18,7 +20,7 @@ disbanded either because they completed their charter and scope of work, or
because their work was subsumed into another committee or process.

Information about currently active Technical Committees may be found at
link:/about/technical-committees[Active Technical Committees].
link:{{'/about/technical-committees' | relative_url}}[Active Technical Committees].


== CALSCALE Ad Hoc
Expand Down
2 changes: 2 additions & 0 deletions _about_pages/copyright-and-licensing.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ title: Copyright and Licensing for Published Material
type: about
permalink: /about/policies/copyright-and-licensing
---
:page-liquid:

= Copyright and Licensing for Published Material

_As of June 2019_
Expand Down
21 changes: 11 additions & 10 deletions _about_pages/definitions.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ layout: page
title: Definitions of CalConnect Terms
type: about
---

:page-liquid:
= Definitions of CalConnect Terms

This is a short list of definitions of terms used throughout this
Expand All @@ -21,11 +21,12 @@ formed in non-technical areas.
[#BoD]
== Board of Directors

The link:/about/board-directors[Board of Directors] consists of up to
seven elected Directors which may be but need not be representatives of
CalConnect Members. The Board is responsible for the governance of The
Calendaring and Scheduling Consortium, Inc. (that is, the corporation
itself) in accordance with the http://calconnect.org/bylaws.pdf[Bylaws].
The link:{{'/about/board-directors' | relative_url }}[Board of Directors]
consists of up to seven elected Directors which may be but need not be
representatives of CalConnect Members. The Board is responsible for the
governance of The Calendaring and Scheduling Consortium, Inc. (that is, the
corporation itself) in accordance with the
link:{{'/docs/bylaws.pdf' | relative_url}}[Bylaws].

[#BOF]
== BOF
Expand Down Expand Up @@ -61,7 +62,7 @@ CalConnect Conferences are where link:#PC[Provisional Committees] report on
their findings and where link:#TC[Technical Committees] report on their work,
hold discussions and resolve outstanding issues. Conferences also provide an
opportunity to foster new work and ideas through BOFs and Workshops, and a
general plenary session. See link:/conferences[CalConnect Conferences] for more
general plenary session. See link:{{'/conferences' | relative_url }}[CalConnect Conferences] for more
information.

[#Consortium]
Expand All @@ -82,7 +83,7 @@ opportunities once again.

== Member

A link:/membership[Member] of CalConnect is normally an organization
A link:{{'/membership' | relative_url }}[Member] of CalConnect is normally an organization
(e.g. vendor, company, governmental organization, academic institution)
except in the case of an Individual Member. Member Representatives are
individuals from a member who represent their organization in CalConnect
Expand All @@ -92,7 +93,7 @@ the member when necessary.

== Observer

An link:/events/events-activities/observers[Observer] is an individual
An link:{{'/events/events-activities/observers' | relative_url }}[Observer] is an individual
from a non-member who is attending a link:#Conference[CalConnect
Conference] to determine whether or not his or her organization should
become a link:#Member[member]. An organization may send one or more
Expand All @@ -116,7 +117,7 @@ Obsolete name for a link:#Conference[CalConnect Conference].

== Technical Committee (TC)

link:/about/technical-committees[Technical Committees] are the
link:{{'/about/technical-committees' | relative_url }}[Technical Committees] are the
technical working groups of CalConnect. A Technical Committee is
established with a specific charter (scope of work), time frame,
deliverables and expected schedule, and is intended to disband when its
Expand Down
3 changes: 2 additions & 1 deletion _about_pages/history.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ layout: page
title: History
type: about
---
:page-liquid:
= History

link:/docs/CC32%20A%20History%20of%20CalConnect.pdf[An Anecdotal History of CalConnect: CalConnect 10th Annivesary (PDF)] +
link:{{'/docs/CC32%20A%20History%20of%20CalConnect.pdf' | relative_url }}[An Anecdotal History of CalConnect: CalConnect 10th Annivesary (PDF)] +
Dave Thewlis, January 28, 2015
8 changes: 5 additions & 3 deletions _about_pages/liaisons-and-relationships.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ layout: page
title: Liaisons and Relationships
type: about
---
:page-liquid:

= Liaisons and Relationships

_As of June 2021_
Expand All @@ -21,9 +23,9 @@ President of CalConnect.
[cols="1,1,1", options="header"]
|===

| https://www.iso.org/[image:/assets/images/iso-logo-rt.gif[ISO Logo]]
| https://www.m3aawg.org/[image:/assets/images/M3AAWG-vert-highrez-300-res.png[M3AAWG Logo]]
| https://www.oasis-open.org/[image:/assets/images/oasis-logo.png[Oasis Logo]]
| https://www.iso.org/[image:{{'/assets/images/iso-logo-rt.gif' | relative_url }}[ISO Logo]]
| https://www.m3aawg.org/[image:{{'/assets/images/M3AAWG-vert-highrez-300-res.png' | relative_url }}[M3AAWG Logo]]
| https://www.oasis-open.org/[image:{{'/assets/images/oasis-logo.png' | relative_url }}[Oasis Logo]]
|===

== Internet Engineering Task Force (IETF)
Expand Down
2 changes: 1 addition & 1 deletion _about_pages/major-work-projects.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ happen:*
<div id="work-projects">
{% assign projects = site.about_pages | where_exp: "page", "page.path contains '/projects/'" %}
{% for project in projects %}
<a href="{{ project.url }}">
<a href="{{ project.url | relative_url }}">
<h3>{{ project.title }}</h3>
</a>
{% endfor %}
Expand Down
8 changes: 4 additions & 4 deletions _about_pages/policies-and-procedures.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title: Policies and Procedures
type: about
permalink: /about/policies/policies-and-procedures
---

:page-liquid:
== Policies and Procedures

The following Policies and Recommendations have been adopted by The
Expand Down Expand Up @@ -158,15 +158,15 @@ _May 2005_
[#0506]
=== 0506 Membership Agreement

The Membership Agreement may be viewed at
http://calconnect.org/mbragreement[Membership Agreement].
The Membership Agreement may be viewed at link:{{'/membership/membership-agreement' | relative_url }}[Membership Agreement].


_May 2005_

[#0507]
=== 0507 Code of Conduct

The Code of Conduct may be viewed at link:/conduct[Code of Conduct].
The Code of Conduct may be viewed at link:{{'/membership/code-conduct' | relative_url }}[Code of Conduct].

_May 2005_

Expand Down
17 changes: 9 additions & 8 deletions _about_pages/policies.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,52 +3,53 @@ layout: page
title: Policies and Related Materials
type: about
---
:page-liquid:
= Policies and related materials

== Articles of incorporation

Details: link:/docs/incorporation.pdf[Articles of Incorporation]
Details: link:{{'/docs/incorporation.pdf' | relative_url }}[Articles of Incorporation]

The Articles of Incorporation of The Calendaring and Scheduling Consortium, incorporated in the State of California on 1 January 2004 as a California Nonprofit Mutual Benefit Corporation. The Consortium is a registered 501(c)6 Nonprofit Tax-exempt organization. CalConnect^SM^ is a Service Mark of the Consortium.

== Bylaws

Details: link:/docs/TCSC%20Bylaws%20Revision%209%202020-02-21.pdf[Bylaws]
Details: link:{{'/docs/TCSC%20Bylaws%20Revision%209%202020-02-21.pdf' | relative_url }}[Bylaws]

The Bylaws of The Calendaring and Scheduling Consortium, adopted February 27, 2004; amended May 16, 2005, April 4, 2008, July 25, 2008, July 9, 2010, April 11, 2014, August 8, 2014, April 14, 2017, November 15, 2019, and February 21, 2020.

== Intellectual property rights policy

Details: link:policies/ipr-policy[Intellectual Property Rights Policy]
Details: link:{{'/about/policies/ipr-policy' | relative_url }}[Intellectual Property Rights Policy]

Intellectual Property Rights policy.

== Copyright and licensing

Details: link:/about/policies/copyright-licensing[Copyright and Licensing Information]
Details: link:{{'/about/policies/copyright-licensing' | relative_url }}[Copyright and Licensing Information]

Copyright and Licensing Information for Published Material.

== Policies and procedures

Details: link:policies/policies-and-procedures[Policies, Procedures and Recommendations]
Details: link:{{'/about/policies/policies-and-procedures' | relative_url}}[Policies, Procedures and Recommendations]

Policies, Procedures and Recommendations.

== Membership agreement

Details: link:/membership/membership-agreement[Membership Agreement]
Details: link:{{'/membership/membership-agreement' | relative_url }}[Membership Agreement]

The Membership Agreement of CalConnect. Prospective members must agree to comply with the Membership Agreement as a prerequisite to joining the Consortium.

== Code of conduct

Details: link:/membership/code-conduct[Code of Conduct]
Details: link:{{'/membership/code-conduct' | relative_url }}[Code of Conduct]

The Code of Conduct for member representatives (individuals representing members of the Consortium while engaged in Consortium activities). This code also governs observers (see below) at a CalConnect event.

== Observers at CalConnect events

Details: link:/events/events-activities/observers[Observers at CalConnect Events]
Details: link:{{'/events/events-activities/observers' | relative_url }}[Observers at CalConnect Events]

The rules which govern observing a CalConnect Conference. Non-members may send one or more representatives as observers to a single Conference to evaluate the Consortium.
6 changes: 3 additions & 3 deletions _about_pages/projects/abstract-calendaring-api.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title: Abstract Calendaring API
type: about
permalink: /about/major-work-projects/:title
---

:page-liquid:
== Abstract Calendaring API

We need a full "CRUD" (Create/Read/Update/Delete) Abstract Application
Expand All @@ -15,7 +15,7 @@ An Abstract Calendaring API from which fully compliant interfaces can be
created will enable "Calendaring as a Platform" -- that is, any process
running on a system can use the API to perform calendar and scheduling
operations against any calendaring and scheduling implementation running
on that system. link:/tc-api[TC API].
on that system. link:{{'/tc-api' | relative_url }}[TC API].

Details: link:/7_things_api[*Abstract Calendaring API*]
Details: link:{{'/7_things_api' | relative_url }}[*Abstract Calendaring API*]

3 changes: 2 additions & 1 deletion _about_pages/projects/autodiscovery.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ title: Autodiscovery
type: about
permalink: /about/major-work-projects/:title
---
:page-liquid:

== Autodiscovery

Expand All @@ -19,4 +20,4 @@ automatically discover and set up internet standards-based services such
as e-mail, calendaring, address book, etc. which can be implemented in a
single, easy to use user interface.

Details: link:/tc-autodiscovery[TC AUTODISCOVERY]
Details: link:{{'/tc-autodiscovery' | relative_url }}[TC AUTODISCOVERY]
4 changes: 2 additions & 2 deletions _about_pages/projects/caldav-alarms.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title: CalDAV Alarms
type: about
permalink: /about/major-work-projects/:title
---

:page-liquid:
== CalDAV Alarms

"Extend alarm support to allow for cross-device dismissal, proximity triggers
Expand All @@ -16,4 +16,4 @@ standard calendar service protocol) will allow for effective user
management of alarms, including choosing which device(s) should enable
each alarm, and the form of the alarm.

Details: link:/tc-caldav[TC CALDAV]
Details: link:{{'/tc-caldav' | relative_url }}[TC CALDAV]
4 changes: 2 additions & 2 deletions _about_pages/projects/caldav-attachments.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title: CalDAV Attachments
type: about
permalink: /about/major-work-projects/:title
---

:page-liquid:
== CalDAV Attachments

"Extend the calendaring server to manage attachments"
Expand All @@ -16,4 +16,4 @@ server. Beyond the basic storage aspect, the server also becomes
responsible for ensuring that only attendees of a meeting have access to
those attachments.

Details: link:/tc-caldav[TC CALDAV]
Details: link:{{'/tc-caldav' | relative_url }}[TC CALDAV]
6 changes: 3 additions & 3 deletions _about_pages/projects/calendars-and-contacts-sharing.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ title: Calendars and Contacts Sharing
type: about
permalink: /about/major-work-projects/:title
---

:page-liquid:
== Calendars and Contacts Sharing

"Sharing calendars and contacts between users, on the same system or across
systems"

link:/tc-sharing[TC SHARING] is working on sharing calendars anc
link:{{'/tc-sharing' | relative_url }}[TC SHARING] is working on sharing calendars anc
contacts between users on a CalDAV and/or CardDAV system by
rationalizing and extending current informal specifications.

link:/tc-fsc[TC FSC] (Federated Shared Calendars) is working on
link:{{'/tc-fsc' | relative_url }}[TC FSC] (Federated Shared Calendars) is working on
sharing calendars and hopefully contacts across calendaring system, e.g
being able to share between multiple systems such as iCloud, Google
Calendar, Yahoo!, AOL, and so forth.
4 changes: 2 additions & 2 deletions _about_pages/projects/calws-rest-and-calws-soap.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title: CalWS-REST and CalWS-SOAP
type: about
permalink: /about/major-work-projects/:title
---

:page-liquid:
== CalWS-REST and CalWS-SOAP

"We need to (finally) provide platform and system-independent calendaring and
Expand All @@ -18,4 +18,4 @@ system-independent API for calendaring operations. CalWS-REST and
CalS-SOAP provide both RESTful and SOAPy web service implementations of
this API. The work is being done in partnership with OASIS.

Details: link:/about/projects/oasis-ws-calendar[OASIS WS-Calendar]
Details: link:{{'/about/projects/oasis-ws-calendar' | relative_url }}[OASIS WS-Calendar]
5 changes: 3 additions & 2 deletions _about_pages/projects/consensus-scheduling.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ title: Consensus Scheduling (VPOLL)
type: about
permalink: /about/major-work-projects/:title
---
:page-liquid:

== Consensus Scheduling (VPOLL)

Expand All @@ -17,6 +18,6 @@ been implemented by several vendors in their own systems but should be
available and interoperable within mainstream scheduling. VPOLL is an
additional iCalendar and iTIP component designed to allow the
implementation of consensus scheduling with any system and client.
link:/tc-freebusy[TC FREEBUSY].
link:{{'/tc-freebusy' | relative_url }}[TC FREEBUSY].

Details: link:/7_things_consensus_scheduling[*Consensus Scheduling (VPOLL)*]
Details: link:{{'/7_things_consensus_scheduling' | relative_url }}[*Consensus Scheduling (VPOLL)*]
Loading

0 comments on commit 6ba1374

Please sign in to comment.