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

Commit Graph

  • 0c1fd783cb Setting the edxloggedin cookie on registration John Jarvis 2013-04-11 10:44:22 -04:00
  • e0bc823365 remove auto-provisioning because of a dependency problem between cms and lms Chris Dodge 2013-04-11 10:42:03 -04:00
  • 442d0fcf4f Add tests for orderings with only one task Vik Paruchuri 2013-04-10 17:41:10 -04:00
  • 09e18cb815 Add in tests for alternate xml orderings Vik Paruchuri 2013-04-10 17:38:31 -04:00
  • ca2eb9cd1b Add in tests for combinedopenended scoring Vik Paruchuri 2013-04-10 17:33:43 -04:00
  • 820a2b407a Add in js image upload preview Vik Paruchuri 2013-04-10 17:06:02 -04:00
  • 9f04769c00 Better confirmation for flagging Vik Paruchuri 2013-04-10 16:16:13 -04:00
  • f6434ed4fb Merge pull request #1840 from MITx/fix/cdodge/export-draft-modules Don Mitchell 2013-04-10 13:12:09 -07:00
  • a64d57ae1d Add popup when flag box is checked Vik Paruchuri 2013-04-10 16:01:56 -04:00
  • 2a5631da86 Code cleanup Vik Paruchuri 2013-04-10 15:26:45 -04:00
  • cef4d0cb09 Display instructor feedback Vik Paruchuri 2013-04-10 15:25:05 -04:00
  • 799c8282bc Fix hotkeys for combined open ended Vik Paruchuri 2013-04-10 15:15:22 -04:00
  • d0ecbbb4cf Fix hotkeys in peer and staff grading to use ctrl prefix Vik Paruchuri 2013-04-10 15:10:48 -04:00
  • 4d9dd40268 Merge pull request #1842 from MITx/feature/christina/metadata chrisndodge 2013-04-10 12:05:06 -07:00
  • 40adfa950d Get the "Edit High Level Source" link back in. Broken with xblock work. cahrens 2013-04-10 14:53:26 -04:00
  • 54e5e3d31f Adding the EDX_MKTG feature flag and links back to the marketing site John Jarvis 2013-04-10 14:29:47 -04:00
  • 7102c23d6d Merge pull request #1841 from MITx/fix/btalbot/loginregister-actions jarv 2013-04-10 10:40:43 -07:00
  • 22a56fddb4 edx.org - adding in an intermediate disabled state for login/register submit buttons when the form is first processed Brian Talbot 2013-04-10 13:38:25 -04:00
  • 0a2937311d remove commented out code. Also fix up indents and other violations Chris Dodge 2013-04-10 12:34:18 -04:00
  • d9fa723eb2 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules Chris Dodge 2013-04-10 12:02:16 -04:00
  • b5ec11afa0 edx.org - adding in more UI status when processing login/register forms Brian Talbot 2013-04-10 11:26:00 -04:00
  • 276b86a779 Merge pull request #1833 from MITx/feature/btalbot/studio-courselink Christina Roberts 2013-04-10 07:52:19 -07:00
  • 97e893b2ed Merge branch 'master' into feature/btalbot/studio-courselink Brian Talbot 2013-04-10 10:48:33 -04:00
  • 01b2fefdd0 studio - revised course URL link label to match wording used elsewhere in the view/app Brian Talbot 2013-04-10 10:48:12 -04:00
  • 5e3ca48c8d address some violations Chris Dodge 2013-04-10 09:40:23 -04:00
  • 07b9d6353e Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements Chris Dodge 2013-04-10 09:26:51 -04:00
  • bd2330a8f0 press releases: more explicitly match on slug (safety) Sef Kloninger 2013-04-10 08:20:30 -04:00
  • bcdc6db4a9 press releases: fix stanford announcement in rss feed Sef Kloninger 2013-04-10 02:26:43 -04:00
  • 4b68e0282f press releases: use generic matching rule Sef Kloninger 2013-04-10 02:16:35 -04:00
  • f57028b8e8 press releases: standardize template names (move 2) Sef Kloninger 2013-04-10 01:23:32 -04:00
  • b118b73143 press releases: standardize template names (move 1) Sef Kloninger 2013-04-10 01:19:20 -04:00
  • 463a88ccfb Display rubric to students after calibration Vik Paruchuri 2013-04-09 16:54:27 -04:00
  • 81f94fc4e2 Merge pull request #1832 from MITx/fix/btalbot/studio-contentmargin Christina Roberts 2013-04-09 12:51:09 -07:00
  • 7a0ddb2436 Merge pull request #1836 from MITx/style/btalbot/password-reset-complete jarv 2013-04-09 12:39:43 -07:00
  • 86dbfd34a1 edx.org - added basic styles to match previous password reset form to complete view Brian Talbot 2013-04-09 15:38:10 -04:00
  • 7d38147490 Remove attempts field from peer grading template Vik Paruchuri 2013-04-09 15:34:35 -04:00
  • 418f218eec Fix some templates, minor code reformats Vik Paruchuri 2013-04-09 15:33:11 -04:00
  • dac88a8f84 Merge pull request #1835 from MITx/feature/jarv/fix-password-fields Brian Talbot 2013-04-09 12:31:45 -07:00
  • de7b9333b7 add flagging premissions Kevin Chugh 2013-04-09 15:13:12 -04:00
  • c3e5469596 changing password reset fields to match what is used now John Jarvis 2013-04-09 15:11:06 -04:00
  • 93978da87c fixes cleanup Kevin Chugh 2013-04-09 14:57:43 -04:00
  • 247ccc37a6 Code reformat, patch score gen Vik Paruchuri 2013-04-09 14:47:26 -04:00
  • 112fb4539b Correctly calculate score for combinedopenended and peer assessment Vik Paruchuri 2013-04-09 14:43:41 -04:00
  • 45a3dd4ee0 Fix file uploads to work after error Vik Paruchuri 2013-04-09 14:13:29 -04:00
  • 9cca3072c3 Fix skip behavior for staff Vik Paruchuri 2013-04-09 13:53:51 -04:00
  • 448c8121c3 Patch combinedopenended to work if self assessment is not first Vik Paruchuri 2013-04-09 13:37:37 -04:00
  • 2c0b2e4d27 Merge branch 'master' into drupal-new John Jarvis 2013-04-09 13:27:13 -04:00
  • 2b309adf9c Fixing cookie handling for edx-mktg-loggedin John Jarvis 2013-03-28 13:26:41 -04:00
  • d2ed6e2c02 Merge pull request #1830 from MITx/fix/cale/violations Ned Batchelder 2013-04-09 10:21:49 -07:00
  • 5b8a410d12 Merge pull request #1829 from MITx/marketing/cale/delftx-header Calen Pennington 2013-04-09 10:14:19 -07:00
  • 2fce096e1c Merge pull request #1834 from MITx/bug/christina/base chrisndodge 2013-04-09 06:52:55 -07:00
  • f36494e5dd Need to be able to access smoothScrollTop. This is a temporary change-- I'll come up with a proposal to namespace our helper functions in a nicer way. cahrens 2013-04-09 09:41:52 -04:00
  • 8358e5162a Merge branch 'master' into feature/kevin/flagging Kevin Chugh 2013-04-09 09:23:05 -04:00
  • 78079d1ca7 Merge branch 'master' into drupal-new Brian Talbot 2013-04-08 22:35:29 -04:00
  • d8368447fd edx.org - adjusted input height and padding to handle previously uneditable fieldsin firefox Brian Talbot 2013-04-08 22:35:06 -04:00
  • 13b741750a edx.org - basic styling of password reset form Brian Talbot 2013-04-08 22:16:32 -04:00
  • 74104d6081 Merge pull request #1831 from MITx/vik/fix/pg-and-progress Sarina 2013-04-08 14:37:07 -07:00
  • 12784e3fb8 studio - course link final styling Brian Talbot 2013-04-08 17:35:16 -04:00
  • b51e57eddf studio - refining style and presentation of course link and invitation button on details settings Brian Talbot 2013-04-08 17:31:14 -04:00
  • f59b74e27f fix nitpick and merge master Kevin Chugh 2013-04-08 17:19:28 -04:00
  • 2b2621e20c Merge branch 'master' into feature/kevin/pinning_inline Kevin Chugh 2013-04-08 17:19:19 -04:00
  • 7fd8a33b3c Merge pull request #1816 from MITx/feature/btalbot/studio-alerts Christina Roberts 2013-04-08 14:19:12 -07:00
  • 606469cd46 studio - fixing a visual margin issue with the sign up/in views header/content areas Brian Talbot 2013-04-08 17:14:41 -04:00
  • 7882845786 studio - alerts: correcting page title Brian Talbot 2013-04-08 17:09:43 -04:00
  • 27871ac9c9 studio - alerts: hiding alerts (in possbily inaccessible ways) in css for page load's sake Brian Talbot 2013-04-08 16:55:06 -04:00
  • 7d09617ec9 Fix weighting and score generation Vik Paruchuri 2013-04-08 16:52:18 -04:00
  • 45bb4d3754 Merge pull request #1828 from MITx/fix/cdodge/import-nesting-definition-data Calen Pennington 2013-04-08 13:50:36 -07:00
  • 3f2e21f9dc Merge branch 'master' into feature/btalbot/studio-alerts Brian Talbot 2013-04-08 16:29:18 -04:00
  • 3f22826e26 studio - alerts: adding some ARIA-centric accessibility information to example prompts/notifications and advanced settings save notification Brian Talbot 2013-04-08 16:28:31 -04:00
  • 54afc5eb63 seems like we need to purge 'filename' from both _model_data as well as xml_attributes Chris Dodge 2013-04-08 16:09:41 -04:00
  • 4e331a2c6a studio - restyling course basic details and adding in a course's URL more prominently WIP Brian Talbot 2013-04-08 15:39:01 -04:00
  • a0f5a51135 wip to fix broken test Chris Dodge 2013-04-08 15:34:12 -04:00
  • 983e524158 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/import-nesting-definition-data Chris Dodge 2013-04-08 15:14:58 -04:00
  • 63b5153cde Clean up violations from ichuang's PR Calen Pennington 2013-04-08 15:08:23 -04:00
  • 4cbb92533f fix broken unit test Chris Dodge 2013-04-08 15:08:05 -04:00
  • d7b148d0d9 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules Chris Dodge 2013-04-08 15:02:47 -04:00
  • c12d265a21 calling update_item implicitly already puts the data in definition.data, so we want to make sure we don't end up nesting definition.data.data Chris Dodge 2013-04-08 15:00:54 -04:00
  • 0b26cc2635 fix line breaks per Cale Chris Dodge 2013-04-08 14:48:16 -04:00
  • e981226d8d Merge pull request #1823 from MITx/diana/job-page-update Diana Huang 2013-04-08 11:45:35 -07:00
  • 8288202008 Marketing request: Lighthouse [#338, fixed] Calen Pennington 2013-04-08 14:42:15 -04:00
  • 069f997595 import was putting the xml data into definition.data.data rather than definition.data Chris Dodge 2013-04-08 14:33:46 -04:00
  • 1500586f70 Merge pull request #1827 from MITx/fix/btalbot/studio-socktypo Mark L. Chang 2013-04-08 11:23:16 -07:00
  • 9a405ff44c Merge pull request #1822 from MITx/fix/cdodge/add-more-container-types-to-inherit-through chrisndodge 2013-04-08 11:11:14 -07:00
  • e3a1279c8f studio - corrected a typo and adjusted copy on the help sock Brian Talbot 2013-04-08 14:10:38 -04:00
  • caa2539893 Merge pull request #1826 from MITx/fix/cdodge/dont-blowup-index-if-no-course-is-None Mark L. Chang 2013-04-08 11:10:15 -07:00
  • aaf95ddbba studio - course link: roughed in new markup/location of course link to share Brian Talbot 2013-04-08 14:09:18 -04:00
  • 472e657692 mark stumble on case where he had a None course Chris Dodge 2013-04-08 14:07:37 -04:00
  • c14d046d2f Merge pull request #1824 from MITx/feature/cdodge/improve-cms-test-coverage Don Mitchell 2013-04-08 10:58:47 -07:00
  • 5137119f2b add a simple Studio walkthough to check page loads Chris Dodge 2013-04-08 13:55:38 -04:00
  • bcf4775610 studio - alerts: removed banners as a design pattern (not using them) and corrected advanced setting links and smoothscrolling Brian Talbot 2013-04-08 13:47:01 -04:00
  • b1716dc2fa Make requested updates to the jobs page Diana Huang 2013-04-08 13:02:21 -04:00
  • 7cd4310c32 extend the list of container module names to our comuputation of inherited metadata Chris Dodge 2013-04-08 12:12:23 -04:00
  • c8cceb7140 Merge branch 'master' into feature/btalbot/studio-alerts Brian Talbot 2013-04-08 11:40:53 -04:00
  • 4d0d3d3ad4 studio - alerts: refactored some alert and notification show/hide js added back to base.js Brian Talbot 2013-04-08 11:35:27 -04:00
  • 28334064ab studio - alerts: reducing the animation time for notification slide downs Brian Talbot 2013-04-08 11:30:49 -04:00
  • 146f09b788 Merge pull request #1821 from MITx/fix/cdodge/student-to-user-name-change chrisndodge 2013-04-08 08:20:19 -07:00
  • 4f71f53826 studio - alerts: adding back in manual close behavior to base.js (needed across app) Brian Talbot 2013-04-08 11:18:10 -04:00
  • a57e0fa2c5 Merge pull request #1819 from MITx/feature/ichuang/fix-edit-links-and-giturl chrisndodge 2013-04-08 08:17:31 -07:00
  • cea0f9252c Make sure we don't mark the message bar as hiding if it is not shown. cahrens 2013-04-08 11:02:06 -04:00
  • 0949754cd4 xblock changed attribute names from 'student' to 'user'. Need to update consumers Chris Dodge 2013-04-08 10:56:40 -04:00