Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • e0e8e1e5e6 Fixes from pull request comments. Added Score namedtuple. Bridger Maxwell 2012-03-26 09:38:58 -07:00
  • e5dba8c95e Ignore the build directory Calen Pennington 2012-03-26 10:18:15 -04:00
  • ba148ee54f Make sure the installed repo is in the right location Calen Pennington 2012-03-26 10:17:55 -04:00
  • 54eb8e4e87 Exclude .pyc files from the deployed data Calen Pennington 2012-03-26 10:17:18 -04:00
  • 8fce7066da You can now edit a circuit directly on the edit page of the wiki. These edits show up in the history. This hasn't been tested much. Bridger Maxwell 2012-03-25 20:39:21 -07:00
  • 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) Bridger Maxwell 2012-03-25 20:08:03 -07:00
  • d809b68b2c Fixed slight difference between master branch Bridger Maxwell 2012-03-25 15:11:46 -04:00
  • 2f15424acc Merged in master branch Bridger Maxwell 2012-03-25 15:05:37 -04:00
  • 7ffa71d45e move logging config to separate file David Ormsbee 2012-03-24 21:30:56 -04:00
  • 2aca626440 Changed gradebook to be a table. Bridger Maxwell 2012-03-24 15:32:11 -04:00
  • a8a4b49d0b Correctly grab the build number from the environment when packaging Calen Pennington 2012-03-23 14:35:36 -04:00
  • b5652552df Switching to rake for build management Calen Pennington 2012-03-23 14:29:56 -04:00
  • 942bfd233d fixed typo in devplus env David Ormsbee 2012-03-23 12:24:01 -04:00
  • 148ec47107 document assumptions for devplus env David Ormsbee 2012-03-23 12:15:27 -04:00
  • 6d3d83e3aa Turned on settings and profiling in django_toolbar for dev settings David Ormsbee 2012-03-23 10:55:37 -04:00
  • 8a2fb65448 minor organizational changes to the dev config file to put things more likely to change up top David Ormsbee 2012-03-23 10:49:33 -04:00
  • bd7740a8dd removed conditional loading of apps David Ormsbee 2012-03-23 10:48:49 -04:00
  • 8fe162a2b5 Merge pull request #3 from MITx/kf-calculator Reda Lemeden 2012-03-22 14:05:58 -07:00
  • e81bc425cb Added return false on clicks for calculator Kyle Fiedler 2012-03-22 16:37:29 -04:00
  • 3512df424e Added image for info Kyle Fiedler 2012-03-21 10:17:35 -04:00
  • 813fc488c6 Spead up animation and added diferent wording Kyle Fiedler 2012-03-21 10:17:01 -04:00
  • 6627153e1c Added styles for the calc hint Kyle Fiedler 2012-03-21 09:51:23 -04:00
  • 1be8d198ab Added a fake deactivate and unenroll links and some style for profile Kyle Fiedler 2012-03-22 15:32:31 -04:00
  • d267812f7e make settings2 config aware of courseware problem templates David Ormsbee 2012-03-22 13:37:07 -04:00
  • e36f309bb8 update symlinks to keep references to static assets in wiki happy David Ormsbee 2012-03-22 13:36:18 -04:00
  • db9e5282b2 re-add debug_toolbar to dev config David Ormsbee 2012-03-22 13:27:02 -04:00
  • 1a5abdf696 move more dev specific config (uploads, dummy caching) into dev.py David Ormsbee 2012-03-22 13:21:06 -04:00
  • 8c893ab384 Adding pip requirement files. Pre-requirements must be run first, because scipy needs numpy already installed when executing the scipy installer Calen Pennington 2012-03-22 12:19:46 -04:00
  • 009f951483 Don't execute the site-specific settings file if it doesn't exist Calen Pennington 2012-03-22 12:01:47 -04:00
  • 8593d45e90 Add dependencies to build .deb Calen Pennington 2012-03-22 12:01:32 -04:00
  • 1a248aabca Switch to fpm to build installable package Calen Pennington 2012-03-22 11:56:24 -04:00
  • e253ea25d5 added dir structure assumptions to dev.py env config David Ormsbee 2012-03-22 11:39:04 -04:00
  • 2ab562f792 moved template related config together, removed some cruft David Ormsbee 2012-03-22 11:37:49 -04:00
  • 18fb637f1b remove redundancy between dev and devplus envs in config David Ormsbee 2012-03-22 11:36:40 -04:00
  • 4bcfaed598 update settings2's askbot to reflect new karma limits David Ormsbee 2012-03-22 11:35:34 -04:00
  • e3e8edcf81 Update location of JS assets for local debugging (most envs use S3), remove old link to 3rdParty repo (which is no longer used) David Ormsbee 2012-03-22 10:48:40 -04:00
  • aea72a62f7 matching settings2 to old settings -- fix template lookup David Ormsbee 2012-03-22 10:43:32 -04:00
  • 2eedce0139 Allow gunicorn_django to serve static files when DEBUG=True David Ormsbee 2012-03-21 17:54:58 -04:00
  • 84ac8a1d2a Added some styles for name and email change Kyle Fiedler 2012-03-21 17:06:37 -04:00
  • edfff32338 Incorporated Dave's feedback Piotr Mitros 2012-03-21 14:19:36 -04:00
  • 399ea8e41e Removed duplicates Piotr Mitros 2012-03-21 11:03:45 -04:00
  • f2878b549c Merge. Note duplicate e-mail subject files Piotr Mitros 2012-03-21 11:03:01 -04:00
  • f0ac9cae6a remove some outdated comments David Ormsbee 2012-03-21 10:45:32 -04:00
  • 8a13b8c45b Minor cleanup of auxilliary changes to models Piotr Mitros 2012-03-21 10:39:56 -04:00
  • bb288663db Last commit missing -a Piotr Mitros 2012-03-21 10:10:49 -04:00
  • 7986c7547b Name and e-mail change functionality appears to work -- needs graphic design Piotr Mitros 2012-03-21 09:39:32 -04:00
  • 75c5c1ce74 Name changes work, but meta storage not tested Piotr Mitros 2012-03-20 22:27:30 -04:00
  • 4758ed10b3 raise karma limits on certain actions, disable askbot-wiki David Ormsbee 2012-03-20 17:32:47 -04:00
  • 6a744c8283 Merge pull request #1 from MITx/kf-calculator Calen Pennington 2012-03-20 11:47:38 -07:00
  • 3fadf0e16c Added styles for new calc and updated bourbon Kyle Fiedler 2012-03-20 14:10:32 -04:00
  • 2b173379e5 E-mail changes appear to work Piotr Mitros 2012-03-20 09:37:15 -04:00
  • f1aea3d5e7 Don't list all the contents of the tar file Calen Pennington 2012-03-20 09:30:13 -04:00
  • d468e7c679 Make build commands verbose and fail-fast Calen Pennington 2012-03-20 09:30:03 -04:00
  • 2e905dc70c More of e-mail change process works Piotr Mitros 2012-03-19 21:24:21 -04:00
  • a3eb345bb1 added fixes for info updates Kyle Fiedler 2012-03-19 16:19:15 -04:00
  • 9bd5fbab2d removed the sass cache Kyle Fiedler 2012-03-19 14:51:39 -04:00
  • 086b1bf08b Forcing bash for ci build Calen Pennington 2012-03-19 13:15:25 -04:00
  • ca50fe027e Remove origin/ and replace '/' in branch names in tar file Calen Pennington 2012-03-19 13:11:06 -04:00
  • 7541737c15 Fix how the tar is built Calen Pennington 2012-03-19 13:05:01 -04:00
  • faa34e2683 Make build script executable Calen Pennington 2012-03-19 12:20:00 -04:00
  • 8fe8bb6604 Adding folder for ci scripts, and initial script for packaging repo Calen Pennington 2012-03-19 12:19:29 -04:00
  • 71cc49184b Merge remote-tracking branch '3rdParty/master' Calen Pennington 2012-03-19 11:10:49 -04:00
  • a445c2cc2b Merge remote-tracking branch 'templates/master' Calen Pennington 2012-03-19 11:10:49 -04:00
  • 8b620c32d5 Merge remote-tracking branch 'static/master' Calen Pennington 2012-03-19 11:10:49 -04:00
  • 562418504a Merge remote-tracking branch '3rdParty/master' into bridger-grades Calen Pennington 2012-03-19 11:10:48 -04:00
  • 1457c21f41 Merge remote-tracking branch '3rdParty/master' into pmitros-name-change Calen Pennington 2012-03-19 11:10:48 -04:00
  • d862cb2232 Merge remote-tracking branch 'templates/bridger-grades' into bridger-grades Calen Pennington 2012-03-19 11:10:48 -04:00
  • 7954f9d482 Merge remote-tracking branch 'templates/pmitros-name-change' into pmitros-name-change Calen Pennington 2012-03-19 11:10:48 -04:00
  • c04d49385c Merge remote-tracking branch 'static/master' into bridger-grades Calen Pennington 2012-03-19 11:10:48 -04:00
  • 6c9b8e727e Merge remote-tracking branch 'static/master' into pmitros-name-change Calen Pennington 2012-03-19 11:10:48 -04:00
  • fdc5cd94a9 Move to subdirectory in prepartion for merge Calen Pennington 2012-03-19 11:10:44 -04:00
  • 522ee0584b Copying hgignore to gitignore Calen Pennington 2012-03-19 11:10:44 -04:00
  • 98dd48f9da Move to subdirectory in prepartion for merge Calen Pennington 2012-03-19 11:10:44 -04:00
  • 2f0b39189a Move to subdirectory in prepartion for merge Calen Pennington 2012-03-19 11:10:44 -04:00
  • efb96251f8 Copying hgignore to gitignore Calen Pennington 2012-03-19 11:10:44 -04:00
  • d094d8c1dd Copying hgignore to gitignore Calen Pennington 2012-03-19 11:10:44 -04:00
  • fc68777119 Fix up the symlinks to point to the right place Calen Pennington 2012-03-19 11:10:44 -04:00
  • 317542ad19 Updating pointers to new merged repo locations Calen Pennington 2012-03-19 11:10:44 -04:00
  • ceffe4a875 Updating pointers to new merged repo locations Calen Pennington 2012-03-19 11:10:44 -04:00
  • 816edd1904 Updating pointers to new merged repo locations Calen Pennington 2012-03-19 11:10:44 -04:00
  • 1bc3835fe6 Splitting files into subdirectories in preparation for merge Calen Pennington 2012-03-19 11:10:44 -04:00
  • a20b01c081 Splitting files into subdirectories in preparation for merge Calen Pennington 2012-03-19 11:10:44 -04:00
  • 6dc7fd6ea5 Splitting files into subdirectories in preparation for merge Calen Pennington 2012-03-19 11:10:44 -04:00
  • 4f65c6e67a Remove file in 3rdParty Calen Pennington 2012-03-19 11:10:43 -04:00
  • 799816a31d Move to subdirectory in preparation for merge Calen Pennington 2012-03-19 11:10:43 -04:00
  • 70832c7db3 Import from hg Calen Pennington 2012-03-19 11:05:25 -04:00
  • 0702a84587 Unknown changes/pre-git transition Piotr Mitros 2012-03-19 09:26:16 -04:00
  • 9882b30c83 Unknown changes/pre-git transition Piotr Mitros 2012-03-19 09:25:42 -04:00
  • 5ceb79df9c Merged kf-titles Kyle Fiedler 2012-03-15 16:48:31 -04:00
  • ea7e006a38 merged default Kyle Fiedler 2012-03-15 16:47:59 -04:00
  • 3a84bafa48 merged in kf-links Kyle Fiedler 2012-03-15 16:33:30 -04:00
  • 057185f69e Merged in default Kyle Fiedler 2012-03-15 16:32:55 -04:00
  • 3da8b8133f Added minor ui changes Kyle Fiedler 2012-03-15 16:28:36 -04:00
  • 7c73d7ef41 Non-working code; Cale needs a commit/push Piotr Mitros 2012-03-15 15:50:15 -04:00
  • 8949c5e6bf merged in session cache separation David Ormsbee 2012-03-15 15:30:41 -04:00
  • d9253a0c0f remove unnecessary settings import David Ormsbee 2012-03-15 15:25:39 -04:00
  • f4625003a7 change config to not cache by default, unless overridden by server-specific settings.py David Ormsbee 2012-03-15 15:21:39 -04:00
  • e37eb49065 Shift wiki and course.xml caching to use newly defined 'general' cache, separate from sessions left in 'default' David Ormsbee 2012-03-15 14:45:27 -04:00
  • 269334a839 Fixed the layout of the graph gradebook Reda Lemeden 2012-03-15 10:58:39 -04:00
  • 99f4f7324d Fixed the layout of the graph gradebook Reda Lemeden 2012-03-15 10:57:59 -04:00