Commit Graph

19654 Commits

Author SHA1 Message Date
Bridger Maxwell
3ed5b161ec Moved simplewiki autosuggest js (it didn't get migrated). Fixed a minor typo in settings.py (it suggested the wrong override location for the static js files) 2012-03-25 20:08:03 -07:00
Bridger Maxwell
d809b68b2c Fixed slight difference between master branch 2012-03-25 15:11:46 -04:00
Bridger Maxwell
2f15424acc Merged in master branch 2012-03-25 15:05:37 -04:00
David Ormsbee
7ffa71d45e move logging config to separate file 2012-03-24 21:30:56 -04:00
Bridger Maxwell
2aca626440 Changed gradebook to be a table. 2012-03-24 15:32:11 -04:00
Calen Pennington
a8a4b49d0b Correctly grab the build number from the environment when packaging 2012-03-23 14:35:36 -04:00
Calen Pennington
b5652552df Switching to rake for build management 2012-03-23 14:30:05 -04:00
David Ormsbee
942bfd233d fixed typo in devplus env 2012-03-23 12:24:01 -04:00
David Ormsbee
148ec47107 document assumptions for devplus env 2012-03-23 12:15:27 -04:00
David Ormsbee
6d3d83e3aa Turned on settings and profiling in django_toolbar for dev settings 2012-03-23 10:55:37 -04:00
David Ormsbee
8a2fb65448 minor organizational changes to the dev config file to put things more likely to change up top 2012-03-23 10:49:33 -04:00
David Ormsbee
bd7740a8dd removed conditional loading of apps 2012-03-23 10:48:49 -04:00
Reda Lemeden
8fe162a2b5 Merge pull request #3 from MITx/kf-calculator
Added some styles so that the hints for the calculator pop up
2012-03-22 14:05:58 -07:00
Kyle Fiedler
e81bc425cb Added return false on clicks for calculator 2012-03-22 16:37:36 -04:00
Kyle Fiedler
3512df424e Added image for info 2012-03-22 16:37:36 -04:00
Kyle Fiedler
813fc488c6 Spead up animation and added diferent wording 2012-03-22 16:37:36 -04:00
Kyle Fiedler
6627153e1c Added styles for the calc hint 2012-03-22 16:37:36 -04:00
Kyle Fiedler
1be8d198ab Added a fake deactivate and unenroll links and some style for profile 2012-03-22 15:32:31 -04:00
David Ormsbee
d267812f7e make settings2 config aware of courseware problem templates 2012-03-22 13:37:07 -04:00
David Ormsbee
e36f309bb8 update symlinks to keep references to static assets in wiki happy 2012-03-22 13:36:18 -04:00
David Ormsbee
db9e5282b2 re-add debug_toolbar to dev config 2012-03-22 13:27:02 -04:00
David Ormsbee
1a5abdf696 move more dev specific config (uploads, dummy caching) into dev.py 2012-03-22 13:21:06 -04:00
Calen Pennington
8c893ab384 Adding pip requirement files. Pre-requirements must be run first, because scipy needs numpy already installed when executing the scipy installer 2012-03-22 12:37:07 -04:00
Calen Pennington
009f951483 Don't execute the site-specific settings file if it doesn't exist 2012-03-22 12:37:07 -04:00
Calen Pennington
8593d45e90 Add dependencies to build .deb 2012-03-22 12:37:07 -04:00
Calen Pennington
1a248aabca Switch to fpm to build installable package 2012-03-22 12:37:07 -04:00
David Ormsbee
e253ea25d5 added dir structure assumptions to dev.py env config 2012-03-22 11:39:04 -04:00
David Ormsbee
2ab562f792 moved template related config together, removed some cruft 2012-03-22 11:37:49 -04:00
David Ormsbee
18fb637f1b remove redundancy between dev and devplus envs in config 2012-03-22 11:36:40 -04:00
David Ormsbee
4bcfaed598 update settings2's askbot to reflect new karma limits 2012-03-22 11:35:34 -04:00
David Ormsbee
e3e8edcf81 Update location of JS assets for local debugging (most envs use S3), remove old link to 3rdParty repo (which is no longer used) 2012-03-22 10:48:40 -04:00
David Ormsbee
aea72a62f7 matching settings2 to old settings -- fix template lookup 2012-03-22 10:43:32 -04:00
David Ormsbee
2eedce0139 Allow gunicorn_django to serve static files when DEBUG=True 2012-03-21 17:54:58 -04:00
Kyle Fiedler
84ac8a1d2a Added some styles for name and email change 2012-03-21 17:06:37 -04:00
Piotr Mitros
edfff32338 Incorporated Dave's feedback 2012-03-21 14:19:36 -04:00
Piotr Mitros
399ea8e41e Removed duplicates 2012-03-21 11:03:45 -04:00
Piotr Mitros
f2878b549c Merge. Note duplicate e-mail subject files 2012-03-21 11:03:01 -04:00
David Ormsbee
f0ac9cae6a remove some outdated comments 2012-03-21 10:45:32 -04:00
Piotr Mitros
8a13b8c45b Minor cleanup of auxilliary changes to models 2012-03-21 10:39:56 -04:00
Piotr Mitros
bb288663db Last commit missing -a 2012-03-21 10:10:49 -04:00
Piotr Mitros
7986c7547b Name and e-mail change functionality appears to work -- needs graphic design 2012-03-21 09:39:32 -04:00
Piotr Mitros
75c5c1ce74 Name changes work, but meta storage not tested 2012-03-20 22:27:30 -04:00
David Ormsbee
4758ed10b3 raise karma limits on certain actions, disable askbot-wiki 2012-03-20 17:32:52 -04:00
Calen Pennington
6a744c8283 Merge pull request #1 from MITx/kf-calculator
Added styles for new calc and updated bourbon
2012-03-20 11:47:38 -07:00
Kyle Fiedler
3fadf0e16c Added styles for new calc and updated bourbon 2012-03-20 14:11:25 -04:00
Piotr Mitros
2b173379e5 E-mail changes appear to work 2012-03-20 09:37:15 -04:00
Calen Pennington
f1aea3d5e7 Don't list all the contents of the tar file 2012-03-20 09:30:13 -04:00
Calen Pennington
d468e7c679 Make build commands verbose and fail-fast 2012-03-20 09:30:03 -04:00
Piotr Mitros
2e905dc70c More of e-mail change process works 2012-03-19 21:24:21 -04:00
Kyle Fiedler
a3eb345bb1 added fixes for info updates 2012-03-19 16:19:15 -04:00