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

Commit Graph

  • d1b7bcef16 Merge pull request #867 from MITx/feature/tomg/cas-cleanup Calen Pennington 2012-10-11 19:21:10 -07:00
  • 3751bc05a5 Merge pull request #870 from MITx/fix/cdodge/cas-bugs Calen Pennington 2012-10-11 19:20:20 -07:00
  • e2be559ab0 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into fix/cdodge/cas-bugs Chris Dodge 2012-10-11 20:55:29 -04:00
  • 64c3bbdc7d Merge pull request #869 from MITx/fix/cdodge/cas-logger-crash chrisndodge 2012-10-11 17:54:33 -07:00
  • e27dea0fec fix up dev.py to include the new flag Chris Dodge 2012-10-11 20:52:28 -04:00
  • 466e4cbd17 Fix regression on creating new sections and subsections. They were being set into 'draft' when we are not currently supporting draft modes for those areas of the hierarchy Chris Dodge 2012-10-11 20:48:45 -04:00
  • c420c67b82 Actually implement exact vs factors-don't-matter comparisons in chemcalc Victor Shnayder 2012-10-11 17:40:26 -04:00
  • 648792b7d3 changed studio to edge in emails Tom Giannattasio 2012-10-11 16:25:39 -04:00
  • 82abdd07dc respond to some of Cale's comments Chris Dodge 2012-10-11 16:23:28 -04:00
  • 5f66be503c changed edx to edx studio in email templates (hopefully this is right) Tom Giannattasio 2012-10-11 14:52:44 -04:00
  • 8da5087de8 polished policy styles Tom Giannattasio 2012-10-11 14:50:43 -04:00
  • c3e2a544da tweaks to datepicker and calendar Tom Giannattasio 2012-10-11 14:34:13 -04:00
  • fcc725e76d finished calendar styles Tom Giannattasio 2012-10-11 14:18:32 -04:00
  • b685af44eb started calendar styles Tom Giannattasio 2012-10-11 13:24:43 -04:00
  • 427462348d tweaked published messaging styles Tom Giannattasio 2012-10-11 13:04:59 -04:00
  • 093d8385f7 removed search Tom Giannattasio 2012-10-11 11:58:32 -04:00
  • df09990a0a removed dropdown in header Tom Giannattasio 2012-10-11 11:41:46 -04:00
  • 51a19b3d7e transferred edge styles from cms to lms Tom Giannattasio 2012-10-11 14:02:13 -04:00
  • bf392e360a on import set course metadata to hide the progress tab since we don't yet support grading policies Chris Dodge 2012-10-11 13:52:15 -04:00
  • a521ea239f baseline working for importing courseware and static assets Chris Dodge 2012-10-11 13:41:16 -04:00
  • 9c0e554992 Merge pull request #855 from MITx/bug/tomg/nested-hints David Ormsbee 2012-10-11 10:25:21 -07:00
  • d0668043a5 Merge pull request #861 from MITx/feature/ichuang/dump_grades David Ormsbee 2012-10-11 10:24:19 -07:00
  • c6c51cf19a Merge pull request #865 from MITx/bugfix/victor/progress-tab-crash David Ormsbee 2012-10-11 10:22:28 -07:00
  • 096d6853eb Allow for branding subdomains that are longer than a single . Calen Pennington 2012-10-11 13:18:27 -04:00
  • 9e9825cb88 Enable the edge virtual university landing page in the lms Calen Pennington 2012-10-11 13:18:01 -04:00
  • a5dcdcb705 Check for None to fix 3.091 progress tab crash Victor Shnayder 2012-10-11 13:08:05 -04:00
  • bb46c5f909 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-import Chris Dodge 2012-10-11 12:51:37 -04:00
  • ab1decd97b import static assets. Also consolidate asset import/thumbnail generation into a single code base Chris Dodge 2012-10-11 12:51:33 -04:00
  • 4b16a7b422 Merge pull request #863 from MITx/bug/lyla/numerical-tolerance-default David Ormsbee 2012-10-11 09:51:29 -07:00
  • d21c5761df Minor bug fixes from edge-configs merge Calen Pennington 2012-10-11 12:49:48 -04:00
  • 6801412557 Merge pull request #856 from MITx/feature/cale/edge-configs chrisndodge 2012-10-11 09:39:59 -07:00
  • cf19a43268 Set SESSION_COOKIE_DOMAIN from env.json Calen Pennington 2012-10-11 08:51:13 -04:00
  • 9239da678a Mark is_draft as system metadata, so that users don't edit it Calen Pennington 2012-10-10 15:47:19 -04:00
  • 5ae34aa4ed Add heartbeat to cms Calen Pennington 2012-10-10 15:45:44 -04:00
  • 284f0d6a22 Make the lms running alongside the CAS in dev point to the same contentstore, and server up static content Calen Pennington 2012-10-03 11:36:48 -04:00
  • d4405375e5 Read contentstore from auth.json Calen Pennington 2012-10-02 14:32:26 -04:00
  • 658bb622ba Always import logsettings after common, so that paths are set Calen Pennington 2012-10-02 13:28:03 -04:00
  • bc69ed8c9e Move logsettings to common, so that it's shared between cms and lms Calen Pennington 2012-10-02 12:51:04 -04:00
  • 20f84b2055 Use the right config as the base for lms.envs.cms.aws Calen Pennington 2012-10-02 12:44:47 -04:00
  • eece835d9b Put in an empty contentstore for the LMS by default Calen Pennington 2012-10-10 10:49:10 -04:00
  • 46668d2634 Read CONTENTSTORE from auth.json in lms Calen Pennington 2012-10-10 10:34:24 -04:00
  • 0162e4c031 Remove more askbot remnants Calen Pennington 2012-10-10 09:43:55 -04:00
  • f5a63f7375 Remove all askbot common settings Calen Pennington 2012-10-10 09:14:31 -04:00
  • 1114f66a98 Enable specification of modulestore in LMS aws config Calen Pennington 2012-10-09 21:31:14 -04:00
  • 8eb4390def Enable authentication in mongo modulestore and contentstore Calen Pennington 2012-10-09 21:28:55 -04:00
  • e2d3ca6f23 Merge pull request #842 from MITx/feature/tomg/edge Calen Pennington 2012-10-11 09:30:18 -07:00
  • af44d1c1cf Remove duplicate template definition Calen Pennington 2012-10-11 12:28:02 -04:00
  • 19f8266b6a removed dup edge def and changed to university_profile/edge template Tom Giannattasio 2012-10-11 11:52:21 -04:00
  • 86f32bb3d4 added edge template to university folder Tom Giannattasio 2012-10-09 13:14:45 -04:00
  • a1a13eb4f2 added studio logo to log in and sign up pages Tom Giannattasio 2012-10-09 11:44:07 -04:00
  • 5dba4fd6c3 tweaked window style for consistency Tom Giannattasio 2012-10-09 11:29:58 -04:00
  • 5ae11b8e11 changed edge course url Tom Giannattasio 2012-10-09 11:29:42 -04:00
  • 6da378e735 tweaked edge template to target students only Tom Giannattasio 2012-10-09 10:46:46 -04:00
  • f4bdb46493 changed edge url Tom Giannattasio 2012-10-09 10:46:07 -04:00
  • fec710abde added edge logo; added edge temp landing page Tom Giannattasio 2012-10-09 07:09:56 -04:00
  • 0cdbd170c2 fixed documentation Lyla Fischer 2012-10-11 12:23:06 -04:00
  • 38f5761a89 Merge pull request #864 from MITx/bug/lyla/numericalresponse Calen Pennington 2012-10-11 09:17:57 -07:00
  • 1bd2cb4f85 quick bug fix Lyla Fischer 2012-10-11 12:12:34 -04:00
  • 6b5b6342d2 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cms-import Chris Dodge 2012-10-11 12:11:48 -04:00
  • a84ef1b243 wip: static asset import Chris Dodge 2012-10-11 12:10:28 -04:00
  • f010875750 Merge pull request #848 from MITx/feature/cas/lyla/asset-store-integration Calen Pennington 2012-10-11 08:59:50 -07:00
  • 331f35145f fixed default tolerance on numericalresponse Lyla Fischer 2012-10-11 11:59:27 -04:00
  • f06c67ef08 added embeddable links Lyla Fischer 2012-10-09 18:52:54 -04:00
  • 0bd5446f80 fixed date display Lyla Fischer 2012-10-09 15:16:36 -04:00
  • 115d7358fa fix up commenting after refactoring. Also, don't reraise an exception during thumbnail generation - we just want to swallow the exception, log, and continue. Chris Dodge 2012-10-08 11:31:45 -04:00
  • 2153aae62c schema change to better normalize asset->thumbnail relationships Chris Dodge 2012-10-08 11:26:51 -04:00
  • 6378682201 thumnail image is a thumnail image Lyla Fischer 2012-10-05 17:41:33 -04:00
  • 83eeb1961a fixed erroneous order Lyla Fischer 2012-10-05 10:36:43 -04:00
  • f26a4af75c thinks work, they just don't display prettily, and it is hard to actually use the assets due to links Lyla Fischer 2012-10-05 09:43:16 -04:00
  • 7791a7c4aa slight refactoring of the javascript Lyla Fischer 2012-10-04 16:45:22 -04:00
  • d35ff48e5b fixed up some of the ajax feedback to display to the user Lyla Fischer 2012-10-04 16:30:55 -04:00
  • deca6e66b0 cleaned filenames Lyla Fischer 2012-10-04 15:03:51 -04:00
  • 65e3982fd2 things now upload Lyla Fischer 2012-10-04 14:07:30 -04:00
  • 64565692ab removed obsolete crystalresponse Александр 2012-10-11 18:41:25 +03:00
  • 6a7fb1d53b Merge pull request #859 from MITx/feature/tomg/cas-404 Calen Pennington 2012-10-11 08:40:47 -07:00
  • 2b200b6e20 changed cryst inputtype to be similar to textline Александр 2012-10-11 18:40:05 +03:00
  • dfb9b49c4d added new inputtypes to list, due to that check button appears Александр 2012-10-11 18:37:10 +03:00
  • c7654b4d1e cryst inputtypes template - same as textline + js files Александр 2012-10-11 18:33:49 +03:00
  • 778017fc3e add django management command for dumping grades to CSV file ichuang 2012-10-11 11:30:57 -04:00
  • 2b6e935985 Initial refactor of inputtypes into classes. Victor Shnayder 2012-10-11 11:26:49 -04:00
  • cb291871b1 Better error checking when content authors mess up answers to numerical response problems. Victor Shnayder 2012-10-11 11:25:40 -04:00
  • 8cdd5b35c0 add note about randomization, based on discussion with Piotr Victor Shnayder 2012-10-11 11:15:58 -04:00
  • 88f147c704 Merge pull request #847 from MITx/feature/rocha/openid-djangostore David Ormsbee 2012-10-11 08:06:48 -07:00
  • 488d001e85 Merge pull request #854 from MITx/feature/bridger/course_grading David Ormsbee 2012-10-11 08:06:05 -07:00
  • 05c5ac3482 Allow people who haven't activated to reset their password. David Ormsbee 2012-10-11 11:04:18 -04:00
  • e2f53f1429 Merge pull request #857 from MITx/hotfix/arjun/fix_integer_disc_ids arjun810 2012-10-11 07:02:09 -07:00
  • 782e5f51e9 template for 404 and 500 errors Tom Giannattasio 2012-10-11 09:33:39 -04:00
  • 5eb0ca69e0 Merge pull request #858 from MITx/feature/cdodge/cas-crud-section-subsection Calen Pennington 2012-10-11 06:55:12 -07:00
  • b77298b2ec a 'section' is actually a 'chapter' in previous nomenclature Chris Dodge 2012-10-11 09:49:07 -04:00
  • 58b0829b79 Fix some issues with integer ids in the discussion forum Arjun Singh 2012-10-11 06:22:00 -07:00
  • bdf8a55a47 Merge pull request #852 from MITx/feature/cdodge/cas-crud-section-subsection Calen Pennington 2012-10-11 05:44:47 -07:00
  • c8d267fb72 Fix minor typo in access.py Calen Pennington 2012-10-10 22:03:08 -04:00
  • a9ca84da6b Merge pull request #853 from MITx/feature/tomg/style-polishing Calen Pennington 2012-10-10 19:00:12 -07:00
  • 00e2f093b9 removed extra padding on nested sections Tom Giannattasio 2012-10-10 16:19:03 -04:00
  • 6f60af71fd tweaked collapsible selector to target the proper section; functionality like this should have its own class to avoid selector conflicts, but it may be too late to fix this now Tom Giannattasio 2012-10-10 16:14:32 -04:00
  • 8d78073a64 removed console logs Tom Giannattasio 2012-10-10 15:52:49 -04:00
  • db17580710 Chemcalc refactor, improvement Victor Shnayder 2012-10-09 18:47:32 -04:00
  • d10b568c13 Add chemcalc to capa package, to context for customresponse Victor Shnayder 2012-10-08 20:08:48 -04:00
  • c30f57022b Move more tests around, start prep for inputtype refactor Victor Shnayder 2012-10-08 16:44:54 -04:00
  • edc32e9db5 tweaks to new component animations Tom Giannattasio 2012-10-10 15:45:04 -04:00