Commit Graph

31 Commits

Author SHA1 Message Date
Jenny Wong 1604893c31 Merge branch 'master' of /users/j3parker/www
Conflicts:
	.htaccess
	srv/About/Constitution/index.md
2012-02-24 16:49:41 -05:00
Jacob Parker d0a579ab51 Merge branch 'master' of ../www.fuck
Conflicts:
	.gitignore
	src/config.d.sample
2012-02-24 16:35:34 -05:00
Jacob Parker 19d617e864 Merge branch 'master' of github.com:j3parker/dweb 2012-02-24 16:32:55 -05:00
Jacob Parker 3cd017ce68 fixed stomping of sample config.d 2012-02-24 16:32:28 -05:00
Jenny Wong 58b10d477e Merge branch 'master' of https://github.com/j3parker/dweb
Conflicts:
	.htaccess
2012-02-24 16:16:16 -05:00
Jennifer Yeelam Wong d460117641 markdowned constitution 2012-02-24 13:50:04 -05:00
Jacob Parker 2f0973c0ff Merge pull request #2 from jeremyroman/master
Allow building from outside src/.
2012-02-23 17:48:37 -08:00
Jeremy Roman 0d4efc8b77 allow building from outside src/ 2012-02-23 20:20:48 -05:00
Jacob Parker d7e8c1f824 Merge branch 'master' of github.com:j3parker/dweb
Conflicts:
	.htaccess
	src/web.d
2012-02-23 14:57:57 -05:00
Jacob Parker 783081d030 Merge pull request #1 from luqmana/master
404 Error Index Fix + Set git to ignore .htaccess and config.d
2012-02-23 10:17:45 -08:00
Jacob Parker b4af704877 Merge /users/jy2wong/www/rofl/dweb
Conflicts:
	.gitignore
	.htaccess
	pub/style/style.css
	src/web.d
2012-02-23 02:40:45 -05:00
Jennifer Yeelam Wong 355a123c93 Merge branch 'master' of https://github.com/j3parker/dweb
Conflicts:
	pub/style/style.css
2012-02-23 02:36:05 -05:00
Jennifer Yeelam Wong b1f4c544ff CSC CSS fiddlings. Vertically aligned the logo, removed h2 top margins 2012-02-23 02:21:18 -05:00
Luqman Aden 8fe3797d07 Fixed 404 error on index pages. Also changed to REQUEST_URI instead of SCRIPT_URL. 2012-02-23 02:08:21 -05:00
Luqman Aden c71bd3a81d Added readme. .htaccess and config.d are also now ignored in git instead samples are provided to be copied over and modified. 2012-02-23 01:46:22 -05:00
Jacob Parker c47065a4de made the changelog page prettier. 2012-02-23 01:07:51 -05:00
Jacob Parker 9ab747e426 added a link to past exec on the exec page 2012-02-23 01:02:59 -05:00
Jacob Parker 65006caa46 removed a redundant thing in .htaccess 2012-02-23 00:46:48 -05:00
Jacob Parker a4948f0c2f ported more generalized handler stuff from csc fork 2012-02-23 00:43:04 -05:00
Jacob Parker fd2fefc649 tidying some stuff up, added elections page 2012-02-23 00:21:50 -05:00
Jacob Parker a2173321ff ported more generalized handler stuff from csc fork 2012-02-22 22:43:07 -05:00
Jacob Parker c49e0d942a made a simple member profile thing 2012-02-22 21:03:22 -05:00
Jacob Parker 075fc075c2 unstomped the logo and the headerbar 2012-02-22 19:36:39 -05:00
Jacob Parker 852eca73df Got jy2wong's content, added folder handlers, started some dynamic member page content stuff 2012-02-22 19:17:10 -05:00
Jacob Parker 1d5c58560d remove merges from changelog on website, unclobber config.d 2012-02-22 17:21:51 -05:00
Jacob Parker 4068e64a47 Merge branch 'master' of /users/j3parker/www
Conflicts:
	pub/style/style.css
2012-02-22 17:14:55 -05:00
Jacob Parker bc80d67ca1 dweb 0.5: handlers, fixes, tidying. 2012-02-22 17:11:10 -05:00
Jennifer Yeelam Wong c42e867508 CSC CSS v1 and white logo 2012-02-21 22:09:04 -05:00
Jacob Parker 543c9133e2 dweb 0.3: can wrap the site in a container now. 2012-02-21 14:52:58 -05:00
Jacob Parker 45c0e50ab5 dweb v0.2: horizontal side bar configuration, optional chevrons (the bloat begins.) 2012-02-19 16:46:22 -05:00
Jacob Parker c3c1116e5f dweb v0.1 2012-02-19 10:33:49 -05:00