Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
c1d00fe
Lost in git space.
RiaanBurger Sep 7, 2014
2868d86
Merge pull request #8 from RiaanBurger/jekyll
RiaanBurger Sep 7, 2014
0683925
Lost in git space: may be putting Jekyll in it's right branch.
RiaanBurger Sep 9, 2014
e422653
Lost in gitspace, but I may see the light...
RiaanBurger Sep 10, 2014
6689796
Updated Node.js module versions.
RiaanBurger Sep 10, 2014
d18137b
Becoming sane again.
RiaanBurger Sep 10, 2014
3ddb08a
Merge pull request #9 from RiaanBurger/jekyll
RiaanBurger Sep 10, 2014
2aa2f37
Added CNAME back.
RiaanBurger Sep 10, 2014
bd3b14f
Merge pull request #10 from RiaanBurger/jekyll
RiaanBurger Sep 10, 2014
c154983
Updated baseurl
RiaanBurger Sep 11, 2014
0a3c464
Merge pull request #12 from RiaanBurger/jekyll
RiaanBurger Sep 11, 2014
41a7796
Cleaning up.
RiaanBurger Sep 11, 2014
b0058b7
Merge pull request #14 from RiaanBurger/jekyll
RiaanBurger Sep 11, 2014
be30295
Just removed deploy comment.
RiaanBurger Sep 11, 2014
faf02d9
Fixed spelling mistake.
RiaanBurger Oct 5, 2014
4cdc35f
Merge pull request #16 from RiaanBurger/jekyll
RiaanBurger Oct 5, 2014
8eb5570
Data updates
RiaanBurger Oct 10, 2014
06cd2fa
Merge pull request #18 from RiaanBurger/jekyll
RiaanBurger Oct 10, 2014
8c60f1a
Added MailChimp to home page.
RiaanBurger Oct 10, 2014
c48feec
Merge pull request #21 from RiaanBurger/jekyll
RiaanBurger Oct 10, 2014
3c6ff1a
Added Leenx membership.
RiaanBurger Oct 14, 2014
846acfe
Merge pull request #24 from RiaanBurger/jekyll
RiaanBurger Oct 14, 2014
efd397c
New site with Bootstrap.
RiaanBurger Nov 29, 2014
f85ed65
Working on gulp deploy
RiaanBurger Nov 29, 2014
bb2ffe4
Working on gulp deploy
RiaanBurger Nov 29, 2014
f4b8983
Working on gulp deploy
RiaanBurger Nov 29, 2014
956ea72
Merge branch 'jekyll' of github.com:DrupalAssociationSA/DrupalAssocia…
RiaanBurger Nov 29, 2014
43acd60
Working on gulp deploy
RiaanBurger Nov 29, 2014
d576b80
Working on gulp deploy
RiaanBurger Nov 29, 2014
dde94e1
Working on gulp deploy
RiaanBurger Nov 29, 2014
a3d05ed
Primary work on JHBCamp2015 complete.
RiaanBurger Feb 8, 2015
8914545
Added membership badges.
RiaanBurger Feb 9, 2015
b88f79e
Added Amazee Labs logo.
RiaanBurger Feb 9, 2015
7eb3e68
Added new badges for membership to site.
RiaanBurger Feb 9, 2015
fb19f5b
Added Amazee Labs as a sponsor.
RiaanBurger Feb 9, 2015
f321e06
Removed deploy cache.
RiaanBurger Feb 9, 2015
c4376b3
Ignoring deploy cache from now on.
RiaanBurger Feb 9, 2015
db5afd9
Fixed Amazee logo for IE.
RiaanBurger Feb 13, 2015
b3ccd0a
Continued work on JHBCamp
RiaanBurger Mar 23, 2015
181b19f
Updated site, hid data, cleaned it up.
RiaanBurger Jun 1, 2015
3b4b3b0
New member, Renatre, renewal, Riaan.
RiaanBurger Oct 2, 2015
7af9f07
Added Adam renewel membership.
RiaanBurger Oct 2, 2015
f0de4c2
Closing DASA.
RiaanBurger Nov 27, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "app/bower_components"
}
29 changes: 29 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"env": {
"browser": true
},
"globals": {
"$": true,
"domready": true
},
"rules": {
"eqeqeq": [2, "smart"],
"guard-for-in": 2,
"no-mixed-spaces-and-tabs": 2,
"no-trailing-spaces": 2,
"no-undef": 2,
"no-console": 0,
"no-unused-vars": [2, {"vars": "local", "args": "none"}],
"strict": 2,
"new-cap": 0,
"quotes": [2, "single", "avoid-escape"],
"camelcase": 0,
"no-underscore-dangle": 0,
"no-new": 0,
"no-alert": 0,
"no-use-before-define": 2,
"consistent-return": 0,
"no-constant-condition": 0,
"global-strict": [2, "always"]
}
}
29 changes: 29 additions & 0 deletions .eslintrc_node
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"env": {
"node": true
},
"globals": {
"$": true,
"domready": true
},
"rules": {
"eqeqeq": [2, "smart"],
"guard-for-in": 2,
"no-mixed-spaces-and-tabs": 2,
"no-trailing-spaces": 2,
"no-undef": 2,
"no-console": 0,
"no-unused-vars": [2, {"vars": "local", "args": "none"}],
"strict": 2,
"new-cap": 0,
"quotes": [2, "single", "avoid-escape"],
"camelcase": 0,
"no-underscore-dangle": 0,
"no-new": 0,
"no-alert": 0,
"no-use-before-define": 2,
"consistent-return": 0,
"no-constant-condition": 0,
"global-strict": [2, "always"]
}
}
13 changes: 13 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
################################################################################
# ______ #
# // ) ) #
# //___/ / __ __ ___ __ ___ __ ( ) #
# / __ ( // / / // ) ) / / // ) ) // ) ) // ) ) / / \\ / / #
# // ) ) // / / // / / // // / / // / / / / \/ / #
# //____/ / ((___( ( // / / // ((___/ / // / / / / / /\ #
# #
################################################################################

* text=auto

################################################################################
52 changes: 52 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
################################################################################
# ______ #
# // ) ) #
# //___/ / __ __ ___ __ ___ __ ( ) #
# / __ ( // / / // ) ) / / // ) ) // ) ) // ) ) / / \\ / / #
# // ) ) // / / // / / // // / / // / / / / \/ / #
# //____/ / ((___( ( // / / // ((___/ / // / / / / / /\ #
# #
################################################################################

##### Always Ignore ############################################################

*.diff
*.err
*.log
*.orig
*.rej
*.swn
*.swo
*.swp
._*
*~

##### OS Generated #############################################################

.DS_Store*
ehthumbs.db
Icon?
Thumbs.db

##### Archives and Packages ####################################################

*.7z
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip

##### Project ##################################################################

app/_bower_components
deploy
node_modules
serve
.sass-cache
.tmp
.deploy-cache

################################################################################
59 changes: 0 additions & 59 deletions 404.html

This file was deleted.

19 changes: 19 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
################################################################################
# ______ #
# // ) ) #
# //___/ / __ __ ___ __ ___ __ ( ) #
# / __ ( // / / // ) ) / / // ) ) // ) ) // ) ) / / \\ / / #
# // ) ) // / / // / / // // / / // / / / / \/ / #
# //____/ / ((___( ( // / / // ((___/ / // / / / / / /\ #
# #
################################################################################

source "http://rubygems.org"

################################################################################

gem 'jekyll', '~>2.5.2'
gem 'redcarpet', '>=3.2.0'
gem 'compass', '>=1.0.1'

################################################################################
86 changes: 86 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
GEM
remote: http://rubygems.org/
specs:
blankslate (2.1.2.4)
celluloid (0.16.0)
timers (~> 4.0.0)
chunky_png (1.3.3)
classifier-reborn (2.0.2)
fast-stemmer (~> 1.0)
coffee-script (2.3.0)
coffee-script-source
execjs
coffee-script-source (1.8.0)
colorator (0.1)
compass (1.0.1)
chunky_png (~> 1.2)
compass-core (~> 1.0.1)
compass-import-once (~> 1.0.5)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
sass (>= 3.3.13, < 3.5)
compass-core (1.0.1)
multi_json (~> 1.0)
sass (>= 3.3.0, < 3.5)
compass-import-once (1.0.5)
sass (>= 3.2, < 3.5)
execjs (2.2.2)
fast-stemmer (1.0.2)
ffi (1.9.6)
hitimes (1.2.2)
jekyll (2.5.2)
classifier-reborn (~> 2.0)
colorator (~> 0.1)
jekyll-coffeescript (~> 1.0)
jekyll-gist (~> 1.0)
jekyll-paginate (~> 1.0)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 1.1)
kramdown (~> 1.3)
liquid (~> 2.6.1)
mercenary (~> 0.3.3)
pygments.rb (~> 0.6.0)
redcarpet (~> 3.1)
safe_yaml (~> 1.0)
toml (~> 0.1.0)
jekyll-coffeescript (1.0.1)
coffee-script (~> 2.2)
jekyll-gist (1.1.0)
jekyll-paginate (1.1.0)
jekyll-sass-converter (1.2.1)
sass (~> 3.2)
jekyll-watch (1.1.2)
listen (~> 2.7)
kramdown (1.5.0)
liquid (2.6.1)
listen (2.8.2)
celluloid (>= 0.15.2)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
mercenary (0.3.5)
multi_json (1.10.1)
parslet (1.5.0)
blankslate (~> 2.0)
posix-spawn (0.3.9)
pygments.rb (0.6.0)
posix-spawn (~> 0.3.6)
yajl-ruby (~> 1.1.0)
rb-fsevent (0.9.4)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
redcarpet (3.2.0)
safe_yaml (1.0.4)
sass (3.4.8)
timers (4.0.1)
hitimes
toml (0.1.2)
parslet (~> 1.5.0)
yajl-ruby (1.1.0)

PLATFORMS
ruby

DEPENDENCIES
compass (>= 1.0.1)
jekyll (~> 2.5.2)
redcarpet (>= 3.2.0)
1 change: 1 addition & 0 deletions app/CNAME
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dasa.org.za
59 changes: 59 additions & 0 deletions app/bower_components/bootstrap-sass-official/.bower.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"name": "bootstrap-sass",
"version": "3.3.1",
"homepage": "https://github.com/twbs/bootstrap-sass",
"authors": [
"Thomas McDonald",
"Tristan Harward",
"Peter Gumeson",
"Gleb Mazovetskiy"
],
"description": "bootstrap-sass is a Sass-powered version of Bootstrap, ready to drop right into your Sass powered applications.",
"main": [
"assets/stylesheets/_bootstrap.scss",
"assets/fonts/bootstrap/glyphicons-halflings-regular.eot",
"assets/fonts/bootstrap/glyphicons-halflings-regular.svg",
"assets/fonts/bootstrap/glyphicons-halflings-regular.ttf",
"assets/fonts/bootstrap/glyphicons-halflings-regular.woff",
"assets/javascripts/bootstrap/affix.js",
"assets/javascripts/bootstrap/alert.js",
"assets/javascripts/bootstrap/button.js",
"assets/javascripts/bootstrap/carousel.js",
"assets/javascripts/bootstrap/collapse.js",
"assets/javascripts/bootstrap/dropdown.js",
"assets/javascripts/bootstrap/tab.js",
"assets/javascripts/bootstrap/transition.js",
"assets/javascripts/bootstrap/scrollspy.js",
"assets/javascripts/bootstrap/modal.js",
"assets/javascripts/bootstrap/tooltip.js",
"assets/javascripts/bootstrap/popover.js"
],
"keywords": [
"twbs",
"bootstrap",
"sass"
],
"license": "MIT",
"ignore": [
"**/.*",
"lib",
"tasks",
"templates",
"test",
"*.gemspec",
"Rakefile",
"Gemfile"
],
"dependencies": {
"jquery": ">= 1.9.0"
},
"_release": "3.3.1",
"_resolution": {
"type": "version",
"tag": "v3.3.1",
"commit": "cdad0d4b5d17e6bc84863b2907b82d45e856be22"
},
"_source": "git://github.com/twbs/bootstrap-sass.git",
"_target": "~3.3.1",
"_originalSource": "bootstrap-sass-official"
}
Loading