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 |
|
John Jarvis
|
2b309adf9c
|
Fixing cookie handling for edx-mktg-loggedin
|
2013-04-09 13:26:57 -04:00 |
|
Ned Batchelder
|
d2ed6e2c02
|
Merge pull request #1830 from MITx/fix/cale/violations
Clean up violations from ichuang's PR
|
2013-04-09 10:21:49 -07:00 |
|
Calen Pennington
|
5b8a410d12
|
Merge pull request #1829 from MITx/marketing/cale/delftx-header
Marketing request: Lighthouse [#338, fixed]
|
2013-04-09 10:14:19 -07:00 |
|
chrisndodge
|
2fce096e1c
|
Merge pull request #1834 from MITx/bug/christina/base
Need to be able to access smoothScrollTop.
|
2013-04-09 06:52:55 -07:00 |
|
cahrens
|
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.
|
2013-04-09 09:41:52 -04:00 |
|
Kevin Chugh
|
8358e5162a
|
Merge branch 'master' into feature/kevin/flagging
|
2013-04-09 09:23:05 -04:00 |
|
Brian Talbot
|
78079d1ca7
|
Merge branch 'master' into drupal-new
|
2013-04-08 22:35:29 -04:00 |
|
Brian Talbot
|
d8368447fd
|
edx.org - adjusted input height and padding to handle previously uneditable fieldsin firefox
|
2013-04-08 22:35:06 -04:00 |
|
Brian Talbot
|
13b741750a
|
edx.org - basic styling of password reset form
|
2013-04-08 22:16:32 -04:00 |
|
Sarina
|
74104d6081
|
Merge pull request #1831 from MITx/vik/fix/pg-and-progress
Fix weighting and score generation
|
2013-04-08 14:37:07 -07:00 |
|
Brian Talbot
|
12784e3fb8
|
studio - course link final styling
|
2013-04-08 17:35:16 -04:00 |
|
Brian Talbot
|
b51e57eddf
|
studio - refining style and presentation of course link and invitation button on details settings
|
2013-04-08 17:31:14 -04:00 |
|
Kevin Chugh
|
f59b74e27f
|
fix nitpick and merge master
|
2013-04-08 17:19:28 -04:00 |
|
Kevin Chugh
|
2b2621e20c
|
Merge branch 'master' into feature/kevin/pinning_inline
|
2013-04-08 17:19:19 -04:00 |
|
Christina Roberts
|
7fd8a33b3c
|
Merge pull request #1816 from MITx/feature/btalbot/studio-alerts
Feature/btalbot/studio-alerts
|
2013-04-08 14:19:12 -07:00 |
|
Brian Talbot
|
606469cd46
|
studio - fixing a visual margin issue with the sign up/in views header/content areas
|
2013-04-08 17:14:41 -04:00 |
|
Brian Talbot
|
7882845786
|
studio - alerts: correcting page title
|
2013-04-08 17:09:43 -04:00 |
|
Brian Talbot
|
27871ac9c9
|
studio - alerts: hiding alerts (in possbily inaccessible ways) in css for page load's sake
|
2013-04-08 16:55:06 -04:00 |
|
Vik Paruchuri
|
7d09617ec9
|
Fix weighting and score generation
|
2013-04-08 16:52:18 -04:00 |
|
Calen Pennington
|
45bb4d3754
|
Merge pull request #1828 from MITx/fix/cdodge/import-nesting-definition-data
import was putting the xml data into definition.data.data rather than de...
|
2013-04-08 13:50:36 -07:00 |
|
Brian Talbot
|
3f2e21f9dc
|
Merge branch 'master' into feature/btalbot/studio-alerts
|
2013-04-08 16:29:18 -04:00 |
|
Brian Talbot
|
3f22826e26
|
studio - alerts: adding some ARIA-centric accessibility information to example prompts/notifications and advanced settings save notification
|
2013-04-08 16:28:31 -04:00 |
|
Chris Dodge
|
54afc5eb63
|
seems like we need to purge 'filename' from both _model_data as well as xml_attributes
|
2013-04-08 16:09:41 -04:00 |
|
Brian Talbot
|
4e331a2c6a
|
studio - restyling course basic details and adding in a course's URL more prominently WIP
|
2013-04-08 15:39:01 -04:00 |
|
Chris Dodge
|
a0f5a51135
|
wip to fix broken test
|
2013-04-08 15:34:12 -04:00 |
|
Chris Dodge
|
983e524158
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/import-nesting-definition-data
|
2013-04-08 15:14:58 -04:00 |
|
Calen Pennington
|
63b5153cde
|
Clean up violations from ichuang's PR
|
2013-04-08 15:08:23 -04:00 |
|
Chris Dodge
|
4cbb92533f
|
fix broken unit test
|
2013-04-08 15:08:05 -04:00 |
|
Chris Dodge
|
d7b148d0d9
|
Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/export-draft-modules
Conflicts:
common/lib/xmodule/xmodule/modulestore/draft.py
|
2013-04-08 15:02:47 -04:00 |
|
Chris Dodge
|
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
|
2013-04-08 15:00:54 -04:00 |
|
Chris Dodge
|
0b26cc2635
|
fix line breaks per Cale
|
2013-04-08 14:48:16 -04:00 |
|
Diana Huang
|
e981226d8d
|
Merge pull request #1823 from MITx/diana/job-page-update
Make requested updates to the jobs page
|
2013-04-08 11:45:35 -07:00 |
|
Calen Pennington
|
8288202008
|
Marketing request: Lighthouse [#338, fixed]
|
2013-04-08 14:42:15 -04:00 |
|
Chris Dodge
|
069f997595
|
import was putting the xml data into definition.data.data rather than definition.data
|
2013-04-08 14:33:46 -04:00 |
|
Mark L. Chang
|
1500586f70
|
Merge pull request #1827 from MITx/fix/btalbot/studio-socktypo
studio - corrected a typo and adjusted copy on the help sock
|
2013-04-08 11:23:16 -07:00 |
|
chrisndodge
|
9a405ff44c
|
Merge pull request #1822 from MITx/fix/cdodge/add-more-container-types-to-inherit-through
extend the list of container module names to our comuputation of inherit...
|
2013-04-08 11:11:14 -07:00 |
|
Brian Talbot
|
e3a1279c8f
|
studio - corrected a typo and adjusted copy on the help sock
|
2013-04-08 14:10:38 -04:00 |
|