oweals/finalsclub.git
12 years agoRemoved mongodb-2.0.2 from setup.sh
bobcall [Sun, 29 Jan 2012 11:20:17 +0000 (06:20 -0500)]
Removed mongodb-2.0.2 from setup.sh

12 years agoChanged setup.sh to include whole process and start will start the server from home
bobcall [Sun, 29 Jan 2012 10:59:53 +0000 (05:59 -0500)]
Changed setup.sh to include whole process and start will start the server from home

12 years ago Added setup.sh
bobcall [Sun, 29 Jan 2012 10:26:36 +0000 (05:26 -0500)]
 Added setup.sh

12 years agoRevised setup start and stop scripts
bobcall [Sun, 29 Jan 2012 10:26:05 +0000 (05:26 -0500)]
Revised setup start and stop scripts

12 years agoMerge pull request #25 from finalsclubdev/test
Andrew Magliozzi [Sat, 28 Jan 2012 20:18:16 +0000 (12:18 -0800)]
Merge pull request #25 from finalsclubdev/test

test to devel, merge seems to be broken

12 years agoadding jade to requreiments 25/head
Seth Woodworth [Sat, 28 Jan 2012 19:08:29 +0000 (14:08 -0500)]
adding jade to requreiments

12 years agoMerge branch 'devel' of github.com:finalsclubdev/FinalsClub into test
Seth Woodworth [Sat, 28 Jan 2012 18:51:04 +0000 (13:51 -0500)]
Merge branch 'devel' of github.com:finalsclubdev/FinalsClub into test

12 years agochecking in bob's deploy scripts with comments
Seth Woodworth [Sat, 28 Jan 2012 18:30:41 +0000 (13:30 -0500)]
checking in bob's deploy scripts with comments

12 years agoa
Seth Woodworth [Sat, 28 Jan 2012 18:24:51 +0000 (13:24 -0500)]
a

12 years agoupdating EPL to Pita's latest and other updates
Seth Woodworth [Sat, 28 Jan 2012 18:23:44 +0000 (13:23 -0500)]
updating EPL to Pita's latest and other updates

12 years agomoving to jquery tmpl for courses page
Seth Woodworth [Sat, 28 Jan 2012 17:21:11 +0000 (12:21 -0500)]
moving to jquery tmpl for courses page

12 years agoadd todo
Seth Woodworth [Sat, 28 Jan 2012 17:18:46 +0000 (12:18 -0500)]
add todo

12 years agotextual copy changes to the homepage, create account page, create a course page,...
Andrew Magliozzi [Thu, 26 Jan 2012 17:43:50 +0000 (12:43 -0500)]
textual copy changes to the homepage, create account page, create a course page, create a lecture page, create a pad page.

12 years agoupdates to rendering jquery tmpls
Seth Woodworth [Tue, 24 Jan 2012 03:17:11 +0000 (22:17 -0500)]
updates to rendering jquery tmpls

12 years agotesting
Seth Woodworth [Mon, 23 Jan 2012 21:05:57 +0000 (16:05 -0500)]
testing

12 years agomodify app for fbauth
Seth Woodworth [Mon, 23 Jan 2012 19:26:35 +0000 (14:26 -0500)]
modify app for fbauth

12 years agomake school slug page work
Seth Woodworth [Mon, 23 Jan 2012 04:53:00 +0000 (23:53 -0500)]
make school slug page work

12 years agoadding course count to app and template schools page
Seth Woodworth [Mon, 23 Jan 2012 00:44:05 +0000 (19:44 -0500)]
adding course count to app and template schools page

12 years agoMerge branch 'master' of github.com:sethwoodworth/FinalsClub into devel
Seth Woodworth [Mon, 23 Jan 2012 00:30:00 +0000 (19:30 -0500)]
Merge branch 'master' of github.com:sethwoodworth/FinalsClub into devel

12 years agoMerge pull request #1 from chrisrhoden/patch-1
Seth Woodworth [Mon, 23 Jan 2012 00:29:21 +0000 (16:29 -0800)]
Merge pull request #1 from chrisrhoden/patch-1

Patch 1

12 years agountested but this should give you a starting point
Chris Rhoden [Mon, 23 Jan 2012 00:27:58 +0000 (19:27 -0500)]
untested but this should give you a starting point

12 years agoMerge branch 'devel' of github.com:finalsclubdev/FinalsClub into devel
Seth Woodworth [Sun, 22 Jan 2012 21:51:18 +0000 (16:51 -0500)]
Merge branch 'devel' of github.com:finalsclubdev/FinalsClub into devel

Conflicts:
public/index.html

12 years agoadding reqs for fb
Seth Woodworth [Sun, 22 Jan 2012 21:49:27 +0000 (16:49 -0500)]
adding reqs for fb

12 years agoadding fb connect
Seth Woodworth [Sun, 22 Jan 2012 21:49:03 +0000 (16:49 -0500)]
adding fb connect

12 years agomodify schools to have a 'slug' name value
Seth Woodworth [Sun, 22 Jan 2012 21:45:11 +0000 (16:45 -0500)]
modify schools to have a 'slug' name value

12 years agoadded breadcrumb to individual note pad page
jordan [Sun, 22 Jan 2012 19:57:38 +0000 (14:57 -0500)]
added breadcrumb to individual note pad page

12 years agoadjustments to breadcrumb
jordan [Sun, 22 Jan 2012 19:34:03 +0000 (14:34 -0500)]
adjustments to breadcrumb

12 years agoplaying with subheaders again, trying to standardize things
jordan [Sun, 22 Jan 2012 19:24:40 +0000 (14:24 -0500)]
playing with subheaders again, trying to standardize things

12 years agostandardized format of creating new object
jordan [Sun, 22 Jan 2012 19:00:26 +0000 (14:00 -0500)]
standardized format of creating new object

12 years agomade add a course form a sidebar, played with subheader styling, removed profile...
jordan [Sun, 22 Jan 2012 18:36:26 +0000 (13:36 -0500)]
made add a course form a sidebar, played with subheader styling, removed profile link in place of username being a link to profile, as is a common pattern in modern web applications

12 years agocorrected fade in of footer and content
jordan [Sun, 22 Jan 2012 18:02:11 +0000 (13:02 -0500)]
corrected fade in of footer and content

12 years agoadded simple default styling to buttons, moved 'create a new course' form to the...
jordan [Sun, 22 Jan 2012 00:28:27 +0000 (19:28 -0500)]
added simple default styling to buttons, moved 'create a new course' form to the sidebar of course pages

12 years agominor cleaning on lectures page and lecture page, fixed links on home page
jordan [Sun, 22 Jan 2012 00:05:20 +0000 (19:05 -0500)]
minor cleaning on lectures page and lecture page, fixed links on home page

12 years agocorrected login/logout link, added 'back to universities' breadcrumb
jordan [Sat, 21 Jan 2012 22:31:00 +0000 (17:31 -0500)]
corrected login/logout link, added 'back to universities' breadcrumb

12 years agofixing signup and learn something links
Seth Woodworth [Sat, 21 Jan 2012 21:10:34 +0000 (16:10 -0500)]
fixing signup and learn something links

12 years agoMade first attempt to commit legal page to code repo.
RISCi_Derpy [Sat, 21 Jan 2012 01:45:37 +0000 (20:45 -0500)]
Made first attempt to commit legal page to code repo.

12 years agominor reformats of commenting styles, beginning to style courses pages, added some...
jordan [Fri, 20 Jan 2012 03:45:48 +0000 (22:45 -0500)]
minor reformats of commenting styles, beginning to style courses pages, added some placeholder data for @sethwoodworth

12 years agoRevert "removing depricated jade templates"
Seth Woodworth [Thu, 19 Jan 2012 02:23:04 +0000 (21:23 -0500)]
Revert "removing depricated jade templates"

This reverts commit a6b2a896859987bb7c2e04a14e899155224b5d2b.

12 years agocompleted html and css for universities page
jordan [Tue, 17 Jan 2012 04:10:15 +0000 (23:10 -0500)]
completed html and css for universities page

blah

12 years agosimplified footer and school listing on home, corrected pathing of courses link on...
jordan [Mon, 16 Jan 2012 21:14:37 +0000 (16:14 -0500)]
simplified footer and school listing on home, corrected pathing of courses link on schools page

12 years agoremoving more depricated code
Seth Woodworth [Sun, 15 Jan 2012 18:03:20 +0000 (13:03 -0500)]
removing more depricated code

12 years agoremoving depricated jade templates
Seth Woodworth [Sun, 15 Jan 2012 15:35:27 +0000 (10:35 -0500)]
removing depricated jade templates

12 years agorenamed nonce var hcourse
Seth Woodworth [Sun, 15 Jan 2012 15:34:07 +0000 (10:34 -0500)]
renamed nonce var hcourse

12 years agoadding jquery.tmpl.js
Seth Woodworth [Sun, 15 Jan 2012 00:04:05 +0000 (19:04 -0500)]
adding jquery.tmpl.js

12 years agoremoved unused jquery
jordan [Sat, 14 Jan 2012 21:35:14 +0000 (16:35 -0500)]
removed unused jquery

12 years agoworking on home page design
jordan [Sat, 14 Jan 2012 21:35:04 +0000 (16:35 -0500)]
working on home page design

12 years agoconverted tabs to soft tabs
jordan [Sat, 14 Jan 2012 17:46:58 +0000 (12:46 -0500)]
converted tabs to soft tabs

12 years agoemployed new cleaner layout with futura, added asynchornous typekit loading to correc...
jordan [Sat, 14 Jan 2012 03:46:57 +0000 (22:46 -0500)]
employed new cleaner layout with futura, added asynchornous typekit loading to correct for FOUT

12 years agoMerge branch 'devel' of github.com:sethwoodworth/FinalsClub into devel
jordan [Sun, 8 Jan 2012 20:56:38 +0000 (15:56 -0500)]
Merge branch 'devel' of github.com:sethwoodworth/FinalsClub into devel

12 years agoreorganized assets, completed new header
jordan [Sun, 8 Jan 2012 20:51:19 +0000 (15:51 -0500)]
reorganized assets, completed new header

12 years agoconverted tabs to spaces
jordan [Sun, 8 Jan 2012 05:02:41 +0000 (00:02 -0500)]
converted tabs to spaces

12 years agoconverted tabs to spaces
jordan [Sun, 8 Jan 2012 02:51:11 +0000 (21:51 -0500)]
converted tabs to spaces

12 years agoadding schema for harvard courses via cs50.net
Seth Woodworth [Sat, 7 Jan 2012 17:38:40 +0000 (12:38 -0500)]
adding schema for harvard courses via cs50.net

12 years agoreturn schools and courses to schools page
Seth Woodworth [Fri, 6 Jan 2012 04:28:06 +0000 (23:28 -0500)]
return schools and courses to schools page

12 years agoMerge branch 'master' of github.com:sethwoodworth/FinalsClub
Seth Woodworth [Wed, 4 Jan 2012 04:59:41 +0000 (23:59 -0500)]
Merge branch 'master' of github.com:sethwoodworth/FinalsClub

12 years agoin progress updates for merge
Seth Woodworth [Wed, 4 Jan 2012 04:59:36 +0000 (23:59 -0500)]
in progress updates for merge

12 years agocorrectly noting the current location of bc
Seth Woodworth [Wed, 4 Jan 2012 04:22:18 +0000 (23:22 -0500)]
correctly noting the current location of bc

12 years agoModifying app.js and git so bc lives in the FC directory
Seth Woodworth [Tue, 3 Jan 2012 18:09:27 +0000 (13:09 -0500)]
Modifying app.js and git so bc lives in the FC directory

12 years agofix json error
Seth Woodworth [Tue, 3 Jan 2012 06:24:54 +0000 (01:24 -0500)]
fix json error

12 years agoUpdating package.json
Seth Woodworth [Tue, 3 Jan 2012 06:21:18 +0000 (01:21 -0500)]
Updating package.json

12 years agoMerge pull request #20 from sethwoodworth/master
Andrew Magliozzi [Wed, 21 Dec 2011 05:48:24 +0000 (21:48 -0800)]
Merge pull request #20 from sethwoodworth/master

Move new_course form to the right, and only shows up on your school

12 years agoremove unused and unfulfilled socket.io import from clientside 20/head
Seth Woodworth [Sun, 18 Dec 2011 22:03:02 +0000 (22:03 +0000)]
remove unused and unfulfilled socket.io import from clientside

12 years agoshowing create course if auth\'ed and moving it to the right
Seth Woodworth [Fri, 16 Dec 2011 10:43:14 +0000 (10:43 +0000)]
showing create course if auth\'ed and moving it to the right

12 years agoMerge branch 'master' of github.com:finalsclubdev/FinalsClub
Seth Woodworth [Wed, 14 Dec 2011 03:16:15 +0000 (03:16 +0000)]
Merge branch 'master' of github.com:finalsclubdev/FinalsClub

12 years agoseth checking in on-server changes
Seth Woodworth [Wed, 14 Dec 2011 03:15:59 +0000 (03:15 +0000)]
seth checking in on-server changes

12 years agoI changed a word just to screw around with github.
Andrew Magliozzi [Thu, 8 Dec 2011 21:48:16 +0000 (16:48 -0500)]
I changed a word just to screw around with github.

12 years agoChanged paragraph two of that homepage text to what I mentioned in my last comment.
Andrew Magliozzi [Thu, 8 Dec 2011 21:26:13 +0000 (16:26 -0500)]
Changed paragraph two of that homepage text to what I mentioned in my last comment.

13 years agoMerge pull request #17 from sethwoodworth/master
Robert Call [Wed, 7 Dec 2011 16:07:23 +0000 (08:07 -0800)]
Merge pull request #17 from sethwoodworth/master

Updating homepage intro text

13 years agoadding mixpanel analytics 17/head
Seth Woodworth [Wed, 7 Dec 2011 07:53:28 +0000 (07:53 +0000)]
adding mixpanel analytics

13 years agoUpdating homepage intro text
Seth Woodworth [Wed, 7 Dec 2011 05:56:42 +0000 (05:56 +0000)]
Updating homepage intro text

13 years agoMerge pull request #16 from sethwoodworth/master
Robert Call [Wed, 7 Dec 2011 04:29:27 +0000 (20:29 -0800)]
Merge pull request #16 from sethwoodworth/master

Update index.html title, update .gitignore

13 years agoMerge branch 'master' of https://github.com/sethwoodworth/FinalsClub 16/head
Seth Woodworth [Wed, 7 Dec 2011 04:20:13 +0000 (04:20 +0000)]
Merge branch 'master' of https://github.com/sethwoodworth/FinalsClub

Conflicts:
public/index.html

13 years agoUpdate Site Header Title to "FinalsClub.org: Online Social Note-Taking"
Seth Woodworth [Tue, 6 Dec 2011 15:03:29 +0000 (15:03 +0000)]
Update Site Header Title to "FinalsClub.org: Online Social Note-Taking"

13 years agoremoving a .DS_Store file and adding more things to .gitignore
Seth Woodworth [Tue, 6 Dec 2011 15:02:25 +0000 (15:02 +0000)]
removing a .DS_Store file and adding more things to .gitignore

13 years agoCommitted changes submitted by B
rcall1 [Wed, 30 Nov 2011 14:47:34 +0000 (09:47 -0500)]
Committed changes submitted by B

13 years agoMerge branch 'master' of github.com:finalsclubdev/FinalsClub
chapel [Sun, 20 Nov 2011 05:01:22 +0000 (21:01 -0800)]
Merge branch 'master' of github.com:finalsclubdev/FinalsClub

* 'master' of github.com:finalsclubdev/FinalsClub:
  added boot script notes. updated boot/start scripts with latest push attempt

13 years agoWire up homepage buttons
chapel [Sun, 20 Nov 2011 05:01:11 +0000 (21:01 -0800)]
Wire up homepage buttons

13 years agoMerge branch 'master' of github.com:finalsclubdev/FinalsClub
Joseph Snow [Sun, 20 Nov 2011 04:51:24 +0000 (21:51 -0700)]
Merge branch 'master' of github.com:finalsclubdev/FinalsClub

13 years agoadded boot script notes.
Joseph Snow [Sun, 20 Nov 2011 04:50:39 +0000 (21:50 -0700)]
added boot script notes.
updated boot/start scripts with latest push attempt

13 years agoMerge branch 'master' of github.com:finalsclubdev/FinalsClub
chapel [Sun, 20 Nov 2011 04:30:50 +0000 (20:30 -0800)]
Merge branch 'master' of github.com:finalsclubdev/FinalsClub

* 'master' of github.com:finalsclubdev/FinalsClub:
  more styling, fix to main.js login div
  more styling to content pages
  Fix asset link so it links from root and not relative

13 years agoFix navigation icon
chapel [Sun, 20 Nov 2011 04:30:44 +0000 (20:30 -0800)]
Fix navigation icon

13 years agomore styling, fix to main.js login div
ec2-user [Sun, 20 Nov 2011 04:27:23 +0000 (04:27 +0000)]
more styling, fix to main.js login div

13 years agoMerge branch 'master' of github.com:finalsclubdev/FinalsClub
ec2-user [Sun, 20 Nov 2011 04:16:15 +0000 (04:16 +0000)]
Merge branch 'master' of github.com:finalsclubdev/FinalsClub

13 years agoresolve conflicts again ...
ec2-user [Sun, 20 Nov 2011 04:15:20 +0000 (04:15 +0000)]
resolve conflicts again ...

13 years agomore styling to content pages
ec2-user [Sun, 20 Nov 2011 04:10:06 +0000 (04:10 +0000)]
more styling to content pages

13 years agoMerge branch 'master' of github.com:finalsclubdev/FinalsClub
chapel [Sun, 20 Nov 2011 03:57:39 +0000 (19:57 -0800)]
Merge branch 'master' of github.com:finalsclubdev/FinalsClub

* 'master' of github.com:finalsclubdev/FinalsClub:
  jsnow. updating script permissions.
  styling fixes, login, removed donate temp
  jsnow.  updating script permissions

Conflicts:
public/index.html

13 years agoFix login and login info
chapel [Sun, 20 Nov 2011 03:53:53 +0000 (19:53 -0800)]
Fix login and login info

13 years agoresolve conflict 1page
ec2-user [Sun, 20 Nov 2011 03:47:09 +0000 (03:47 +0000)]
resolve conflict

13 years agoMerge branch 'master' of github.com:finalsclubdev/FinalsClub
ec2-user [Sun, 20 Nov 2011 03:45:06 +0000 (03:45 +0000)]
Merge branch 'master' of github.com:finalsclubdev/FinalsClub

13 years agoresolved index.html conflict in head
ec2-user [Sun, 20 Nov 2011 03:44:44 +0000 (03:44 +0000)]
resolved index.html conflict in head

13 years agojsnow. updating script permissions.
Joseph Snow [Sun, 20 Nov 2011 03:43:21 +0000 (19:43 -0800)]
jsnow. updating script permissions.

13 years agostyling fixes, login, removed donate temp
ec2-user [Sun, 20 Nov 2011 03:41:20 +0000 (03:41 +0000)]
styling fixes, login, removed donate temp

13 years agoFix video embedding to be on demand, also fix logo
chapel [Sun, 20 Nov 2011 03:39:48 +0000 (19:39 -0800)]
Fix video embedding to be on demand, also fix logo

13 years agoAdd absolute links to index.html for assets
chapel [Sun, 20 Nov 2011 03:32:21 +0000 (19:32 -0800)]
Add absolute links to index.html for assets

13 years agojsnow. updating script permissions
ec2-user [Sun, 20 Nov 2011 03:18:01 +0000 (03:18 +0000)]
jsnow.  updating script permissions

13 years agoresolve index.html conflict
fcdev@sleepless.com [Sun, 20 Nov 2011 03:11:52 +0000 (03:11 +0000)]
resolve index.html conflict

13 years agoFix asset link so it links from root and not relative
chapel [Sun, 20 Nov 2011 03:08:58 +0000 (19:08 -0800)]
Fix asset link so it links from root and not relative

13 years agoMerge branch '1page' of github.com:/finalsclubdev/FinalsClub into 1p-newdesign
ec2-user [Sun, 20 Nov 2011 02:58:24 +0000 (02:58 +0000)]
Merge branch '1page' of github.com:/finalsclubdev/FinalsClub into 1p-newdesign

13 years agofirst pass, new design html
ec2-user [Sun, 20 Nov 2011 02:57:36 +0000 (02:57 +0000)]
first pass, new design html

13 years agoSend none if a course variable is missing
chapel [Sun, 20 Nov 2011 02:56:09 +0000 (18:56 -0800)]
Send none if a course variable is missing