From 683fd14cc9d1df32259019f705b780a01869247e Mon Sep 17 00:00:00 2001 From: Robert Sim Date: Mon, 6 Apr 2015 11:07:58 +0800 Subject: [PATCH 1/4] Connect: Added more details to Facebook section. Reworded the news organisation part to be more friendly and to alert us for new articles. Membership: Added minor detail on the locker nametags. --- contents/connect/_index/main.markdown | 12 +++++++++++- contents/membership/_index/main.markdown | 2 +- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/contents/connect/_index/main.markdown b/contents/connect/_index/main.markdown index 7adbe4a0..a0dd6089 100644 --- a/contents/connect/_index/main.markdown +++ b/contents/connect/_index/main.markdown @@ -11,8 +11,18 @@ be a paid member of HSG. This is the best way to contact the HSG community. # Facebook +## Facebook page + +For periodic annoucements and event photos. + +## Facebook group + + + +An alternative discussion forum for hackers who are more inclined to be on Facebook. The group is opened to public to join. Do note that the group has a moderation policy, mainly to keep spam and offensive/unsuitable posts/comments away. + # Google+ @@ -21,7 +31,7 @@ be a paid member of HSG. This is the best way to contact the HSG community. View Archives -If you are a news organization, please don't bother asking for permission to use pictures of the space -- between Fair Use and Creative Commons, you probably already have the rights that you're looking for. +If you are a news organisation, permission is granted under either Fair Use or [Creative Commons](http://creativecommons.org/licenses/) to be used in your articles, wherever it is applicable. All we ask for is an [email](#email-hsg), alerting us to the articles you have published. # Youtube diff --git a/contents/membership/_index/main.markdown b/contents/membership/_index/main.markdown index c3c3a562..afc8ce79 100644 --- a/contents/membership/_index/main.markdown +++ b/contents/membership/_index/main.markdown @@ -84,7 +84,7 @@ Please clear all personal belongings from your desk when you leave Hackerspace f ### Locker Rental -Hackerspace.SG offers three sizes of lockers for rental to members. Big lockers are $15 per month, small lockers are $10 per month, and tiny lockers are $6 per month. Please email for more details. +Hackerspace.SG offers three sizes of lockers for rental to members. Big lockers are $15 per month, small lockers are $10 per month, and tiny lockers are $6 per month. Occupied lockers are tagged with member's name. Please email for more details. ### Disclaimer of Responsibility From d1e2ff6a921026b5ce54c4d7c704599e523897e5 Mon Sep 17 00:00:00 2001 From: Robert Sim Date: Mon, 6 Apr 2015 17:53:37 +0800 Subject: [PATCH 2/4] Edits based on feedback from the others. --- contents/connect/_index/main.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents/connect/_index/main.markdown b/contents/connect/_index/main.markdown index a0dd6089..0d33cc9d 100644 --- a/contents/connect/_index/main.markdown +++ b/contents/connect/_index/main.markdown @@ -31,7 +31,7 @@ An alternative discussion forum for hackers who are more inclined to be on Faceb View Archives -If you are a news organisation, permission is granted under either Fair Use or [Creative Commons](http://creativecommons.org/licenses/) to be used in your articles, wherever it is applicable. All we ask for is an [email](#email-hsg), alerting us to the articles you have published. +Photos uploaded on Flickr might not be owned by HackerspaceSG. If you are a news organisation, there is a [Set Of Principles In Fair Use For Journalism](http://www.cmsimpact.org/journalism) for your consideration in deciding which materials to use. An [email](#email-hsg) alerting us to your articles would be nice, but is not mandatory. # Youtube From c043ccfe7d6d3abccfd930c9c46edc63b57ec6b6 Mon Sep 17 00:00:00 2001 From: Robert Sim Date: Mon, 9 Mar 2020 09:36:04 +0800 Subject: [PATCH 3/4] fix conflicts --- contents/connect/_index/main.markdown | 9 +-------- contents/membership/_index/main.markdown | 4 ---- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/contents/connect/_index/main.markdown b/contents/connect/_index/main.markdown index ee337885..cb5b2428 100644 --- a/contents/connect/_index/main.markdown +++ b/contents/connect/_index/main.markdown @@ -11,13 +11,9 @@ be a paid member of HSG. This is the best way to contact the HSG community. # Facebook -<<<<<<< HEAD ## Facebook page -======= -
->>>>>>> 05c4ffcb723b0bbe409ed03fee50305601ca7e53 For periodic annoucements and event photos. @@ -35,11 +31,8 @@ An alternative discussion forum for hackers who are more inclined to be on Faceb View Archives -<<<<<<< HEAD Photos uploaded on Flickr might not be owned by HackerspaceSG. If you are a news organisation, there is a [Set Of Principles In Fair Use For Journalism](http://www.cmsimpact.org/journalism) for your consideration in deciding which materials to use. An [email](#email-hsg) alerting us to your articles would be nice, but is not mandatory. -======= -If you are a news organization, please don't bother asking for permission to use pictures of the space. -- License is as indicated on the respective photo's page. ->>>>>>> 05c4ffcb723b0bbe409ed03fee50305601ca7e53 + # Youtube diff --git a/contents/membership/_index/main.markdown b/contents/membership/_index/main.markdown index 782576ba..d3008e69 100644 --- a/contents/membership/_index/main.markdown +++ b/contents/membership/_index/main.markdown @@ -133,11 +133,7 @@ Address rental for members' companies are at SGD 10 per month. Please email -<<<<<<< HEAD Hackerspace.SG offers three sizes of lockers for rental to members. Big lockers are $15 per month, small lockers are $10 per month, and tiny lockers are $6 per month. Occupied lockers are tagged with member's name. Please email for more details. -======= -___ ->>>>>>> 05c4ffcb723b0bbe409ed03fee50305601ca7e53 ### Disclaimer of Responsibility From d913176eb30db09f0b30bd32a869992b275447f6 Mon Sep 17 00:00:00 2001 From: Robert Sim Date: Mon, 9 Mar 2020 09:39:00 +0800 Subject: [PATCH 4/4] merge content on membership page --- contents/membership/_index/main.markdown | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/contents/membership/_index/main.markdown b/contents/membership/_index/main.markdown index d3008e69..a554a00b 100644 --- a/contents/membership/_index/main.markdown +++ b/contents/membership/_index/main.markdown @@ -113,9 +113,11 @@ ___ ### Membership Addons -HackerspaceSG offers three sizes of lockers for rental to members. Big lockers (42cm) are SGD15 per month, small lockers (28cm) are SGD10 per month, and tiny lockers (21cm) are SGD7.50 per month. +HackerspaceSG offers three sizes of lockers for rental to members. Big lockers (42cm) are SGD15 per month, small lockers (28cm) are SGD10 per month, and tiny lockers (21cm) are SGD7.50 per month. Occupied lockers are tagged with member's name. -Address rental for members' companies are at SGD 10 per month. Please email for more details. +Address rental for members' companies are at SGD 10 per month. + +Please email for more details on the availability of the addons.
@@ -133,8 +135,6 @@ Address rental for members' companies are at SGD 10 per month. Please email -Hackerspace.SG offers three sizes of lockers for rental to members. Big lockers are $15 per month, small lockers are $10 per month, and tiny lockers are $6 per month. Occupied lockers are tagged with member's name. Please email for more details. - ### Disclaimer of Responsibility HackerspaceSG will not be held responsible for any loss or damage of personal belongings.