oweals/karmaworld.git
10 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Bryan [Wed, 25 Dec 2013 06:12:11 +0000 (01:12 -0500)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

10 years agoremoved wrong user/group hardcoding, closing #216. using proper supervisord restart...
Bryan [Wed, 25 Dec 2013 06:12:00 +0000 (01:12 -0500)]
removed wrong user/group hardcoding, closing #216. using proper supervisord restart calls closing #190.

10 years agoBetter controls for viewing PDF files
Charles Connell [Tue, 24 Dec 2013 21:25:30 +0000 (16:25 -0500)]
Better controls for viewing PDF files

10 years agoSwitch back to is.gd
Charles Connell [Mon, 23 Dec 2013 23:45:51 +0000 (18:45 -0500)]
Switch back to is.gd

10 years agoGive notes without zoom buttons a little more space
Charles Connell [Mon, 23 Dec 2013 23:43:10 +0000 (18:43 -0500)]
Give notes without zoom buttons a little more space

10 years agoDifferent URL shortening system
Charles Connell [Mon, 23 Dec 2013 22:55:25 +0000 (17:55 -0500)]
Different URL shortening system

10 years agoMinor typo
Charles Connell [Mon, 23 Dec 2013 20:24:09 +0000 (15:24 -0500)]
Minor typo

10 years agoTweet about new notes periodically
Charles Connell [Mon, 23 Dec 2013 20:12:17 +0000 (15:12 -0500)]
Tweet about new notes periodically

10 years agoMore work on course and note page headers #223
Charles Connell [Mon, 23 Dec 2013 17:32:40 +0000 (12:32 -0500)]
More work on course and note page headers #223

10 years agoMake autocomplete more clear #198
Charles Connell [Sun, 22 Dec 2013 22:23:34 +0000 (17:23 -0500)]
Make autocomplete more clear #198

10 years agoChanges to course and note page headers #223 #209
Charles Connell [Sun, 22 Dec 2013 22:13:31 +0000 (17:13 -0500)]
Changes to course and note page headers #223 #209

10 years agoG+ and reddit buttons #209
Charles Connell [Sun, 22 Dec 2013 04:22:24 +0000 (23:22 -0500)]
G+ and reddit buttons #209

10 years agoAdd facebook like button #209
Charles Connell [Sun, 22 Dec 2013 04:01:28 +0000 (23:01 -0500)]
Add facebook like button #209

10 years agoThe process to get pdf2htmlEX installed on beta
Charles Connell [Sat, 21 Dec 2013 21:12:30 +0000 (16:12 -0500)]
The process to get pdf2htmlEX installed on beta

10 years agoZoom buttons on notes
Charles Connell [Sat, 21 Dec 2013 00:53:45 +0000 (19:53 -0500)]
Zoom buttons on notes

10 years agoConvert PDF notes to HTML with PDF2HTMLEx
Charles Connell [Fri, 20 Dec 2013 23:58:00 +0000 (18:58 -0500)]
Convert PDF notes to HTML with PDF2HTMLEx

10 years agoremoving DriveAuth step 2 of 2: removing db table
Bryan [Sat, 21 Dec 2013 00:09:36 +0000 (19:09 -0500)]
removing DriveAuth step 2 of 2: removing db table

10 years agoremoving DriveAuth step 1 of 2: removing code
Bryan [Sat, 21 Dec 2013 00:02:42 +0000 (19:02 -0500)]
removing DriveAuth step 1 of 2: removing code

10 years agoresolving merge conflict by adding both requirements.
Bryan [Fri, 20 Dec 2013 23:51:18 +0000 (18:51 -0500)]
resolving merge conflict by adding both requirements.

10 years agofirst attempt at resolving migration dependencies
Bryan [Fri, 20 Dec 2013 23:26:00 +0000 (18:26 -0500)]
first attempt at resolving migration dependencies

10 years agoStart migrations from beginning
Charles Connell [Fri, 20 Dec 2013 23:12:51 +0000 (18:12 -0500)]
Start migrations from beginning

10 years agoMigration to keep RawDocument up to date
Charles Connell [Fri, 20 Dec 2013 22:28:38 +0000 (17:28 -0500)]
Migration to keep RawDocument up to date

10 years agoDon't delete a note if its user is deleted
Charles Connell [Fri, 20 Dec 2013 14:53:38 +0000 (09:53 -0500)]
Don't delete a note if its user is deleted

10 years agoAdding beautifulsoup4 back. still needed.
Bryan Bonvallet [Fri, 20 Dec 2013 22:09:07 +0000 (17:09 -0500)]
Adding beautifulsoup4 back. still needed.

10 years agoDefault sort is ascending, want descending sort here.
Bryan Bonvallet [Fri, 20 Dec 2013 21:25:25 +0000 (16:25 -0500)]
Default sort is ascending, want descending sort here.

10 years agoOrdering leaderboard by score and truncating at 20
Bryan Bonvallet [Fri, 20 Dec 2013 20:59:44 +0000 (15:59 -0500)]
Ordering leaderboard by score and truncating at 20

10 years agoFixing about page to display all schools that have at least one file for #218
Bryan Bonvallet [Fri, 20 Dec 2013 19:08:44 +0000 (14:08 -0500)]
Fixing about page to display all schools that have at least one file for #218

10 years agoI meant hide, not show
Charles Connell [Fri, 20 Dec 2013 04:36:33 +0000 (23:36 -0500)]
I meant hide, not show

10 years agoUpdate note counts when a note is create or deleted
Charles Connell [Fri, 20 Dec 2013 03:57:51 +0000 (22:57 -0500)]
Update note counts when a note is create or deleted

10 years agoMigrations necessary for last change
Charles Connell [Fri, 20 Dec 2013 02:53:05 +0000 (21:53 -0500)]
Migrations necessary for last change

10 years agoAccept uploaders' email addresses
Charles Connell [Fri, 20 Dec 2013 02:50:07 +0000 (21:50 -0500)]
Accept uploaders' email addresses

10 years agoReenabling santize_html now that it works. closes #160
Bryan Bonvallet [Fri, 20 Dec 2013 00:23:01 +0000 (19:23 -0500)]
Reenabling santize_html now that it works. closes #160

10 years agofix sanitize_html to write out HTML instead of repr for #160
Bryan Bonvallet [Fri, 20 Dec 2013 00:19:30 +0000 (19:19 -0500)]
fix sanitize_html to write out HTML instead of repr for #160

10 years agoFixing multiple upload problem by removing anonymous save function out of an iterated...
Bryan [Thu, 19 Dec 2013 23:06:26 +0000 (18:06 -0500)]
Fixing multiple upload problem by removing anonymous save function out of an iterated function call closing #211

10 years agowoops, no reason to wait only to fail. moving fail condition prior to sleep.
Bryan Bonvallet [Thu, 19 Dec 2013 21:00:59 +0000 (16:00 -0500)]
woops, no reason to wait only to fail. moving fail condition prior to sleep.

10 years agofixing the example drive.py, properly importing it, and supporting it on VM upstart
Bryan [Thu, 19 Dec 2013 09:05:49 +0000 (04:05 -0500)]
fixing the example drive.py, properly importing it, and supporting it on VM upstart

10 years agomissing dependencies; not sure how beautifulsoup4 got off this list but it is back now
Bryan [Thu, 19 Dec 2013 09:05:09 +0000 (04:05 -0500)]
missing dependencies; not sure how beautifulsoup4 got off this list but it is back now

10 years agofixing minor typo
Bryan [Thu, 19 Dec 2013 09:04:25 +0000 (04:04 -0500)]
fixing minor typo

10 years agoconvert gdrive.py and secrets to auth against a Google Drive from a Service Account...
Bryan [Thu, 19 Dec 2013 07:48:30 +0000 (02:48 -0500)]
convert gdrive.py and secrets to auth against a Google Drive from a Service Account which does not require user intervention; for #214

10 years agoTests for google drive conversion
Charles Connell [Thu, 19 Dec 2013 02:34:53 +0000 (21:34 -0500)]
Tests for google drive conversion

10 years agoAdd bit about document_upload tests
Charles Connell [Thu, 19 Dec 2013 02:22:17 +0000 (21:22 -0500)]
Add bit about document_upload tests

10 years agoImprove formatting
Charles Connell [Wed, 18 Dec 2013 23:10:56 +0000 (18:10 -0500)]
Improve formatting

10 years agoMerge pull request #164 from FinalsClub/filepick.io
Bryan Bonvallet [Wed, 18 Dec 2013 21:45:26 +0000 (13:45 -0800)]
Merge pull request #164 from FinalsClub/filepick.io

Filepicker works well enough to merge into master at this point. There is still plenty of work to do, but Filepicker looks pretty solid.

10 years agoDatabase migration for enforcing course uniqueness 164/head
Charles Connell [Wed, 18 Dec 2013 19:00:20 +0000 (14:00 -0500)]
Database migration for enforcing course uniqueness

10 years agoFormat commands better
Charles Connell [Wed, 18 Dec 2013 17:30:34 +0000 (12:30 -0500)]
Format commands better

10 years agoBetter Evernotes
Charles Connell [Wed, 18 Dec 2013 17:00:58 +0000 (12:00 -0500)]
Better Evernotes

10 years agoBasics of Evernote workaround
Charles Connell [Wed, 18 Dec 2013 03:47:59 +0000 (22:47 -0500)]
Basics of Evernote workaround

10 years agoEnforce course uniqueness
Charles Connell [Tue, 17 Dec 2013 19:36:29 +0000 (14:36 -0500)]
Enforce course uniqueness

10 years agoLittle cleanup on courses
Charles Connell [Tue, 17 Dec 2013 16:08:19 +0000 (11:08 -0500)]
Little cleanup on courses

10 years agoplaces ENML to XML mimetype conversion in the wrong place, this should work for celery.
Bryan [Tue, 17 Dec 2013 21:36:48 +0000 (16:36 -0500)]
places ENML to XML mimetype conversion in the wrong place, this should work for celery.

10 years agoconverting ENML mimetypes to XML mimetypes
Bryan [Tue, 17 Dec 2013 20:43:33 +0000 (15:43 -0500)]
converting ENML mimetypes to XML mimetypes

10 years agosome quick notes to complete the VM startup procedure
Bryan [Tue, 17 Dec 2013 09:05:43 +0000 (04:05 -0500)]
some quick notes to complete the VM startup procedure

10 years agoMerge remote-tracking branch 'origin/filepick.io' into feature_vagrant_startup
Bryan [Tue, 17 Dec 2013 08:24:07 +0000 (03:24 -0500)]
Merge remote-tracking branch 'origin/filepick.io' into feature_vagrant_startup

10 years agoremoving license for Ajaxuploader, closing #194
Bryan Bonvallet [Tue, 17 Dec 2013 06:52:21 +0000 (01:52 -0500)]
removing license for Ajaxuploader, closing #194

10 years agoMerge filepick.io into feature_vagrant_startup
Bryan [Tue, 17 Dec 2013 06:34:33 +0000 (01:34 -0500)]
Merge filepick.io into feature_vagrant_startup

10 years agoRemove unused code: ajaxuploader, lightboxes, and other things
Charles Connell [Tue, 17 Dec 2013 05:27:48 +0000 (00:27 -0500)]
Remove unused code: ajaxuploader, lightboxes, and other things

10 years agoMore automation of Selenium tests
Charles Connell [Tue, 17 Dec 2013 05:06:27 +0000 (00:06 -0500)]
More automation of Selenium tests

10 years agoDjango unit tests for courses, move around test files
Charles Connell [Tue, 17 Dec 2013 04:27:18 +0000 (23:27 -0500)]
Django unit tests for courses, move around test files

10 years agoMore testing of Add Course form
Charles Connell [Mon, 16 Dec 2013 20:05:28 +0000 (15:05 -0500)]
More testing of Add Course form

10 years agoremoving github and skydrive from list of filepicker services
Andrew Magliozzi [Mon, 16 Dec 2013 21:48:00 +0000 (16:48 -0500)]
removing github and skydrive from list of filepicker services

10 years agorestoring evernote to list of filepicker services
Andrew Magliozzi [Mon, 16 Dec 2013 21:03:25 +0000 (16:03 -0500)]
restoring evernote to list of filepicker services

10 years agoBeginning Selenium tests
Charles Connell [Mon, 16 Dec 2013 02:47:47 +0000 (21:47 -0500)]
Beginning Selenium tests

10 years agoAutocomplete instructor names, take users to existing courses, be stricter about...
Charles Connell [Sun, 15 Dec 2013 22:03:07 +0000 (17:03 -0500)]
Autocomplete instructor names, take users to existing courses, be stricter about school names

10 years agoCharles additions to .gitignore
Charles Connell [Sat, 14 Dec 2013 22:55:12 +0000 (17:55 -0500)]
Charles additions to .gitignore

10 years agoAutocomplete course names
Charles Connell [Fri, 13 Dec 2013 22:01:40 +0000 (17:01 -0500)]
Autocomplete course names

10 years agoAdd buttons in header
Charles Connell [Fri, 13 Dec 2013 20:34:18 +0000 (15:34 -0500)]
Add buttons in header

10 years agoadding S# as filepicker data store location
Andrew Magliozzi [Fri, 13 Dec 2013 19:47:23 +0000 (14:47 -0500)]
adding S# as filepicker data store location

10 years agoDisable evernote upload
Charles Connell [Fri, 13 Dec 2013 17:11:52 +0000 (12:11 -0500)]
Disable evernote upload

10 years agoMerge branch 'filepick.io' of ssh://github.com/FinalsClub/karmaworld into filepick.io
Bryan Bonvallet [Fri, 13 Dec 2013 16:55:34 +0000 (11:55 -0500)]
Merge branch 'filepick.io' of ssh://github.com/FinalsClub/karmaworld into filepick.io

10 years agoChanging SITE_ID from 2 (less than 1% use case) to 1 (should cover nearly everyone...
Bryan Bonvallet [Fri, 13 Dec 2013 16:50:54 +0000 (11:50 -0500)]
Changing SITE_ID from 2 (less than 1% use case) to 1 (should cover nearly everyone out of the box)

10 years agoupdating changed function name
Bryan [Fri, 13 Dec 2013 01:33:19 +0000 (20:33 -0500)]
updating changed function name

10 years agocopy secrets from host and updated README to address this need.
Bryan [Fri, 13 Dec 2013 01:24:22 +0000 (20:24 -0500)]
copy secrets from host and updated README to address this need.

10 years agofirst_deploy() appears to be nearly ready for primetime, so adding it as part of...
Bryan [Thu, 12 Dec 2013 23:27:11 +0000 (18:27 -0500)]
first_deploy() appears to be nearly ready for primetime, so adding it as part of Vagrant VM deployment.

10 years agofetch USDE csv and import it closes #195
Bryan [Thu, 12 Dec 2013 23:12:39 +0000 (18:12 -0500)]
fetch USDE csv and import it closes #195

10 years agoautomating USDE course synchronization for #195, but a bit of swing and miss. fabfile...
Bryan [Thu, 12 Dec 2013 01:20:26 +0000 (20:20 -0500)]
automating USDE course synchronization for #195, but a bit of swing and miss. fabfile modification should be moved under Django's manage.py

10 years agoDjango will now output useful info to gunicorn, closing #196
Bryan [Wed, 11 Dec 2013 23:26:43 +0000 (18:26 -0500)]
Django will now output useful info to gunicorn, closing #196

10 years agocollecting static in case static hosting is not done by S3 (and won't hurt if it is)
Bryan [Wed, 11 Dec 2013 22:32:20 +0000 (17:32 -0500)]
collecting static in case static hosting is not done by S3 (and won't hurt if it is)

10 years agoRuby does not like tilde for home directory.
Bryan [Wed, 11 Dec 2013 07:14:15 +0000 (02:14 -0500)]
Ruby does not like tilde for home directory.

10 years agocopying workaround from #192 to address part of the problem in #171
Bryan [Wed, 11 Dec 2013 06:47:37 +0000 (01:47 -0500)]
copying workaround from #192 to address part of the problem in #171

10 years agoFixing URL formatting mistake
Bryan [Wed, 11 Dec 2013 06:40:44 +0000 (01:40 -0500)]
Fixing URL formatting mistake

10 years agoclosing #191 by adding the VM's private SSH key into the VM.
Bryan [Wed, 11 Dec 2013 06:30:03 +0000 (01:30 -0500)]
closing #191 by adding the VM's private SSH key into the VM.

10 years agoCommenting upon the third party service requirements.
Bryan [Wed, 11 Dec 2013 06:03:52 +0000 (01:03 -0500)]
Commenting upon the third party service requirements.

10 years agoignoring json secrets as well.
Bryan [Wed, 11 Dec 2013 05:25:39 +0000 (00:25 -0500)]
ignoring json secrets as well.

10 years agoFilling out additional example files for storing secrets.
Bryan [Tue, 10 Dec 2013 02:43:20 +0000 (21:43 -0500)]
Filling out additional example files for storing secrets.

10 years agogunicorn logs now, closing #188
Bryan [Fri, 6 Dec 2013 21:29:15 +0000 (16:29 -0500)]
gunicorn logs now, closing #188

10 years agofor #184 nginx deploys with config and for #186 supervisor runs at boot
Bryan [Thu, 5 Dec 2013 05:28:21 +0000 (00:28 -0500)]
for #184 nginx deploys with config and for #186 supervisor runs at boot

10 years agopulling in nginx config
Bryan [Wed, 4 Dec 2013 21:36:27 +0000 (16:36 -0500)]
pulling in nginx config

10 years agoadding nginx.conf from production server to repo 185/head
Seth Woodworth [Wed, 4 Dec 2013 03:58:12 +0000 (22:58 -0500)]
adding nginx.conf from production server to repo

10 years agofixing typos
Bryan [Wed, 4 Dec 2013 03:22:34 +0000 (22:22 -0500)]
fixing typos

10 years agoseparating env, code, and project directories while also making it easier to mix...
Bryan [Wed, 4 Dec 2013 03:08:03 +0000 (22:08 -0500)]
separating env, code, and project directories while also making it easier to mix them for #182

10 years agoreverting back to original, pre-VM setup
Bryan [Wed, 4 Dec 2013 03:07:28 +0000 (22:07 -0500)]
reverting back to original, pre-VM setup

10 years agostreamlining deploy, although with 2 invalid configs, things (static storage and...
Bryan [Wed, 4 Dec 2013 02:08:37 +0000 (21:08 -0500)]
streamlining deploy, although with 2 invalid configs, things (static storage and filepicker) will probably break

10 years agofix to output the file contents properly
Bryan [Wed, 4 Dec 2013 01:22:35 +0000 (20:22 -0500)]
fix to output the file contents properly

10 years agoos-install says rabbitmq is needed, although celery hasn't shown any obvious problems yet
Bryan [Wed, 4 Dec 2013 01:11:55 +0000 (20:11 -0500)]
os-install says rabbitmq is needed, although celery hasn't shown any obvious problems yet

10 years agogenerate database connection info for VM for #178
Bryan [Wed, 4 Dec 2013 01:08:29 +0000 (20:08 -0500)]
generate database connection info for VM for #178

10 years agofirst_deploy completes, supervisord runs (#174), but gunicorn isn't kicking off
Bryan [Mon, 2 Dec 2013 23:58:30 +0000 (18:58 -0500)]
first_deploy completes, supervisord runs (#174), but gunicorn isn't kicking off

10 years agocreating directory structure for supervisord files for #174
Bryan Bonvallet [Wed, 27 Nov 2013 03:30:21 +0000 (22:30 -0500)]
creating directory structure for supervisord files for #174

10 years agoget supervisord up and running for #174
Bryan Bonvallet [Wed, 27 Nov 2013 01:19:11 +0000 (20:19 -0500)]
get supervisord up and running for #174

10 years agoremoving a function that is probably important but not at all defined.
Bryan Bonvallet [Sat, 23 Nov 2013 05:05:39 +0000 (00:05 -0500)]
removing a function that is probably important but not at all defined.

10 years agoReplacing all instances of env.run with virtenv_exec, which is logically equivalent...
Bryan Bonvallet [Sat, 23 Nov 2013 05:04:47 +0000 (00:04 -0500)]
Replacing all instances of env.run with virtenv_exec, which is logically equivalent in the current code base and a bit more clear.