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
Seth Woodworth [Tue, 6 Dec 2011 15:03:29 +0000 (15:03 +0000)]
Update Site Header Title to "FinalsClub.org: Online Social Note-Taking"
Seth Woodworth [Tue, 6 Dec 2011 15:02:25 +0000 (15:02 +0000)]
removing a .DS_Store file and adding more things to .gitignore
rcall1 [Wed, 30 Nov 2011 14:47:34 +0000 (09:47 -0500)]
Committed changes submitted by B
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
chapel [Sun, 20 Nov 2011 05:01:11 +0000 (21:01 -0800)]
Wire up homepage buttons
Joseph Snow [Sun, 20 Nov 2011 04:51:24 +0000 (21:51 -0700)]
Merge branch 'master' of github.com:finalsclubdev/FinalsClub
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
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
chapel [Sun, 20 Nov 2011 04:30:44 +0000 (20:30 -0800)]
Fix navigation icon
ec2-user [Sun, 20 Nov 2011 04:27:23 +0000 (04:27 +0000)]
more styling, fix to main.js login div
ec2-user [Sun, 20 Nov 2011 04:16:15 +0000 (04:16 +0000)]
Merge branch 'master' of github.com:finalsclubdev/FinalsClub
ec2-user [Sun, 20 Nov 2011 04:15:20 +0000 (04:15 +0000)]
resolve conflicts again ...
ec2-user [Sun, 20 Nov 2011 04:10:06 +0000 (04:10 +0000)]
more styling to content pages
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
chapel [Sun, 20 Nov 2011 03:53:53 +0000 (19:53 -0800)]
Fix login and login info
ec2-user [Sun, 20 Nov 2011 03:47:09 +0000 (03:47 +0000)]
resolve conflict
ec2-user [Sun, 20 Nov 2011 03:45:06 +0000 (03:45 +0000)]
Merge branch 'master' of github.com:finalsclubdev/FinalsClub
ec2-user [Sun, 20 Nov 2011 03:44:44 +0000 (03:44 +0000)]
resolved index.html conflict in head
Joseph Snow [Sun, 20 Nov 2011 03:43:21 +0000 (19:43 -0800)]
jsnow. updating script permissions.
ec2-user [Sun, 20 Nov 2011 03:41:20 +0000 (03:41 +0000)]
styling fixes, login, removed donate temp
chapel [Sun, 20 Nov 2011 03:39:48 +0000 (19:39 -0800)]
Fix video embedding to be on demand, also fix logo
chapel [Sun, 20 Nov 2011 03:32:21 +0000 (19:32 -0800)]
Add absolute links to index.html for assets
ec2-user [Sun, 20 Nov 2011 03:18:01 +0000 (03:18 +0000)]
jsnow. updating script permissions
fcdev@sleepless.com [Sun, 20 Nov 2011 03:11:52 +0000 (03:11 +0000)]
resolve index.html conflict
chapel [Sun, 20 Nov 2011 03:08:58 +0000 (19:08 -0800)]
Fix asset link so it links from root and not relative
ec2-user [Sun, 20 Nov 2011 02:58:24 +0000 (02:58 +0000)]
Merge branch '1page' of github.com:/finalsclubdev/FinalsClub into 1p-newdesign
ec2-user [Sun, 20 Nov 2011 02:57:36 +0000 (02:57 +0000)]
first pass, new design html
chapel [Sun, 20 Nov 2011 02:56:09 +0000 (18:56 -0800)]
Send none if a course variable is missing
ec2-user [Sun, 20 Nov 2011 02:21:46 +0000 (02:21 +0000)]
Merge branch 'master' of github.com:/finalsclubdev/FinalsClub
ec2-user [Sun, 20 Nov 2011 02:20:31 +0000 (02:20 +0000)]
decompress new design files
ec2-user [Sun, 20 Nov 2011 02:18:02 +0000 (02:18 +0000)]
Merge branch '1page' of github.com:/finalsclubdev/FinalsClub
Joe Hitchens [Sun, 20 Nov 2011 02:17:09 +0000 (18:17 -0800)]
Merge branch '1page' of github.com:finalsclubdev/FinalsClub into 1page
Joe Hitchens [Sun, 20 Nov 2011 02:15:49 +0000 (18:15 -0800)]
moving new design files to repo
chapel [Sat, 19 Nov 2011 22:40:59 +0000 (14:40 -0800)]
Added noscript to index.html
chapel [Sat, 19 Nov 2011 22:25:09 +0000 (14:25 -0800)]
Missed some not found errors
ec2-user [Sat, 19 Nov 2011 22:23:44 +0000 (22:23 +0000)]
Merge branch '1page' of github.com:/finalsclubdev/FinalsClub
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
ec2-user [Sat, 19 Nov 2011 22:14:03 +0000 (22:14 +0000)]
a few more styling fixups
ec2-user [Sat, 19 Nov 2011 21:11:47 +0000 (21:11 +0000)]
Merge branch '1page' of github.com:/finalsclubdev/FinalsClub
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
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;
ec2-user [Sat, 19 Nov 2011 21:03:10 +0000 (21:03 +0000)]
styling changes to error and info boxes
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
ec2-user [Sat, 19 Nov 2011 18:42:23 +0000 (18:42 +0000)]
Merge branch '1page' of github.com:/finalsclubdev/FinalsClub
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
Joseph Snow [Tue, 15 Nov 2011 23:16:23 +0000 (16:16 -0700)]
Merge branch 'master' of github.com:finalsclubdev/FinalsClub
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.
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.
Joseph Snow [Tue, 15 Nov 2011 19:48:33 +0000 (12:48 -0700)]
added comment before comment
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)
Joseph Snow [Tue, 15 Nov 2011 16:15:56 +0000 (09:15 -0700)]
updating script for boot/restart
Joseph Snow [Tue, 15 Nov 2011 11:22:05 +0000 (04:22 -0700)]
added reboot-restart.sh script.
also updated these scripts to s3
chapel [Mon, 14 Nov 2011 23:44:11 +0000 (15:44 -0800)]
fix merge conflict
chapel [Mon, 14 Nov 2011 23:42:39 +0000 (15:42 -0800)]
Recent changes and alternatives
ec2-user [Mon, 14 Nov 2011 23:36:20 +0000 (23:36 +0000)]
ditto
ec2-user [Mon, 14 Nov 2011 23:14:00 +0000 (23:14 +0000)]
add semicolons
ec2-user [Mon, 14 Nov 2011 23:07:51 +0000 (23:07 +0000)]
remove empty lines
ec2-user [Mon, 14 Nov 2011 19:47:07 +0000 (19:47 +0000)]
Merge branch '1page' of github.com:/finalsclubdev/FinalsClub into 1page
ec2-user [Mon, 14 Nov 2011 19:45:37 +0000 (19:45 +0000)]
more 1page work
chapel [Mon, 14 Nov 2011 06:49:32 +0000 (22:49 -0800)]
Add no-cache for json output
chapel [Mon, 14 Nov 2011 06:27:58 +0000 (22:27 -0800)]
Merge branch '1page' of github.com:finalsclubdev/FinalsClub into 1page
* '1page' of github.com:finalsclubdev/FinalsClub:
more 1page work
chapel [Mon, 14 Nov 2011 06:27:50 +0000 (22:27 -0800)]
Add user data to json sent to browser
ec2-user [Mon, 14 Nov 2011 06:02:30 +0000 (06:02 +0000)]
more 1page work
chapel [Mon, 14 Nov 2011 00:10:03 +0000 (16:10 -0800)]
Merge branch '1page' of github.com:finalsclubdev/FinalsClub into 1page
* '1page' of github.com:finalsclubdev/FinalsClub:
undid tweak to ff
added showpage call to support older FF
chapel [Mon, 14 Nov 2011 00:09:54 +0000 (16:09 -0800)]
All requests will load index.html, notes page reverted to rendering serverside
ec2-user [Sun, 13 Nov 2011 23:52:38 +0000 (23:52 +0000)]
undid tweak to ff
ec2-user [Sun, 13 Nov 2011 23:47:10 +0000 (23:47 +0000)]
added showpage call to support older FF
chapel [Sun, 13 Nov 2011 23:13:36 +0000 (15:13 -0800)]
Fix archived notes and break cache for json
ec2-user [Sun, 13 Nov 2011 22:25:11 +0000 (22:25 +0000)]
archive pages working with 1page, 1st pass
ec2-user [Sun, 13 Nov 2011 21:16:39 +0000 (21:16 +0000)]
notes list working w/1page
ec2-user [Sun, 13 Nov 2011 21:03:22 +0000 (21:03 +0000)]
Merge branch '1page' of github.com:/finalsclubdev/FinalsClub into 1page
ec2-user [Sun, 13 Nov 2011 21:03:16 +0000 (21:03 +0000)]
notes list partly working w/1page
chapel [Sun, 13 Nov 2011 21:01:30 +0000 (13:01 -0800)]
Send index.html on all ajax views, fix public file includes
ec2-user [Sun, 13 Nov 2011 20:54:50 +0000 (20:54 +0000)]
lecture list working w/1page
ec2-user [Sun, 13 Nov 2011 06:48:14 +0000 (06:48 +0000)]
got window.scroll working on back nav
ec2-user [Sun, 13 Nov 2011 06:38:48 +0000 (06:38 +0000)]
Merge branch '1page' of github.com:/finalsclubdev/FinalsClub into 1page
ec2-user [Sun, 13 Nov 2011 06:38:41 +0000 (06:38 +0000)]
most pages under pseudo-nav behavior
chapel [Sun, 13 Nov 2011 06:37:03 +0000 (22:37 -0800)]
Merge branch '1page' of github.com:finalsclubdev/FinalsClub into 1page
* '1page' of github.com:finalsclubdev/FinalsClub:
more work on 1page changes + adding in pushstate support
more work on 1page
1page updates
1page updates
chapel [Sun, 13 Nov 2011 06:36:54 +0000 (22:36 -0800)]
Convert other data points to ajax
ec2-user [Sun, 13 Nov 2011 06:08:17 +0000 (06:08 +0000)]
most pages under pseudo-nav behavior
ec2-user [Sun, 13 Nov 2011 05:29:09 +0000 (05:29 +0000)]
more work on page nav w/pushstate
Joseph Snow [Sun, 13 Nov 2011 04:50:00 +0000 (21:50 -0700)]
updated script for new repo install
ec2-user [Sun, 13 Nov 2011 04:19:59 +0000 (04:19 +0000)]
more work on 1page changes + adding in pushstate support
fcdev@sleepless.com [Sun, 13 Nov 2011 02:31:35 +0000 (02:31 +0000)]
more work on 1page
fcdev@sleepless.com [Sun, 13 Nov 2011 00:33:27 +0000 (00:33 +0000)]
Merge branch '1page' of github.com:/finalsclubdev/FinalsClub into 1page
fcdev@sleepless.com [Sun, 13 Nov 2011 00:33:06 +0000 (00:33 +0000)]
1page updates
fcdev@sleepless.com [Sun, 13 Nov 2011 00:32:30 +0000 (00:32 +0000)]
1page updates
chapel [Sun, 13 Nov 2011 00:17:19 +0000 (16:17 -0800)]
Add course list for school and sanitize course
Joseph Snow [Sun, 13 Nov 2011 00:16:33 +0000 (17:16 -0700)]
adding crontab file to utils for reference
Joseph Snow [Sun, 13 Nov 2011 00:12:23 +0000 (17:12 -0700)]
updated start script to account for new finalsclub repo
Joseph Snow [Sat, 12 Nov 2011 22:11:57 +0000 (22:11 +0000)]
updating script permissions
chapel [Sat, 12 Nov 2011 22:11:48 +0000 (14:11 -0800)]
Merge branch '1page' of github.com:finalsclubdev/FinalsClub into 1page
* '1page' of github.com:finalsclubdev/FinalsClub:
coding up index.html
added local jquery.min.js, tweak to css
chapel [Sat, 12 Nov 2011 22:11:23 +0000 (14:11 -0800)]
Sanitize schools and make sure courses are sent out
fcdev@sleepless.com [Sat, 12 Nov 2011 22:08:09 +0000 (22:08 +0000)]
coding up index.html
Joseph Snow [Sat, 12 Nov 2011 21:35:25 +0000 (14:35 -0700)]
migrating monitor and backup scripts from sleepless/fc => FinalsClub repo
Joseph Snow [Sat, 12 Nov 2011 21:34:44 +0000 (14:34 -0700)]
migrating CloudWatch utils from sleepless/fc => FinalsClub
Joe Hitchens [Sat, 12 Nov 2011 20:56:58 +0000 (12:56 -0800)]
Merge branch '1page' of github.com:finalsclubdev/FinalsClub into 1page
Joe Hitchens [Sat, 12 Nov 2011 20:55:42 +0000 (12:55 -0800)]
added local jquery.min.js, tweak to css
chapel [Sat, 12 Nov 2011 20:27:37 +0000 (12:27 -0800)]
Add ajax check, and send json for /schools
projects / oweals / finalsclub.git / log