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
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
