merging old commit with current master
[oweals/karmaworld.git] / karmaworld / settings / common.py
2014-02-26 Bryanmerging old commit with current master
2014-02-25 BryanMerge branch 'feature_honeypot'
2014-02-25 Bryanhoneypot working for #210 and cleaned up the form error...
2014-02-23 Bryanfailed attempt to check for a blank honeypot, form...
2014-02-17 Charles ConnellOops
2014-02-17 Charles ConnellIf we can't test search indexing properly, let's not...
2014-02-10 Bryanfor #294 : replaced manual school_list JSON with module...
2014-02-04 Charles ConnellMerge pull request #314 from FinalsClub/208-edit-course...
2014-02-03 Charles ConnellRedirect authenticated users to HTTPS pages
2014-02-02 Jacob HilkerMerge branch 'master' into 208-edit-course-properties...
2014-02-02 Charles ConnellMake local development of static assets easier, also...
2014-02-02 Jacob Hilkeruse middleware for revision
2014-02-02 Jacob Hilkeradd reversion
2014-01-24 Charles ConnellAllow users to decide their username on account creatio...
2014-01-23 Charles ConnellFix to note/user association
2014-01-21 Charles ConnellCapture names from 3rd party auth accounts
2014-01-17 Charles ConnellRe-enable search indexing, S3 support for dev environment
2014-01-16 Bryanweird merge problem?
2014-01-16 Charles ConnellSmall 1.5 compatibility things
2014-01-15 Charles ConnellSlightly nicer emails
2014-01-15 BryanFQDN fails, so just use the domain names without traili...
2014-01-14 BryanMerge branch 'master' into django155
2014-01-14 Bryaninclusion of json_pretty for dumping with better UTF8...
2014-01-14 Charles ConnellRevert change to SITE_NAME
2014-01-13 Charles ConnellEmail settings
2014-01-12 BryanALLOWED_HOSTS is now a required field, supporting local...
2014-01-11 Charles ConnellImproving login experience
2014-01-09 Charles ConnellFirst go at a user system #240 #255 #256
2014-01-08 BryanReverting half-merged commits b6f336c6a13b2a41b2c29b358...
2014-01-07 Bryanneed to include the model location.
2014-01-04 Charles ConnellRemember who thanked or flagged notes by session cookie...
2014-01-03 BryanAdding License tracking, upstream file tracking, and...
2013-12-31 Bryancreating moderator site for moderating flagged documents.
2013-12-20 Bryanresolving merge conflict by adding both requirements.
2013-12-20 Charles ConnellAccept uploaders' email addresses
2013-12-18 Bryan BonvalletMerge pull request #164 from FinalsClub/filepick.io
2013-12-17 BryanMerge remote-tracking branch 'origin/filepick.io' into...
2013-12-17 BryanMerge filepick.io into feature_vagrant_startup
2013-12-17 Charles ConnellRemove unused code: ajaxuploader, lightboxes, and other...
2013-12-13 Bryan BonvalletMerge branch 'filepick.io' of ssh://github.com/FinalsCl...
2013-12-13 Bryan BonvalletChanging SITE_ID from 2 (less than 1% use case) to...
2013-12-11 BryanDjango will now output useful info to gunicorn, closing...
2013-08-28 Seth WoodworthMerge remote-tracking branch 'origin/fabric' into fp.io
2013-08-28 Seth Woodworthwe can now create RawDocuments
2013-08-27 Seth Woodworthadd django-filepicker and a document_upload app for...
2013-02-01 Charles HolbrowMerge branch 'master' of github.com:FinalsClub/karmaworld
2013-02-01 Seth WoodworthMerge branch 'master' of github.com:FinalsClub/karmaworld
2013-02-01 Robert CallFixed common.py and dev.py
2013-01-30 Charles HolbrowMerge branch 'master' of github.com:FinalsClub/karmaworld
2013-01-29 Seth Woodworthadding django-grapelli, and adding a fkey lookup from...
2013-01-18 Charles HolbrowMerge branch 'master' of github.com:FinalsClub/karmaworld
2013-01-17 Seth Woodworthadding ajaxuploader to installed apps in settings/common.py
2013-01-14 Charles HolbrowMerge branch 'master' of github.com:FinalsClub/karmaworld
2013-01-14 Seth WoodworthMerge pull request #29 from LucianU/master
2013-01-14 Seth Woodworthset admins + admin emails and set America/New_York...
2013-01-04 Seth Woodworthadding courses app, Course and School models
2013-01-03 Seth Woodworthadding notes app with Note model and adding taggit...
2013-01-02 Seth Woodworthbasing the django project on rdegges' django-skel