oweals/finalsclub.git
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 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 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.

12 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

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

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

12 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

12 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

12 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"

12 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

12 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

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

13 years agodecompress new design files
ec2-user [Sun, 20 Nov 2011 02:20:31 +0000 (02:20 +0000)]
decompress new design files

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

13 years agoMerge branch '1page' of github.com:finalsclubdev/FinalsClub into 1page
Joe Hitchens [Sun, 20 Nov 2011 02:17:09 +0000 (18:17 -0800)]
Merge branch '1page' of github.com:finalsclubdev/FinalsClub into 1page

13 years agomoving new design files to repo
Joe Hitchens [Sun, 20 Nov 2011 02:15:49 +0000 (18:15 -0800)]
moving new design files to repo

13 years agoAdded noscript to index.html
chapel [Sat, 19 Nov 2011 22:40:59 +0000 (14:40 -0800)]
Added noscript to index.html

13 years agoMissed some not found errors
chapel [Sat, 19 Nov 2011 22:25:09 +0000 (14:25 -0800)]
Missed some not found errors

13 years agoMerge branch '1page' of github.com:/finalsclubdev/FinalsClub
ec2-user [Sat, 19 Nov 2011 22:23:44 +0000 (22:23 +0000)]
Merge branch '1page' of github.com:/finalsclubdev/FinalsClub

13 years agoMultiple fixes
chapel [Sat, 19 Nov 2011 22:22:46 +0000 (14:22 -0800)]
Multiple fixes
- Fix not found errors
- Fix pass reset link in html
- Fix protodiv error in IE
- Fix button for new items showing when it shouldn't
- Move login info to use jquery to fill name

13 years agoa few more styling fixups
ec2-user [Sat, 19 Nov 2011 22:14:03 +0000 (22:14 +0000)]
a few more styling fixups

13 years agoMerge branch '1page' of github.com:/finalsclubdev/FinalsClub
ec2-user [Sat, 19 Nov 2011 21:11:47 +0000 (21:11 +0000)]
Merge branch '1page' of github.com:/finalsclubdev/FinalsClub

13 years agostyling changes to error and info boxes, and screencast box, and tweaks to home page...
ec2-user [Sat, 19 Nov 2011 21:10:55 +0000 (21:10 +0000)]
styling changes to error and info boxes, and screencast box, and tweaks to home page to align text better onto background

13 years agoFix instructor email showing when it shouldn't,
chapel [Sat, 19 Nov 2011 21:10:34 +0000 (13:10 -0800)]
Fix instructor email showing when it shouldn't,
Add more info for notes, fix date for lectures,
add in joes fixes for FF and IE from 1pageb;

13 years agostyling changes to error and info boxes
ec2-user [Sat, 19 Nov 2011 21:03:10 +0000 (21:03 +0000)]
styling changes to error and info boxes

13 years agoFix flicker when logged in due to logged in text
chapel [Sat, 19 Nov 2011 19:52:56 +0000 (11:52 -0800)]
Fix flicker when logged in due to logged in text
being hidden and re-shown over and over again as
you moved around the site between pages

13 years agoMerge branch '1page' of github.com:/finalsclubdev/FinalsClub
ec2-user [Sat, 19 Nov 2011 18:42:23 +0000 (18:42 +0000)]
Merge branch '1page' of github.com:/finalsclubdev/FinalsClub

13 years agoRework and feature parity to existing site
chapel [Sat, 19 Nov 2011 18:26:11 +0000 (10:26 -0800)]
Rework and feature parity to existing site
 - Reworked the routing system to use a more dynamic approach
 - Moved most of the duplicate code into distinct functions
 - Add login functionality and continual checks if a user is logged in
 - Add register functionality as well as activation
 - Add course creation and proper authorization handling server side
 - Add lecture creation and proper authorization handling server side
 - Add note creation and proper authorization handling server side
 - Add resetpassword functionality
 - Add jquery 1.7 minified file
 - Various tweaks and improvements

13 years agoMerge branch 'master' of github.com:finalsclubdev/FinalsClub
Joseph Snow [Tue, 15 Nov 2011 23:16:23 +0000 (16:16 -0700)]
Merge branch 'master' of github.com:finalsclubdev/FinalsClub

13 years agoadded start-fc-epl-monitor.sh.
Joseph Snow [Tue, 15 Nov 2011 23:13:44 +0000 (16:13 -0700)]
added start-fc-epl-monitor.sh.

epl monitor is no longer a cron task.

13 years agoadded start-fc-epl-monitor.sh.
Joseph Snow [Tue, 15 Nov 2011 23:13:44 +0000 (16:13 -0700)]
added start-fc-epl-monitor.sh.

epl monitor is no longer a cron task.

13 years agoadded comment before comment
Joseph Snow [Tue, 15 Nov 2011 19:48:33 +0000 (12:48 -0700)]
added comment before comment

13 years agoupdated start/stop scripts to run form /etc/rc.local (without sudo)
Joseph Snow [Tue, 15 Nov 2011 16:21:10 +0000 (09:21 -0700)]
updated start/stop scripts to run form /etc/rc.local (without sudo)

13 years agoupdating script for boot/restart
Joseph Snow [Tue, 15 Nov 2011 16:15:56 +0000 (09:15 -0700)]
updating script for boot/restart

13 years agoadded reboot-restart.sh script.
Joseph Snow [Tue, 15 Nov 2011 11:22:05 +0000 (04:22 -0700)]
added reboot-restart.sh script.
also updated these scripts to s3

13 years agofix merge conflict
chapel [Mon, 14 Nov 2011 23:44:11 +0000 (15:44 -0800)]
fix merge conflict

13 years agoRecent changes and alternatives
chapel [Mon, 14 Nov 2011 23:42:39 +0000 (15:42 -0800)]
Recent changes and alternatives

13 years agoditto
ec2-user [Mon, 14 Nov 2011 23:36:20 +0000 (23:36 +0000)]
ditto

13 years agoadd semicolons
ec2-user [Mon, 14 Nov 2011 23:14:00 +0000 (23:14 +0000)]
add semicolons

13 years agoremove empty lines
ec2-user [Mon, 14 Nov 2011 23:07:51 +0000 (23:07 +0000)]
remove empty lines