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

10 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

10 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

10 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

10 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

10 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

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

Added fabric-virtualenv

10 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

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

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

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

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

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

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

10 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

10 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

10 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

10 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

10 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

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

10 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

10 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

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

10 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

10 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

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

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

10 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

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

10 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

10 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

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

10 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

10 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

10 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)

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

10 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

10 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

10 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

10 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

10 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

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

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

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

10 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

10 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

10 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

10 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

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

10 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