Vik Paruchuri
8ca12ce500
Make combined open ended a container
2013-01-10 18:59:57 -05:00
Vik Paruchuri
bc6838f8da
Minor changes
2013-01-10 18:59:57 -05:00
Brian Talbot
759bb137b4
pearson registration - adjusted style for rejected message state on dashboard
2013-01-10 17:08:01 -05:00
Victor Shnayder
e97469aee6
Merge pull request #1236 from MITx/diana/peer-grading-views
...
Peer Grading Interface
2013-01-10 13:59:46 -08:00
Carlos Andrés Rocha
8f21d7a738
Add property to course module to check if a course is new
...
The property can be set in the policy metadata. If it is not specified
then it is set to true if the course has not started yet.
Also adds a property to check how many days are left until the course starts.
2013-01-10 15:57:29 -05:00
Diana Huang
c4d1b2e643
Use correct user id and make the reload button a back button
2013-01-09 14:41:23 -05:00
Brian Wilson
21fe582788
No longer need this extra file.
2013-01-09 11:51:55 -05:00
Brian Wilson
8ad9bc5949
Move Pearson URL to settings. Fix Register button. Other small changes.
2013-01-09 11:26:54 -05:00
Brian Wilson
a5cce4769e
add accommodation listing, and revise error messages
2013-01-09 02:14:02 -05:00
Brian Wilson
25f08374ca
hook up more registration status boxes
2013-01-08 17:42:15 -05:00
Brian Talbot
bbe0120d5c
pearson registration - changed accepted classes, content, and styling to use the term process instead
2013-01-08 11:41:01 -05:00
Brian Talbot
352f284624
pearson registration - revised UI states for reg form, simplified markup for form fields, synched button styles/text b/t registration form and dashboard
2013-01-08 11:37:26 -05:00
Brian Talbot
b41f68c801
pearson registration - changing registration status states to progress-based states UI - wip
2013-01-07 17:14:11 -05:00
Diana Huang
3f254fc3c7
Merge branch 'master' into diana/peer-grading-views
2013-01-07 15:57:39 -05:00
Brian Talbot
2ec11e5b92
pearson registration - refined error output and accommodation field display toggling
2013-01-07 15:15:50 -05:00
Chris Dodge
3b5e17ef55
Merge branch 'master' into feature/cdodge/cms-master-merge2
...
Conflicts:
.gitmodules
common/djangoapps/__init__.py
common/djangoapps/track/migrations/__init__.py
common/lib/capa/capa/inputtypes.py
common/lib/capa/capa/responsetypes.py
common/lib/capa/capa/templates/openendedinput.html
common/lib/xmodule/xmodule/course_module.py
common/lib/xmodule/xmodule/video_module.py
common/static/sass/bourbon/css3/_box-sizing.scss
doc/development.md
lms/djangoapps/instructor/tests.py
lms/envs/aws.py
lms/envs/common.py
lms/templates/video.html
requirements.txt
test-requirements.txt
2013-01-07 12:34:48 -05:00
Carlos Andrés Rocha
56f1c6aad9
Fixed extra characters in faq page
2013-01-07 10:14:00 -05:00
Robert Chirwa
faa2373256
Fix typo in the job page
...
Signed-off-by: Carlos Andrés Rocha <rocha@edx.org >
2013-01-07 10:08:16 -05:00
Brian Wilson
e57656e24f
Add TestCenterExam class to course module, and plumb through.
2013-01-06 17:57:13 -05:00
Brian Wilson
ea8a56da0a
add id generation and validation
2013-01-04 18:45:46 -05:00
Diana Huang
e410703e33
Minor bug fixes and improvements
2013-01-04 17:20:03 -05:00
Diana Huang
093560e859
Updates to copy and styling and a few bugfixes
2013-01-04 16:36:28 -05:00
Diana Huang
fa09e25a1a
Add interstitial page between calibration and grading.
...
Make individual Prompt and Rubric Sections hideable.
2013-01-04 15:18:39 -05:00
Diana Huang
befe36f626
Improvements to calibration feedback step
2013-01-04 14:11:48 -05:00
Diana Huang
ad63c492be
Minor updates to the page to handle showing Calibration feedback.
...
Also, allow for the hiding of the Prompt and the Rubric.
2013-01-04 12:42:38 -05:00
Diana Huang
d2228205e2
Merge branch 'master' into diana/peer-grading-views
2013-01-04 11:19:10 -05:00
Diana Huang
b5f34a9da6
Show special text when calibrating or when grading.
2013-01-04 11:03:24 -05:00
Carlos Andrés Rocha
d0221808db
Merge pull request #1228 from MITx/content/rocha/media-kit
...
Add new tab/window behavior to media kit
2013-01-04 07:07:43 -08:00
Brian Talbot
04524ef58f
media kit - added in new tab/window behavior for download links, revised edX name styling on homepage cta, and provided more context on logo download text
2013-01-04 10:02:14 -05:00
Brian Wilson
e32dfcf0a0
get display of validation errors to work.
2013-01-04 01:39:40 -05:00
Brian Wilson
c5cc15a92a
return json, and add validation errors. Start displaying field with error.
2013-01-03 18:51:26 -05:00
Carlos Andrés Rocha
95e7f2f1eb
Merge pull request #1226 from MITx/content/rocha/media-kit
...
Fix error in one of the media kit assets URLs
2013-01-03 15:30:08 -08:00
Carlos Andrés Rocha
59f4962cfa
Fix error in one of the media kit assets URLs
2013-01-03 18:29:34 -05:00
Carlos Andrés Rocha
c3d7bbe0e0
Merge pull request #1225 from MITx/content/rocha/media-kit
...
Minor style changes to home page and media kit page
[Finishes #41872203 ]
2013-01-03 15:07:55 -08:00
Carlos Andrés Rocha
25cb6d5a22
Minor style changes to home page and media kit page
...
[#41872203 ]
2013-01-03 18:06:22 -05:00
David Ormsbee
67dea0c3c3
Merge pull request #1224 from MITx/content/rocha/media-kit
...
Add media kit page
2013-01-03 14:50:57 -08:00
Carlos Andrés Rocha
2e6ac2f72c
Fix link to root page on the main page footer
2013-01-03 17:21:54 -05:00
Brian Talbot
a67b54bf82
media kit - added initial styles to media kit page
2013-01-03 17:10:16 -05:00
Diana Huang
28501ca58e
Merge branch 'master' into diana/peer-grading-views
2013-01-03 16:23:14 -05:00
Brian Talbot
e10e87e6ec
media kit - revised link styling on homepage
2013-01-03 14:21:07 -05:00
Diana Huang
becffd4dbb
Updated html and javascript for new pages as well
...
as a fix for the peer grading service
2013-01-03 14:08:56 -05:00
Diana Huang
c0001597a3
Update some of the templates so that they don't break
2013-01-03 13:47:29 -05:00
Carlos Andrés Rocha
bd0a2f6630
Add content and assets for media kit
...
[# 41872203]
2013-01-03 13:28:45 -05:00
Diana Huang
962d83d71b
Display a message when there are no problems to grade
2013-01-03 13:00:02 -05:00
Calen Pennington
8874d9d7f8
Add a draft implementation of the Poll module for Justice
2013-01-03 12:21:13 -05:00
Chris Dodge
e70db062b2
Merge branch 'feature/cale/cms-master' into feature/cale/cms-master-merge
...
Conflicts:
requirements.txt
2013-01-03 10:46:24 -05:00
Chris Dodge
7229a9cdaf
perform a new merge from master, resolve conflicts
2013-01-03 10:43:03 -05:00
Brian Wilson
c76f37050a
introduce form to template
2013-01-03 03:22:37 -05:00
Brian Wilson
4abd9cd3d4
get closer to working again
2013-01-02 18:56:25 -05:00
Diana Huang
c89ff2ac0e
Basic peer grading view using mocks and some cleanup in
...
the peer grading service
2013-01-02 17:44:58 -05:00
