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

11 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

11 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

11 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.

11 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.

11 years agoSame meaning for psycopg2, but removing explicit localhost allows unix domain user...
Bryan Bonvallet [Sat, 23 Nov 2013 05:02:01 +0000 (00:02 -0500)]
Same meaning for psycopg2, but removing explicit localhost allows unix domain user auth sans password

11 years agoRemoving here() antipattern, fixing virtualenv deployment, and ensuring prereqs are...
Bryan Bonvallet [Sat, 23 Nov 2013 03:51:04 +0000 (22:51 -0500)]
Removing here() antipattern, fixing virtualenv deployment, and ensuring prereqs are installed on Vagrant VM

11 years agoHot fix to allow full folder upload to KarmaNotes
Andrew Magliozzi [Tue, 19 Nov 2013 13:51:06 +0000 (08:51 -0500)]
Hot fix to allow full folder upload to KarmaNotes

11 years agoadditional dependencies and instructions for them
Bryan Bonvallet [Mon, 18 Nov 2013 07:11:45 +0000 (02:11 -0500)]
additional dependencies and instructions for them

11 years agoAdding some lower bound version number for Vagrant after fighting with version 1...
Bryan Bonvallet [Mon, 18 Nov 2013 03:02:10 +0000 (22:02 -0500)]
Adding some lower bound version number for Vagrant after fighting with version 1.0.x from apt distro. not sure what the minimum acceptable version is, but this will be a helpful guideline

11 years agoUpdate common.txt
Robert Call [Tue, 12 Nov 2013 23:33:41 +0000 (18:33 -0500)]
Update common.txt

Added fabric-virtualenv

11 years agomore useful information about interacting with the VM
Bryan [Mon, 11 Nov 2013 05:48:54 +0000 (00:48 -0500)]
more useful information about interacting with the VM

11 years agominor typo correct and clarification
Bryan [Mon, 11 Nov 2013 05:36:47 +0000 (00:36 -0500)]
minor typo correct and clarification

11 years agofixing markdown link mistakes
Bryan [Mon, 11 Nov 2013 05:33:56 +0000 (00:33 -0500)]
fixing markdown link mistakes

11 years agonew branch for establishing a production-ready KarmaWorld VM which is used solely...
Bryan [Mon, 11 Nov 2013 05:25:33 +0000 (00:25 -0500)]
new branch for establishing a production-ready KarmaWorld VM which is used solely for develpment and local testing.

11 years agofixed typo
Andrew Magliozzi [Fri, 8 Nov 2013 16:26:28 +0000 (11:26 -0500)]
fixed typo

11 years agoUpdate filepicker.html
Andrew Magliozzi [Fri, 8 Nov 2013 15:22:57 +0000 (10:22 -0500)]
Update filepicker.html

11 years agofixing line return errors
Andrew Magliozzi [Fri, 8 Nov 2013 14:56:58 +0000 (09:56 -0500)]
fixing line return errors

11 years agoAdding facebook ads tracking pixel to upload thank you partial
Andrew Magliozzi [Fri, 8 Nov 2013 14:49:52 +0000 (09:49 -0500)]
Adding facebook ads tracking pixel to upload thank you partial

11 years agoRemoved Install section from README.md and pointed to docs/source/os-install.rst
bobcall [Thu, 31 Oct 2013 12:55:06 +0000 (08:55 -0400)]
Removed Install section from README.md and pointed to docs/source/os-install.rst

11 years agoAdded TODO.rst to /docs/source
bobcall [Thu, 31 Oct 2013 12:51:49 +0000 (08:51 -0400)]
Added TODO.rst to /docs/source

11 years agoRemoved step 4 and made ref. to os-install.rst docs
bobcall [Thu, 31 Oct 2013 12:41:46 +0000 (08:41 -0400)]
Removed step 4 and made ref. to os-install.rst docs

11 years agofixed fabric supervisord.conf to use absolute paths
bobcall [Thu, 31 Oct 2013 12:23:11 +0000 (08:23 -0400)]
fixed fabric supervisord.conf to use absolute paths

11 years agoAdded remaining secret templates
bobcall [Thu, 31 Oct 2013 12:21:10 +0000 (08:21 -0400)]
Added remaining secret templates

11 years agomoved static_s3.py from SRC_ROOT/confs/prod to karmaworld/secret
bobcall [Thu, 31 Oct 2013 12:14:05 +0000 (08:14 -0400)]
moved static_s3.py from SRC_ROOT/confs/prod to karmaworld/secret

11 years agoRe-disable the HTML sanitize for now
Josh Williams [Tue, 15 Oct 2013 19:43:02 +0000 (15:43 -0400)]
Re-disable the HTML sanitize for now

11 years agoanalytics tracking restored
Andrew Magliozzi [Tue, 15 Oct 2013 19:42:52 +0000 (15:42 -0400)]
analytics tracking restored

11 years agoPut slug look-up back into place, seems good
Josh Williams [Tue, 15 Oct 2013 19:27:48 +0000 (15:27 -0400)]
Put slug look-up back into place, seems good

11 years agoTest-Remove slug duplicate look-up for the moment
Josh Williams [Tue, 15 Oct 2013 19:02:55 +0000 (15:02 -0400)]
Test-Remove slug duplicate look-up for the moment

11 years ago===
Andrew Magliozzi [Tue, 15 Oct 2013 18:39:46 +0000 (14:39 -0400)]
===

11 years agocomment out google analytics tracking
Andrew Magliozzi [Tue, 15 Oct 2013 18:38:45 +0000 (14:38 -0400)]
comment out google analytics tracking

11 years agomove upload form submit tracker to post request 'success' block
Andrew Magliozzi [Mon, 7 Oct 2013 12:31:10 +0000 (08:31 -0400)]
move upload form submit tracker to post request 'success' block

11 years agomoving #save-btn click handler into 'makeFileForm' function
Andrew Magliozzi [Sun, 6 Oct 2013 15:10:43 +0000 (11:10 -0400)]
moving #save-btn click handler into 'makeFileForm' function

Also removing legacy code from the filepicker drag-drop widget that we no longer use.

11 years agoApply the same fix to another _trackEvent call
Josh Williams [Fri, 4 Oct 2013 19:29:54 +0000 (15:29 -0400)]
Apply the same fix to another _trackEvent call

11 years agoCall GA _trackEvent through _gat global
Josh Williams [Fri, 4 Oct 2013 18:50:49 +0000 (14:50 -0400)]
Call GA _trackEvent through _gat global

11 years agohopeful fix
Andrew Magliozzi [Fri, 4 Oct 2013 18:16:25 +0000 (14:16 -0400)]
hopeful fix

11 years agoattempt to fix save button show / hide
Andrew Magliozzi [Fri, 4 Oct 2013 18:12:19 +0000 (14:12 -0400)]
attempt to fix save button show / hide

11 years agomoving google analytics method to post request click handler
Andrew Magliozzi [Fri, 4 Oct 2013 17:27:32 +0000 (13:27 -0400)]
moving google analytics method to post request click handler

11 years agofixed google analytics upload and form submit tracking
Andrew Magliozzi [Fri, 4 Oct 2013 16:02:56 +0000 (12:02 -0400)]
fixed google analytics upload and form submit tracking

using event tracking method _trackEvent(args)

11 years agoUpdate filepicker.html
Andrew Magliozzi [Fri, 4 Oct 2013 15:36:27 +0000 (11:36 -0400)]
Update filepicker.html

11 years agoSwitch to filepicker Drag & Drop widget
Josh Williams [Fri, 4 Oct 2013 15:11:01 +0000 (11:11 -0400)]
Switch to filepicker Drag & Drop widget

11 years agoAdd remove class to X button, move click handler
Josh Williams [Fri, 4 Oct 2013 14:21:58 +0000 (10:21 -0400)]
Add remove class to X button, move click handler

11 years agoAdd a orange highlight to number of notes
Josh Williams [Fri, 4 Oct 2013 14:06:21 +0000 (10:06 -0400)]
Add a orange highlight to number of notes

11 years agoRe-enable HTML santize, only run if 'html' present
Josh Williams [Fri, 4 Oct 2013 13:59:48 +0000 (09:59 -0400)]
Re-enable HTML santize, only run if 'html' present

11 years agoSwitch back import to "secrets" for now
Josh Williams [Fri, 4 Oct 2013 13:27:16 +0000 (09:27 -0400)]
Switch back import to "secrets" for now

11 years agoUse libmagic to extract the file's creation year
Josh Williams [Fri, 4 Oct 2013 13:01:09 +0000 (09:01 -0400)]
Use libmagic to extract the file's creation year

NOTE: This adds a new Python module requirement.
The added function can of course be expanded to return anything else
the libmagic routine could provide in the future.

11 years agoAdd on-success action to file upload save - #158
Josh Williams [Tue, 1 Oct 2013 21:14:06 +0000 (17:14 -0400)]
Add on-success action to file upload save - #158

Currently, show a 'thank you' message showing the user which files were
uploaded, and automatically refresh the page 15 seconds later.

11 years agoFix slug generation to prevent collisions.
Josh Williams [Mon, 30 Sep 2013 21:36:38 +0000 (17:36 -0400)]
Fix slug generation to prevent collisions.

11 years agoFix Note view breadcrumbs linking back to Course
Josh Williams [Mon, 30 Sep 2013 20:16:34 +0000 (16:16 -0400)]
Fix Note view breadcrumbs linking back to Course

11 years agoAdd missing .txt file type
Josh Williams [Mon, 30 Sep 2013 19:41:54 +0000 (15:41 -0400)]
Add missing .txt file type

... Though we don't seem to use it at the moment, instead leaning on
GDrive for the handling of the type.

Also include same import fix as gdrive.py

11 years agoClean up PPT converted PDF to save properly
Josh Williams [Thu, 26 Sep 2013 22:17:27 +0000 (18:17 -0400)]
Clean up PPT converted PDF to save properly

11 years agoDetect and display PDF and PPT note files
Josh Williams [Thu, 26 Sep 2013 19:27:29 +0000 (15:27 -0400)]
Detect and display PDF and PPT note files

11 years agoMark document as is_processed=True to avoid loop
Josh Williams [Tue, 24 Sep 2013 21:18:11 +0000 (17:18 -0400)]
Mark document as is_processed=True to avoid loop

The .save() immediately following this checked is_processed, found it to
be False, and kicked off a whole new processing task; lather, rinse,
repeat.  We may want to refactor something else, but this fixes that for
now.

11 years agoAdding the delete button has changed field offsets
Josh Williams [Tue, 24 Sep 2013 21:13:07 +0000 (17:13 -0400)]
Adding the delete button has changed field offsets

11 years agoMinor name adjustments
Josh Williams [Tue, 24 Sep 2013 20:00:58 +0000 (16:00 -0400)]
Minor name adjustments

11 years agoslight change
Andrew Magliozzi [Tue, 24 Sep 2013 19:29:53 +0000 (15:29 -0400)]
slight change

11 years agoadded a console.log
Andrew Magliozzi [Tue, 24 Sep 2013 19:27:18 +0000 (15:27 -0400)]
added a console.log

11 years agoslight adjustment to foundation columns
Andrew Magliozzi [Tue, 24 Sep 2013 19:26:17 +0000 (15:26 -0400)]
slight adjustment to foundation columns

11 years agofirst pass at the X to remove files from the upload form
Andrew Magliozzi [Tue, 24 Sep 2013 19:24:12 +0000 (15:24 -0400)]
first pass at the X to remove files from the upload form

11 years agofixed save button alignment in filepicker partial
Andrew Magliozzi [Tue, 24 Sep 2013 17:08:19 +0000 (13:08 -0400)]
fixed save button alignment in filepicker partial

11 years agoprelim changes to foundation grid in filepicker partial
Andrew Magliozzi [Tue, 24 Sep 2013 17:05:15 +0000 (13:05 -0400)]
prelim changes to foundation grid in filepicker partial

11 years agoAdjust the styles of the filepicker Save button
Josh Williams [Tue, 24 Sep 2013 16:40:12 +0000 (12:40 -0400)]
Adjust the styles of the filepicker Save button

11 years agocomment to an unused partial
Andrew Magliozzi [Tue, 24 Sep 2013 16:21:52 +0000 (12:21 -0400)]
comment to an unused partial

11 years agoincremental changes to the filepicker form partial
Andrew Magliozzi [Tue, 24 Sep 2013 16:19:58 +0000 (12:19 -0400)]
incremental changes to the filepicker form partial

11 years agoremoving drag-drop zone from filepicker partial
Andrew Magliozzi [Tue, 24 Sep 2013 16:02:59 +0000 (12:02 -0400)]
removing drag-drop zone from filepicker partial

11 years agosmall fix
Andrew Magliozzi [Tue, 24 Sep 2013 15:53:31 +0000 (11:53 -0400)]
small fix

11 years agoadjusting requirement for django filepicker version
Andrew Magliozzi [Tue, 24 Sep 2013 15:50:36 +0000 (11:50 -0400)]
adjusting requirement for django filepicker version

11 years agoLarge in-progress checkin for filepicker integration.
Seth Woodworth [Tue, 24 Sep 2013 13:53:16 +0000 (13:53 +0000)]
Large in-progress checkin for filepicker integration.
includes model form view js and html changes across the board. Also includes a lot of debug print statements

11 years agoadd djcelery to the wsgi interface
Seth Woodworth [Tue, 24 Sep 2013 13:51:01 +0000 (13:51 +0000)]
add djcelery to the wsgi interface

11 years agoproduction by default
Seth Woodworth [Tue, 24 Sep 2013 13:50:44 +0000 (13:50 +0000)]
production by default

11 years agoMerge branch 'filepick.io' of https://github.com/FinalsClub/karmaworld into fp.io
Seth Woodworth [Wed, 28 Aug 2013 21:51:17 +0000 (21:51 +0000)]
Merge branch 'filepick.io' of https://github.com/FinalsClub/karmaworld into fp.io

11 years agofix depricated import bug
Seth Woodworth [Wed, 28 Aug 2013 21:51:09 +0000 (17:51 -0400)]
fix depricated import bug

11 years agoMerge remote-tracking branch 'origin/fabric' into fp.io
Seth Woodworth [Wed, 28 Aug 2013 21:39:20 +0000 (21:39 +0000)]
Merge remote-tracking branch 'origin/fabric' into fp.io

11 years agoadd the opentip html template (oops)
Seth Woodworth [Wed, 28 Aug 2013 21:22:49 +0000 (17:22 -0400)]
add the opentip html template (oops)

11 years agochecking in forgotten files for the document conversion
Seth Woodworth [Wed, 28 Aug 2013 20:50:08 +0000 (16:50 -0400)]
checking in forgotten files for the document conversion

11 years agoadd polymorphism to RawDocument and super() save to register a celery task
Seth Woodworth [Wed, 28 Aug 2013 20:16:49 +0000 (16:16 -0400)]
add polymorphism to RawDocument and super() save to register a celery task

11 years agochange file upload directory structure
Seth Woodworth [Wed, 28 Aug 2013 17:45:23 +0000 (13:45 -0400)]
change file upload directory structure

11 years agocleanup CBV for document_upload
Seth Woodworth [Wed, 28 Aug 2013 17:45:07 +0000 (13:45 -0400)]
cleanup CBV for document_upload

11 years agorefactor RawDocument model
Seth Woodworth [Wed, 28 Aug 2013 16:47:16 +0000 (12:47 -0400)]
refactor RawDocument model

11 years agocleanup for Note.draft >> is_hidden
Seth Woodworth [Wed, 28 Aug 2013 16:46:52 +0000 (12:46 -0400)]
cleanup for Note.draft >> is_hidden