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

Commit Graph

  • 17683c43d4 attempt to migrate more code Rocky Duan 2012-08-20 22:24:58 -07:00
  • a905ac9e1d updated backbone & single thread retrieval now working Rocky Duan 2012-08-20 22:03:46 -07:00
  • b29e547d3d Merge pull request #474 from MITx/kimth/progress-hide Calen Pennington 2012-08-20 19:31:14 -07:00
  • 27c0104bfb Merge pull request #466 from MITx/feature/victor/html-escape-errors Calen Pennington 2012-08-20 19:11:38 -07:00
  • d189a49ee5 continue working on backbone & got vote migrated and working Rocky Duan 2012-08-20 17:32:36 -07:00
  • c3718e49b6 Meaningless commit to force build David Ormsbee 2012-08-20 20:15:07 -04:00
  • 66a9512e57 disable askbot and enable berkeley forum in AWS config David Ormsbee 2012-08-20 19:30:45 -04:00
  • 65ea54f7e2 typo in common.py ALLOWED_GITRELOAD_IPS fixed ichuang 2012-08-20 19:23:15 -04:00
  • e1c9e52fc5 move textinput display:inline into capa display.scss file as class ichuang 2012-08-20 19:18:00 -04:00
  • 1ebc810ae5 Fix some links taht were still pointing to the old courseware course_navigation pages. David Ormsbee 2012-08-20 19:16:21 -04:00
  • ef2bfac32a Merge branch 'master' of github.com:MITx/mitx Victor Shnayder 2012-08-20 19:11:58 -04:00
  • c5aef50701 add test database for new toy course. Trying to fix build Victor Shnayder 2012-08-20 19:11:47 -04:00
  • eb96497cff Merge branch 'master' into feature/bk_forum_int David Ormsbee 2012-08-20 18:57:46 -04:00
  • eaef8c70a7 Lowercase kimth 2012-08-20 18:51:34 -04:00
  • 7e7247d8bf Don't tabulate hidden chapters and sections in the Progress view kimth 2012-08-20 18:47:18 -04:00
  • e3ecd22fa0 github IPs in lms.envs.common; made create_user, create_groups, manage_course_groups management commands (in lms_migration) ichuang 2012-08-20 18:38:05 -04:00
  • 0b3e9909a4 Merge branch 'master' into refactor Rocky Duan 2012-08-20 15:35:31 -07:00
  • 8684ae29b2 Merge branch 'master' of github.com:MITx/mitx into refactor Rocky Duan 2012-08-20 15:31:51 -07:00
  • dc599c469f fixed test Rocky Duan 2012-08-20 15:26:07 -07:00
  • f82c2e00d1 simplified mustache helper loading Rocky Duan 2012-08-20 15:24:19 -07:00
  • 1c161a769e removed unnecessary dependency Rocky Duan 2012-08-20 15:16:40 -07:00
  • 88d514e28d fixed merge conflict in extends Tom Giannattasio 2012-08-20 18:15:09 -04:00
  • 3ffcb2615f fix merge conflicts Tom Giannattasio 2012-08-20 18:07:32 -04:00
  • 46c3e8a286 Merge pull request #473 from MITx/feature/pystache_custom jarv 2012-08-20 15:05:49 -07:00
  • 356fac144b Remove pystache in favor of our custom version David Ormsbee 2012-08-20 18:04:37 -04:00
  • 8ab98d33ea remove pystache dependency David Ormsbee 2012-08-20 18:02:32 -04:00
  • a1ff34571e sequence nav changes were lost?! temporary fix Tom Giannattasio 2012-08-20 18:01:57 -04:00
  • ee92ba0752 new sequence nav; new courseware sidebar; new textbook styling; fixed gradebook glitch Tom Giannattasio 2012-08-20 17:56:51 -04:00
  • 868b076ea7 html escape errors Victor Shnayder 2012-08-20 15:00:22 -04:00
  • b6dfa50a73 Adjust settings so we can change the comments service URL from Django config David Ormsbee 2012-08-20 17:33:45 -04:00
  • c0c23baac5 Removed inactive 'view this revision' button from history page. Bridger Maxwell 2012-08-20 17:23:39 -04:00
  • 8543f25358 Updated django-wiki version. Bridger Maxwell 2012-08-20 16:51:39 -04:00
  • 47bf516001 Remove unnecessary import that was failing a test David Ormsbee 2012-08-20 16:48:31 -04:00
  • e89a7b67c5 Merge pull request #470 from MITx/jarv/dependency-update jarv 2012-08-20 13:46:02 -07:00
  • bb80c66ed7 ensuring pystache>=0.5.2 John Jarvis 2012-08-20 16:41:48 -04:00
  • d7327651eb Merge pull request #469 from MITx/jarv/dependency-update David Ormsbee 2012-08-20 13:37:57 -07:00
  • 55251039d9 updating dependencies for pystache, networkx, graphviz and removing redundant dependency for django-staticfiles John Jarvis 2012-08-20 16:35:42 -04:00
  • 3762efd2ec added pystache dependency David Ormsbee 2012-08-20 16:34:13 -04:00
  • 46d2e71ac1 Fixed bug in breadcrumbs. Bridger Maxwell 2012-08-20 16:24:12 -04:00
  • d31f0c9f06 Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki Bridger Maxwell 2012-08-20 16:10:17 -04:00
  • cc1dd65eb0 Merge branch 'master' of github.com:MITx/mitx Victor Shnayder 2012-08-20 16:04:41 -04:00
  • 5f612c7819 Oops. Make modx_dispatch and xqueue callback work again. Victor Shnayder 2012-08-20 16:04:16 -04:00
  • af17ba7a79 removed dependency on datehelper Rocky Duan 2012-08-20 12:57:23 -07:00
  • 2f2a4cc6e7 Merge pull request #468 from MITx/feature/kfiedler/courseware-style thomasxiii 2012-08-20 12:53:03 -07:00
  • 0f6c31b4bd started courseware sidebar styling Tom Giannattasio 2012-08-20 15:51:10 -04:00
  • 20d9e6e86d Made save buttons blue, finished remaining askbot bugs, and removed all instances of -red Kyle Fiedler 2012-08-20 15:44:57 -04:00
  • 7c824f774f Added styles for save button Kyle Fiedler 2012-08-20 14:48:06 -04:00
  • de4abe300b Merge pull request #464 from MITx/kimth/textbook Calen Pennington 2012-08-20 12:38:14 -07:00
  • 259e21364f Merge pull request #461 from MITx/feature/victor/multi-run-policy Calen Pennington 2012-08-20 12:35:55 -07:00
  • 9bde5e7a4b Merge pull request #467 from MITx/bridger/feature/clean_up David Ormsbee 2012-08-20 12:21:35 -07:00
  • 7b5e66b68f python code for time_ago_in_words is unnecessary now Rocky Duan 2012-08-20 12:05:02 -07:00
  • 348a7b6eb7 render time ago in front end Rocky Duan 2012-08-20 12:04:25 -07:00
  • 9bc5aec01a Fixed up courseware-error view. Moved it to templates/courseware too. Bridger Maxwell 2012-08-20 15:03:55 -04:00
  • 71df263ff9 disable all course db related signals Rocky Duan 2012-08-20 11:57:58 -07:00
  • bc2164e2be Merge pull request #465 from MITx/jarv/repo-requirements-update jarv 2012-08-20 11:56:29 -07:00
  • 0ac5ded095 Moved the course template pages to be templates/courseware/ Bridger Maxwell 2012-08-20 14:45:33 -04:00
  • 1f50da8814 fixed discussion permission test Rocky Duan 2012-08-20 11:41:36 -07:00
  • b4039fe89d Merge branch 'feature/bk_forum_int' of github.com:MITx/mitx into feature/bk_forum_int Rocky Duan 2012-08-20 11:41:19 -07:00
  • 1a2cdea966 removing dupe John Jarvis 2012-08-20 14:24:39 -04:00
  • ee3f46fd30 Changed titles on course pages. Bridger Maxwell 2012-08-20 14:19:47 -04:00
  • 5b38f9d4ac Removed empty sidebar from Progress page. Bridger Maxwell 2012-08-20 14:15:41 -04:00
  • 1159b14b0d Merge branch 'master' of github.com:MITx/mitx Bridger Maxwell 2012-08-20 14:08:48 -04:00
  • 70c7ee42ed Fixed tests from profile->progress rename. Bridger Maxwell 2012-08-20 14:08:42 -04:00
  • 5f72e0c7a0 moving all requirements that use a repo to repo-requirements.txt including github requirements John Jarvis 2012-08-20 14:05:51 -04:00
  • 38f96b72a1 Merge pull request #463 from MITx/feature/kfiedler/courseware-style thomasxiii 2012-08-20 10:58:46 -07:00
  • 16190843e7 started reworking sidebar styles Tom Giannattasio 2012-08-20 13:56:51 -04:00
  • 92a293f07e Removed profile info from Profile page and renamed it to Progress. Bridger Maxwell 2012-08-20 13:50:28 -04:00
  • 9852a581f0 Adjust comments kimth 2012-08-20 13:43:55 -04:00
  • c084745290 Textbook TOC from S3 kimth 2012-08-20 13:32:13 -04:00
  • ab28e08591 Added new button classes Kyle Fiedler 2012-08-20 13:22:21 -04:00
  • 6d30a98f0f Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki Bridger Maxwell 2012-08-20 13:08:35 -04:00
  • 987d7bcc29 book_url doesn't come from settings kimth 2012-08-20 12:40:34 -04:00
  • 55b1a59c40 hack item errors for now Victor Shnayder 2012-08-20 11:41:56 -04:00
  • e61b6842ec removed h2 column Kyle Fiedler 2012-08-20 11:32:29 -04:00
  • e9e6b1828e new header styles Tom Giannattasio 2012-08-20 10:41:34 -04:00
  • 8b4b1fddb5 added new wrapper styles Tom Giannattasio 2012-08-20 10:15:28 -04:00
  • f2197227c1 add out-of-date message to check_course Victor Shnayder 2012-08-20 09:24:13 -04:00
  • c6c95c63ac Keep each course's descriptors separate Victor Shnayder 2012-08-19 23:48:37 -04:00
  • 3b02e6a1ee started new nav styles Tom Giannattasio 2012-08-20 09:02:18 -04:00
  • ff41338cad refactor attempt Rocky Duan 2012-08-19 21:58:36 -07:00
  • 660c35f63e additional changes to make inline textinput work properly ichuang 2012-08-20 00:19:28 -04:00
  • d5c2b04c5c modified mustache template working Rocky Duan 2012-08-19 20:43:46 -07:00
  • b23bfc75bc additional minor change: allow "inline" attrib on textline ichuang 2012-08-19 23:18:06 -04:00
  • c7d2e252e2 Fix errors that were preventing collectstatic from running David Ormsbee 2012-08-19 22:31:05 -04:00
  • 3cb677f0e6 Changed default title and content of course wiki page. Bridger Maxwell 2012-08-19 21:19:08 -04:00
  • 9fceae7a71 Merge branch 'master' into feature/bk_forum_int David Ormsbee 2012-08-19 21:14:17 -04:00
  • 6a05a812c3 Merge pull request #460 from MITx/kimth/multiple-fileupload David Ormsbee 2012-08-19 18:08:40 -07:00
  • 891797a3bb Submission of files through requests.POST depletes the file pointer. Need to rewind for replay kimth 2012-08-19 20:38:10 -04:00
  • 2f63a9b403 Limit number of files that can be uploaded at once kimth 2012-08-19 20:12:01 -04:00
  • adbe71b5df Got simplewiki just cleaned up enough to work again, so I could view a page for reference. Bridger Maxwell 2012-08-19 19:57:19 -04:00
  • 96b9a37048 work around compatibility issue Rocky Duan 2012-08-19 16:42:56 -07:00
  • cdfeeb0cf1 Hid wiki search bar, because it isn't implemented yet. Bridger Maxwell 2012-08-19 19:41:49 -04:00
  • 03288193bb Wiki create button now creates article in class wiki (never in a child of a class wiki). Bridger Maxwell 2012-08-19 19:40:42 -04:00
  • 12d51334f8 mustache template Rocky Duan 2012-08-19 16:03:42 -07:00
  • 38a9631659 Updated to use django-wiki with significantly less sql queries. Bridger Maxwell 2012-08-19 17:37:58 -04:00
  • a729e16e88 Merge pull request #459 from MITx/feature/bridger/new_wiki David Ormsbee 2012-08-19 13:05:59 -07:00
  • e79d56376a Use -e in django-wiki requirement David Ormsbee 2012-08-19 16:03:35 -04:00
  • 24c0b5145d Updated django-wiki and plugin imports. Bridger Maxwell 2012-08-19 14:41:49 -04:00
  • 64e6160548 slight behavior change Rocky Duan 2012-08-19 10:44:05 -07:00
  • d17981a9c4 shouldn't commit env config Rocky Duan 2012-08-19 10:43:50 -07:00