Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Content modifications #119

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Content modifications #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
683fd14
Connect:
Apr 6, 2015
d1e2ff6
Edits based on feedback from the others.
Apr 6, 2015
f6abca9
Merge branch 'master' of https://github.com/hackerspacesg/hackerspace.sg
robertsky Mar 8, 2020
15272a5
Merge remote-tracking branch 'hackerspace-main/master'
robertsky Mar 9, 2020
c043ccf
fix conflicts
robertsky Mar 9, 2020
d913176
merge content on membership page
robertsky Mar 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions contents/connect/_index/main.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,17 @@ be a paid member of HSG. This is the best way to contact the HSG community.

# Facebook

<https://www.facebook.com/hackerspacesg><br/> <https://www.facebook.com/groups/hackerspacesg/>
## Facebook page

<https://www.facebook.com/hackerspacesg>

For periodic annoucements and event photos.

## Facebook group

<https://www.facebook.com/groups/hackerspacesg>

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+

Expand All @@ -21,7 +31,8 @@ be a paid member of HSG. This is the best way to contact the HSG community.

<a href="https://www.flickr.com/search/?text=hackerspacesg%20OR%20hackersapce.sg&sort=date-posted-desc">View Archives</a>

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.
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

Expand Down
8 changes: 4 additions & 4 deletions contents/membership/_index/main.markdown
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]> for more details.
Address rental for members' companies are at SGD 10 per month.

Please email <[email protected]> for more details on the availability of the addons.

<form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top" style="padding-left: 45px; padding-bottom: 15px;">
<input type="hidden" name="cmd" value="_s-xclick">
Expand All @@ -133,8 +135,6 @@ Address rental for members' companies are at SGD 10 per month. Please email <mem
<img alt="" border="0" src="https://www.paypalobjects.com/en_GB/i/scr/pixel.gif" width="1" height="1">
</form>

___

### Disclaimer of Responsibility

HackerspaceSG will not be held responsible for any loss or damage of personal belongings.
Expand Down