Christina Roberts
c455710cca
Merge pull request #1815 from MITx/fix/cdodge/studio-forum-improvements
...
Fix/cdodge/studio forum improvements
2013-04-11 10:37:49 -07:00
Vik Paruchuri
358482c55b
Add in test for child weight
2013-04-11 11:54:00 -04:00
Vik Paruchuri
4d3b4a60d6
Significantly less verbose test code
2013-04-11 11:51:27 -04:00
John Jarvis
0c1fd783cb
Setting the edxloggedin cookie on registration
...
Previously it was only set for login
2013-04-11 10:44:22 -04:00
Chris Dodge
e0bc823365
remove auto-provisioning because of a dependency problem between cms and lms
2013-04-11 10:42:03 -04:00
Vik Paruchuri
442d0fcf4f
Add tests for orderings with only one task
2013-04-10 17:41:10 -04:00
Vik Paruchuri
09e18cb815
Add in tests for alternate xml orderings
2013-04-10 17:38:31 -04:00
Vik Paruchuri
ca2eb9cd1b
Add in tests for combinedopenended scoring
2013-04-10 17:33:43 -04:00
Vik Paruchuri
820a2b407a
Add in js image upload preview
2013-04-10 17:06:02 -04:00
Vik Paruchuri
9f04769c00
Better confirmation for flagging
2013-04-10 16:16:13 -04:00
Don Mitchell
f6434ed4fb
Merge pull request #1840 from MITx/fix/cdodge/export-draft-modules
...
Fix/cdodge/export draft modules
2013-04-10 13:12:09 -07:00
Vik Paruchuri
a64d57ae1d
Add popup when flag box is checked
2013-04-10 16:01:56 -04:00
Vik Paruchuri
2a5631da86
Code cleanup
2013-04-10 15:26:45 -04:00
Vik Paruchuri
cef4d0cb09
Display instructor feedback
2013-04-10 15:25:05 -04:00
Vik Paruchuri
799c8282bc
Fix hotkeys for combined open ended
2013-04-10 15:15:22 -04:00
Vik Paruchuri
d0ecbbb4cf
Fix hotkeys in peer and staff grading to use ctrl prefix
2013-04-10 15:10:48 -04:00
chrisndodge
4d9dd40268
Merge pull request #1842 from MITx/feature/christina/metadata
...
Get the "Edit High Level Source" link back in for LaTeX problems. Broken with xblock work.
2013-04-10 12:05:06 -07:00
cahrens
40adfa950d
Get the "Edit High Level Source" link back in. Broken with xblock work.
...
https://edx.lighthouseapp.com/projects/102637-studio/tickets/273
2013-04-10 14:53:26 -04:00
John Jarvis
54e5e3d31f
Adding the EDX_MKTG feature flag and links back to the marketing site
2013-04-10 14:29:55 -04:00
jarv
7102c23d6d
Merge pull request #1841 from MITx/fix/btalbot/loginregister-actions
...
Fix/btalbot/loginregister actions
2013-04-10 10:40:43 -07:00
Brian Talbot
22a56fddb4
edx.org - adding in an intermediate disabled state for login/register submit buttons when the form is first processed
2013-04-10 13:38:25 -04:00
Chris Dodge
0a2937311d
remove commented out code. Also fix up indents and other violations
2013-04-10 12:34:18 -04:00
Chris Dodge
d9fa723eb2
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules
...
Conflicts:
common/lib/xmodule/xmodule/modulestore/xml_importer.py
2013-04-10 12:02:16 -04:00
Brian Talbot
b5ec11afa0
edx.org - adding in more UI status when processing login/register forms
2013-04-10 11:26:00 -04:00
Christina Roberts
276b86a779
Merge pull request #1833 from MITx/feature/btalbot/studio-courselink
...
Feature/btalbot/studio courselink
2013-04-10 07:52:19 -07:00
Brian Talbot
97e893b2ed
Merge branch 'master' into feature/btalbot/studio-courselink
2013-04-10 10:48:33 -04:00
Brian Talbot
01b2fefdd0
studio - revised course URL link label to match wording used elsewhere in the view/app
2013-04-10 10:48:12 -04:00
Chris Dodge
5e3ca48c8d
address some violations
2013-04-10 09:40:23 -04:00
Chris Dodge
07b9d6353e
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/studio-forum-improvements
2013-04-10 09:26:51 -04:00
Sef Kloninger
bd2330a8f0
press releases: more explicitly match on slug (safety)
2013-04-10 08:20:30 -04:00
Sef Kloninger
bcdc6db4a9
press releases: fix stanford announcement in rss feed
2013-04-10 02:26:43 -04:00
Sef Kloninger
4b68e0282f
press releases: use generic matching rule
...
This way instead of having to explicitly add releases to the urls.py
file, we just add the relase to the static_templates/press_releases
directory and the right thing happens.
Getting rid of the current "feature" where /pressrelease redirects to
the current press release. It was broken, looks like it's unused.
Limitation: release file name must match slug, but with underscores and
all lower case.
Why bother? I wanted to do something small to learn the edX toolchain.
2013-04-10 02:16:35 -04:00
Sef Kloninger
f57028b8e8
press releases: standardize template names (move 2)
2013-04-10 01:23:32 -04:00
Sef Kloninger
b118b73143
press releases: standardize template names (move 1)
2013-04-10 01:19:20 -04:00
Vik Paruchuri
463a88ccfb
Display rubric to students after calibration
2013-04-09 16:54:27 -04:00
Christina Roberts
81f94fc4e2
Merge pull request #1832 from MITx/fix/btalbot/studio-contentmargin
...
studio - fixing a visual margin issue with the sign up/in views
2013-04-09 12:51:09 -07:00
jarv
7a0ddb2436
Merge pull request #1836 from MITx/style/btalbot/password-reset-complete
...
edx.org - quick password reset complete view styling
2013-04-09 12:39:43 -07:00
Brian Talbot
86dbfd34a1
edx.org - added basic styles to match previous password reset form to complete view
2013-04-09 15:38:10 -04:00
Vik Paruchuri
7d38147490
Remove attempts field from peer grading template
2013-04-09 15:34:35 -04:00
Vik Paruchuri
418f218eec
Fix some templates, minor code reformats
2013-04-09 15:33:11 -04:00
Brian Talbot
dac88a8f84
Merge pull request #1835 from MITx/feature/jarv/fix-password-fields
...
changing password reset fields to match what is used now
2013-04-09 12:31:45 -07:00
Kevin Chugh
de7b9333b7
add flagging premissions
2013-04-09 15:13:12 -04:00
John Jarvis
c3e5469596
changing password reset fields to match what is used now
2013-04-09 15:11:06 -04:00
Kevin Chugh
93978da87c
fixes cleanup
2013-04-09 14:57:43 -04:00
Vik Paruchuri
247ccc37a6
Code reformat, patch score gen
2013-04-09 14:47:26 -04:00
Vik Paruchuri
112fb4539b
Correctly calculate score for combinedopenended and peer assessment
2013-04-09 14:43:41 -04:00
Vik Paruchuri
45a3dd4ee0
Fix file uploads to work after error
2013-04-09 14:13:29 -04:00
Vik Paruchuri
9cca3072c3
Fix skip behavior for staff
2013-04-09 13:53:51 -04:00
Vik Paruchuri
448c8121c3
Patch combinedopenended to work if self assessment is not first
2013-04-09 13:37:37 -04:00
John Jarvis
2c0b2e4d27
Merge branch 'master' into drupal-new
2013-04-09 13:27:13 -04:00
