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

Commit Graph

  • 4d55f87ab1 Add comments on duplicate calls to compile_assets Calen Pennington 2013-04-24 12:33:44 -04:00
  • 980fb92eef Merge pull request #1873 from MITx/feature/cale/faster-tests Calen Pennington 2013-04-24 09:29:16 -07:00
  • 7315855d18 Merge pull request #1868 from MITx/feature/i18n Christina Roberts 2013-04-24 08:55:55 -07:00
  • dd71ae818a ModuleStoreTestCase moved to new location Steve Strassmann 2013-04-24 11:33:47 -04:00
  • 8ab467a9fc add config files for PyBabel and update.py Steve Strassmann 2013-04-24 11:17:02 -04:00
  • cd2fa7104a Refer to inherited field. cahrens 2013-04-24 11:04:45 -04:00
  • 111ec62bb6 merged from master Steve Strassmann 2013-04-24 10:42:35 -04:00
  • 8baddc0645 Merge branch 'master' of https://github.com/MITx/mitx into feature/i18n Steve Strassmann 2013-04-24 10:41:09 -04:00
  • f69d38bb4c Merge branch 'master' into feature/christina/metadata cahrens 2013-04-24 09:48:39 -04:00
  • 57427f9ac5 Merge pull request #1883 from MITx/feature/kevin/flagging_refactor_verbs Kevin Chugh 2013-04-24 06:47:38 -07:00
  • 37621c26cd Merge pull request #1884 from MITx/feature/cale/histogram-rendering ichuang 2013-04-24 05:24:34 -07:00
  • 9be7f8fcbb Merge pull request #1882 from MITx/doc/showanswer Calen Pennington 2013-04-24 04:34:38 -07:00
  • 621a935577 Merge pull request #1858 from MITx/feature/ichuang/masquerade-v3 Calen Pennington 2013-04-24 04:17:34 -07:00
  • 01e15c1e13 Merge branch 'master' into drupal-new John Jarvis 2013-04-23 18:11:40 -04:00
  • a307696d67 more showanswer possibilities -> doc ichuang 2013-04-23 16:15:46 -04:00
  • bcce41078b add more documentation about showanswer policy key ichuang 2013-04-23 16:12:49 -04:00
  • 67f57a7145 use new API verbs Your Name 2013-04-23 13:28:23 -04:00
  • 57fde4ba15 Merge pull request #1877 from MITx/feature/will/update_testing_docs Will Daly 2013-04-23 09:34:07 -07:00
  • acfd0d9fd6 fix merge conflict Your Name 2013-04-23 10:30:51 -04:00
  • e4194c99d8 Merge branch 'master' of github.com:MITx/mitx Your Name 2013-04-23 10:28:40 -04:00
  • d6bc426ecd Merge pull request #1731 from MITx/feature/kevin/pinning_inline Kevin Chugh 2013-04-23 07:24:22 -07:00
  • 6f10348836 addressed comments from pull request Steve Strassmann 2013-04-23 10:07:51 -04:00
  • 068e02efd5 make unflag all permissions match javascript Your Name 2013-04-22 17:51:48 -04:00
  • 3f1d97b065 Merge branch 'master' into feature/kevin/flagging Your Name 2013-04-22 17:22:33 -04:00
  • 5e73e8f286 Merge branch 'master' of github.com:MITx/mitx Your Name 2013-04-22 17:22:24 -04:00
  • d7f2d4b710 Merge pull request #1876 from MITx/diana/matlab-input-updates Diana Huang 2013-04-22 13:46:15 -07:00
  • 32881ed265 Change the name of the button so that it is clearer. Diana Huang 2013-04-22 16:38:41 -04:00
  • 30104979e7 fix downvoting url Your Name 2013-04-22 16:25:16 -04:00
  • af1c411ddf gentler url diff Your Name 2013-04-22 16:23:21 -04:00
  • b8114b9eb2 restore accidentally deleted chunk Your Name 2013-04-22 16:17:54 -04:00
  • 8a02001a4f minimize diff by restoring function locations Your Name 2013-04-22 15:40:19 -04:00
  • 385026172e remove double Comment from merge conflict Your Name 2013-04-22 15:28:27 -04:00
  • a1360a2710 Merge pull request #1879 from MITx/fix/cdodge/import-can-create-draft-sequences Christina Roberts 2013-04-22 12:17:30 -07:00
  • 0bcef4ddb7 fix merge conflicts Your Name 2013-04-22 12:54:33 -04:00
  • 7994e1b344 pep8 fixes Your Name 2013-04-22 12:53:30 -04:00
  • a0cbe8d8ca Merge pull request #1878 from MITx/fix/btalbot/studio-graceperiod Christina Roberts 2013-04-22 09:10:13 -07:00
  • 506a9a20aa when updating the list of children of sequentials, we must use the 'direct' store otherwise we end up with draft revisions of sequentials, which is bad Chris Dodge 2013-04-22 10:13:33 -04:00
  • 0eed587571 Merge pull request #1839 from MITx/feature/sef/pressreleases chrisndodge 2013-04-22 07:01:36 -07:00
  • ba4c0b6d53 studio - removing formatting suggestion from label Brian Talbot 2013-04-22 09:43:57 -04:00
  • bcdf93fbc3 studio - fixing placeholder and label values for grace period on course grading settings Brian Talbot 2013-04-22 09:42:47 -04:00
  • 4ba26a3a1a Only render a histogram for modules that have scores associated with them Calen Pennington 2013-04-22 08:04:16 -04:00
  • c236f09565 Install pylint from a specific commit Calen Pennington 2013-04-17 16:42:27 -04:00
  • fcf77c5ce6 Run pylint in fewer larger batches Calen Pennington 2013-04-17 13:02:50 -04:00
  • 24f97d29db Add sass sourcemaps back into the debug build Calen Pennington 2013-04-22 08:02:09 -04:00
  • 977eb6530c allow staff to toggle masquerade on info pages (otherwise can get blocked from courseware pages, if course hasn't started yet) ichuang 2013-04-21 21:43:18 -04:00
  • bb12cdf6f4 remove whitespace Kevin Chugh 2013-04-21 19:57:19 -04:00
  • bee25f3ba0 fix git mangle take 3 Kevin Chugh 2013-04-21 19:51:04 -04:00
  • 9d57f0a9d2 fix git mangle take 2 Kevin Chugh 2013-04-21 19:47:27 -04:00
  • 7bc75844b2 fix indentation Kevin Chugh 2013-04-21 06:24:23 -04:00
  • e8c646142f Merge branch 'master' into feature/kevin/flagging Kevin Chugh 2013-04-21 06:15:55 -04:00
  • 649578ea2f unify flag moderator permissions Kevin Chugh 2013-04-21 06:15:23 -04:00
  • f1a899ac1c Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/masquerade-v3 ichuang 2013-04-20 12:25:47 -04:00
  • 81621fbe3a for staff masquerading as student be kind and don't 404 for inaccessible content ichuang 2013-04-20 12:12:25 -04:00
  • 6cbd353992 make masquerade work properly even if DISABLE_START_DATES true ichuang 2013-04-20 11:57:56 -04:00
  • 0a627bb5d9 update permissions for flagging Your Name 2013-04-19 17:40:13 -04:00
  • 2629fc71d6 Added troubleshooting tip for jasmine tests (bundle install) Updated jasmine rake documentation to reflect changes Cale made Will Daly 2013-04-19 12:41:10 -04:00
  • 3f47e2c29d Added explanation of testing pyramid Will Daly 2013-04-19 11:01:42 -04:00
  • e0fb13a26e Resized test pyramid image Fixed mistake in pip install snippet Will Daly 2013-04-19 10:52:15 -04:00
  • 85ea5f7367 Updated testing documentation Will Daly 2013-04-19 10:29:58 -04:00
  • c0f0366bda Some cleanup TODOs. cahrens 2013-04-18 17:08:58 -04:00
  • 181eebc942 Miscellaneous updates and fixes. Diana Huang 2013-04-18 15:08:48 -04:00
  • 4615f0d869 Merge pull request #1874 from MITx/fix/zoldak/upgrade-lettuce Will Daly 2013-04-18 12:52:45 -07:00
  • 2ff4564686 Ignore compiled xmodule assets Calen Pennington 2013-04-18 15:46:08 -04:00
  • ec2532ac2e Before starting the server, forcibly rebuild assets before starting to watch them Calen Pennington 2013-04-18 15:45:52 -04:00
  • f7cad77b93 Ignore errors when deleting the old xmodule compiled assets directory Calen Pennington 2013-04-18 15:45:32 -04:00
  • 729daf5cbf Move xmodule asset gathering out of server startup Calen Pennington 2013-04-18 15:19:19 -04:00
  • be76f73107 Consolidate and upgrade factories Jay Zoldak 2013-04-18 13:20:51 -04:00
  • 03daefb924 Change the name of the plot button Diana Huang 2013-04-18 14:31:51 -04:00
  • 29ce700de6 Tag CMS lettuce tests with @skip-phantom if they aren't working under phantomjs right now. Jay Zoldak 2013-04-17 17:16:01 -04:00
  • 0426761bed Update lettuce and factory-boy versions. Jay Zoldak 2013-04-17 15:49:29 -04:00
  • 8a852f90cb Fix or skip lettuce tests to run under phantomjs and firefox Jay Zoldak 2013-04-17 13:27:33 -04:00
  • 8a2d08bbd6 Refactor choosing the browser for lettuce tests to settings.py Jay Zoldak 2013-04-17 12:58:41 -04:00
  • bbab2d7de7 Install gemfiles for tests Calen Pennington 2013-04-18 10:09:21 -04:00
  • 584bb86208 Merge pull request #1872 from MITx/feature/will/textline_template_test Will Daly 2013-04-18 06:51:45 -07:00
  • a4717aca90 Pep8 fixes Will Daly 2013-04-18 09:49:05 -04:00
  • 91bee1a966 add Babel to requirements.txt Steve Strassmann 2013-04-18 09:27:44 -04:00
  • 3031c1da38 Fix up call to spawn Calen Pennington 2013-04-18 07:18:22 -04:00
  • 6a36d9dba8 Use the new gather_assets target before running tests Calen Pennington 2013-04-17 09:41:04 -04:00
  • f80353121c Don't clean pyc file and install xmodule before all arbitrary rake commands Calen Pennington 2013-04-16 07:49:52 -04:00
  • afb60f790e Change the name of the asset gathering task Calen Pennington 2013-04-16 07:11:31 -04:00
  • 589267599f Run coffee and sass in watch mode when running lms or cms, and oneshot before running collectstatic Calen Pennington 2013-04-12 15:29:53 -04:00
  • 291e772ce0 Clean up cruft from rakefile Calen Pennington 2013-04-12 12:23:31 -04:00
  • 346aee8863 Make django-pipeline only work with raw js and css Calen Pennington 2013-04-12 12:23:13 -04:00
  • 9c7ba41880 Only add the xmodule.coffee file once per class, and put it before all other coffeescript files Calen Pennington 2013-04-12 12:06:38 -04:00
  • 0ffc399f7d move masquerade call up, to make sure it is used for start date checks ichuang 2013-04-17 22:12:12 -04:00
  • 3de927fe01 untabify course_nagivation.html ichuang 2013-04-17 21:22:08 -04:00
  • a57a093e73 Rebased to master Will Daly 2013-04-17 15:56:05 -04:00
  • 841d3484c8 Added test for textline input template Will Daly 2013-04-17 12:17:23 -04:00
  • e5e0dc4bfb Merge pull request #1865 from MITx/feature/will/more_capa_tests Will Daly 2013-04-17 12:38:59 -07:00
  • 52c2f3ae37 Tested additional values of rerandomize (true/false/per_student) Pylint fixes Will Daly 2013-04-17 08:55:08 -04:00
  • 754d1eb702 Added tests for ChoiceGroup template Will Daly 2013-04-16 17:22:01 -04:00
  • b42c4dacf7 Added test for "radio" choicegroup Will Daly 2013-04-16 11:19:11 -04:00
  • a3233b67e5 Merge pull request #1869 from MITx/fix/btalbot/studio-courseemail Christina Roberts 2013-04-17 11:26:40 -07:00
  • 0f26be2f4d quick fix to email copy Mark L. Chang 2013-04-17 14:12:16 -04:00
  • 44bf60d208 copy changes, link text change Mark L. Chang 2013-04-17 14:03:29 -04:00
  • 423fa47811 studio - reverting back to https references in the course mailto link and url display Brian Talbot 2013-04-17 13:47:54 -04:00
  • b115ad46bf studio - changed https to http in course mailto link and added that prefix to link displayed Brian Talbot 2013-04-17 13:44:23 -04:00
  • 33ba38b8dd studio - prefixed course URL with https: for individual share course mailto link on settings Brian Talbot 2013-04-17 13:38:14 -04:00
  • 2f84b23047 disable i18n unit test - it wont run without creating dummy strings first Steve Strassmann 2013-04-17 13:20:20 -04:00
  • c4e4f73373 studio - adding in course name value in the share course mailto link Brian Talbot 2013-04-17 13:19:42 -04:00