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

11 years agowe can now create RawDocuments
Seth Woodworth [Wed, 28 Aug 2013 16:46:27 +0000 (12:46 -0400)]
we can now create RawDocuments

11 years agoRefactor Note > Document, an Abstract Base Class
Seth Woodworth [Tue, 27 Aug 2013 17:51:53 +0000 (13:51 -0400)]
Refactor Note > Document, an Abstract Base Class
Here I have refactored all of the shared content of the Note model
to the Document model so I can base Note and RawDocument on it
I've also cleanedup .save() validation and generation

11 years agomoving to the sethwoodworth fork of django-filepicker
Seth Woodworth [Tue, 27 Aug 2013 17:47:02 +0000 (13:47 -0400)]
moving to the sethwoodworth fork of django-filepicker

11 years agoadd django-filepicker and a document_upload app for the new document upload workflow
Seth Woodworth [Tue, 27 Aug 2013 13:39:12 +0000 (09:39 -0400)]
add django-filepicker and a document_upload app for the new document upload workflow

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Tue, 27 Aug 2013 13:37:14 +0000 (09:37 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agofront end changes for filepicker integration
Seth Woodworth [Tue, 27 Aug 2013 13:37:00 +0000 (09:37 -0400)]
front end changes for filepicker integration

11 years agoback out dropbox changes
Seth Woodworth [Tue, 27 Aug 2013 13:36:26 +0000 (09:36 -0400)]
back out dropbox changes

11 years agowhitespacebot
Seth Woodworth [Tue, 27 Aug 2013 13:35:35 +0000 (09:35 -0400)]
whitespacebot

11 years agoMIGRATION add Note.draft and set it to True until user submits form, closes #142
Seth Woodworth [Wed, 17 Jul 2013 20:28:14 +0000 (16:28 -0400)]
MIGRATION add Note.draft and set it to True until user submits form, closes #142

11 years agochanged from .rst to .md
Andrew Magliozzi [Wed, 17 Jul 2013 18:43:38 +0000 (14:43 -0400)]
changed from .rst to .md

11 years agoRename README.rst to README.md
Andrew Magliozzi [Wed, 17 Jul 2013 18:41:31 +0000 (14:41 -0400)]
Rename README.rst to README.md

11 years agoWorking supervisord configs + celeryd
bobcall [Mon, 15 Jul 2013 19:33:37 +0000 (15:33 -0400)]
Working supervisord configs + celeryd

11 years agoMore silly changes
bobcall [Mon, 15 Jul 2013 18:44:43 +0000 (14:44 -0400)]
More silly changes

11 years agomore minor changes to fabfile and changed location of beta configs from stag
bobcall [Mon, 15 Jul 2013 18:33:50 +0000 (14:33 -0400)]
more minor changes to fabfile and changed location of beta configs from stag

11 years agofirst draft of the dropbox via ajaxuploader functionality for testing
Seth Woodworth [Fri, 12 Jul 2013 19:26:38 +0000 (15:26 -0400)]
first draft of the dropbox via ajaxuploader functionality for testing

11 years agoadding dropbox file-picker to new template and to the add_note partial
Seth Woodworth [Fri, 12 Jul 2013 17:02:38 +0000 (13:02 -0400)]
adding dropbox file-picker to new template and to the add_note partial

11 years agowhitespacebot
Seth Woodworth [Fri, 12 Jul 2013 17:01:19 +0000 (13:01 -0400)]
whitespacebot

11 years agoMerge branch 'master' of github.com:FinalsClub/karmaworld
Seth Woodworth [Fri, 12 Jul 2013 13:50:48 +0000 (09:50 -0400)]
Merge branch 'master' of github.com:FinalsClub/karmaworld

11 years agosyntax issues
bobcall [Tue, 9 Jul 2013 17:31:33 +0000 (13:31 -0400)]
syntax issues

11 years agowhitespacebot
Seth Woodworth [Tue, 9 Jul 2013 15:33:03 +0000 (11:33 -0400)]
whitespacebot

11 years agoAdding 'careers', 'adults', 'hospital', 'childcare' to RESTRICTED_WORDS
Seth Woodworth [Tue, 9 Jul 2013 15:18:17 +0000 (11:18 -0400)]
Adding 'careers', 'adults', 'hospital', 'childcare' to RESTRICTED_WORDS

11 years agoUpdate os-install.rst
Robert Call [Tue, 9 Jul 2013 13:57:41 +0000 (09:57 -0400)]
Update os-install.rst

Changed postgresql-server to postgresql-9.1

11 years agomore fabfile changes
bobcall [Tue, 9 Jul 2013 13:19:44 +0000 (09:19 -0400)]
more fabfile changes

11 years agocleanup and comment sanitize script
Seth Woodworth [Mon, 8 Jul 2013 19:20:48 +0000 (15:20 -0400)]
cleanup and comment sanitize script

11 years agoadding a management command to santize schools from the usde database
Seth Woodworth [Mon, 8 Jul 2013 18:43:34 +0000 (14:43 -0400)]
adding a management command to santize schools from the usde database

11 years agoLatest changes to fabfile.py and confs/prod/supervisord.conf
bobcall [Wed, 3 Jul 2013 17:23:23 +0000 (13:23 -0400)]
Latest changes to fabfile.py and confs/prod/supervisord.conf

11 years agodisabling Note.sanitize_html in gdrive processing as a workaround
Seth Woodworth [Tue, 2 Jul 2013 20:48:44 +0000 (16:48 -0400)]
disabling Note.sanitize_html in gdrive processing as a workaround

11 years agoMerge pull request #134 from FinalsClub/found4
Seth Woodworth [Tue, 2 Jul 2013 19:51:10 +0000 (12:51 -0700)]
Merge pull request #134 from FinalsClub/found4

Migration to Foundation v4

11 years agomore changes to footer for foundation 4 migration 134/head
Seth Woodworth [Tue, 2 Jul 2013 19:43:49 +0000 (15:43 -0400)]
more changes to footer for foundation 4 migration

11 years agoport site-wide footer to foundation 4
Seth Woodworth [Tue, 2 Jul 2013 19:31:30 +0000 (15:31 -0400)]
port site-wide footer to foundation 4

11 years agofix very-small view of dates on the frontpage for foundation
Seth Woodworth [Tue, 2 Jul 2013 19:19:04 +0000 (15:19 -0400)]
fix very-small view of dates on the frontpage for foundation

11 years agosplit course_list_entry into new template, and refactor for foundation4 mobile
Seth Woodworth [Tue, 2 Jul 2013 18:47:54 +0000 (14:47 -0400)]
split course_list_entry into new template, and refactor for foundation4 mobile

11 years agoport course_detail and note_detail pages to foundation 4, override some foundation...
Seth Woodworth [Tue, 2 Jul 2013 15:24:48 +0000 (11:24 -0400)]
port course_detail and note_detail pages to foundation 4, override some foundation behavior for breadcrumbs

11 years agoport the course_detail page and the add_note form to foundation 4
Seth Woodworth [Tue, 2 Jul 2013 14:43:39 +0000 (10:43 -0400)]
port the course_detail page and the add_note form to foundation 4

11 years agostart migrating the base template and header, start bringing in new foundation files
Seth Woodworth [Mon, 1 Jul 2013 21:59:09 +0000 (17:59 -0400)]
start migrating the base template and header, start bringing in new foundation files

11 years agomigrate add course form to foundation
Seth Woodworth [Mon, 1 Jul 2013 21:57:50 +0000 (17:57 -0400)]
migrate add course form to foundation

11 years agomigrate front page to foundation4, works on ipads
Seth Woodworth [Mon, 1 Jul 2013 21:57:32 +0000 (17:57 -0400)]
migrate front page to foundation4, works on ipads

11 years agomigrate about html and css to foundation4, working for iphones
Seth Woodworth [Mon, 1 Jul 2013 21:56:30 +0000 (17:56 -0400)]
migrate about html and css to foundation4, working for iphones

11 years agooops, fix generating conditional is_pdf and is_ppt in raw PDFView class
Seth Woodworth [Mon, 1 Jul 2013 18:06:07 +0000 (14:06 -0400)]
oops, fix generating conditional is_pdf and is_ppt in raw PDFView class

11 years agomaking assorted changes for ppt file_type marking on the Note model
Seth Woodworth [Mon, 1 Jul 2013 16:50:00 +0000 (12:50 -0400)]
making assorted changes for ppt file_type marking on the Note model

11 years agowhen uploading files to gdrive, ppt files will mark themselves as ppt files
Seth Woodworth [Mon, 1 Jul 2013 16:48:18 +0000 (12:48 -0400)]
when uploading files to gdrive, ppt files will mark themselves as ppt files

11 years agoindentation issue
bobcall [Mon, 1 Jul 2013 05:46:10 +0000 (01:46 -0400)]
indentation issue

11 years agoFixed syntax error and missing '--daemon'
bobcall [Mon, 1 Jul 2013 05:44:04 +0000 (01:44 -0400)]
Fixed syntax error and missing '--daemon'

11 years agoAdded the ability to start gunicorn
bobcall [Mon, 1 Jul 2013 05:32:28 +0000 (01:32 -0400)]
Added the ability to start gunicorn

11 years agomore changes to fab file
bobcall [Mon, 1 Jul 2013 00:46:51 +0000 (20:46 -0400)]
more changes to fab file

11 years agofleshed out fabfile, still needs work, but conceptually works
bobcall [Sun, 30 Jun 2013 18:58:52 +0000 (14:58 -0400)]
fleshed out fabfile, still needs work, but conceptually works

11 years agoAdded remote support and the ability to pull code
bobcall [Sat, 29 Jun 2013 11:08:31 +0000 (07:08 -0400)]
Added remote support and the ability to pull code

11 years agoAdded new fabfile.py to branch fabric
bobcall [Fri, 28 Jun 2013 22:14:40 +0000 (18:14 -0400)]
Added new fabfile.py to branch fabric

11 years agofinish off changes to google drive to allow for ppt > pdf and pdf.js
Seth Woodworth [Wed, 26 Jun 2013 21:10:44 +0000 (21:10 +0000)]
finish off changes to google drive to allow for ppt > pdf and pdf.js

11 years agoMerge branch 'ppt-gdrive' of https://github.com/FinalsClub/karmaworld into ppt-gdrive
Seth Woodworth [Wed, 26 Jun 2013 20:35:10 +0000 (20:35 +0000)]
Merge branch 'ppt-gdrive' of https://github.com/FinalsClub/karmaworld into ppt-gdrive

Conflicts:
karmaworld/apps/notes/gdrive.py