marco
|
3667fe8bd0
|
Merge branch 'feature/vik/oe-ui' of github.com:edx/edx-platform into feature/vik/oe-ui
|
2013-08-07 16:35:32 -04:00 |
|
marco
|
56dee21142
|
partial cleanup for submitted rubric state, along with sass format cleanup for rubric.scss
|
2013-08-07 16:35:14 -04:00 |
|
Vasyl Nakvasiuk
|
ae8b2c883c
|
add Word Cloud acceptance tests
|
2013-08-07 15:46:27 +03:00 |
|
Kristin
|
16b5b95128
|
Merge pull request #506 from edx/ksteph/bugfix_offline_gradecalc
Fix offline_gradecalc
|
2013-08-06 14:53:30 -07:00 |
|
David Baumgold
|
b69be70f65
|
Merge pull request #575 from edx/db/integrate-jsonresponse
Integrate JsonResponse into lms/djangoapps/instructor/views/api.py
|
2013-08-06 11:55:49 -07:00 |
|
David Baumgold
|
714d3b9662
|
pylint fixes
|
2013-08-06 14:36:13 -04:00 |
|
Adam
|
08bb13edb4
|
Merge pull request #595 from edx/adam/i18n-bug-fixes
template fixes on instructor dash
|
2013-08-06 11:25:36 -07:00 |
|
Peter Fogg
|
ae517fee01
|
Merge pull request #455 from edx/peter-fogg/remove-videoalpha-xml
Peter fogg/remove videoalpha xml
|
2013-08-06 11:06:46 -07:00 |
|
chrisndodge
|
c4d6102af6
|
Merge pull request #584 from edx/fix/cdodge/allow-courseware-links-in-capa-module
tie in the normal courseware link url rewriting in capa module since tha...
|
2013-08-06 10:55:46 -07:00 |
|
Peter Fogg
|
9c84440501
|
PR comment cleanup.
|
2013-08-06 13:23:33 -04:00 |
|
Peter Fogg
|
08c5f955aa
|
Unstyled prototype for new list editor design.
|
2013-08-06 13:23:33 -04:00 |
|
Peter Fogg
|
f317244ac4
|
Convert Video Alpha to metadata-only.
|
2013-08-06 13:23:33 -04:00 |
|
Adam Palay
|
d894600207
|
template fixes on instructor dash
|
2013-08-06 10:16:57 -04:00 |
|
Vik Paruchuri
|
cb54081d2e
|
Fix notification problem
|
2013-08-06 09:55:49 -04:00 |
|
Adam Palay
|
4a99b7bfd6
|
update edge.html
|
2013-08-05 18:45:54 -04:00 |
|
Adam Palay
|
5d0328aa3e
|
creates "edge" case
|
2013-08-05 18:08:32 -04:00 |
|
Adam Palay
|
cac6a3195d
|
add university_profile/edge.html for edge landing page
|
2013-08-05 17:26:47 -04:00 |
|
David Baumgold
|
ef4220ee43
|
Add unit tests to exercise common_exceptions_400 decorator
|
2013-08-05 16:54:56 -04:00 |
|
Adam Palay
|
f85cfc11fa
|
redirects lms landing page to student.views.index if there is no marketing site
resets the cms edge redirect to '/'
|
2013-08-05 16:05:12 -04:00 |
|
Chris Dodge
|
9e96b9525b
|
tie in the normal courseware link url rewriting in capa module since that presents HTML via an Ajax callbacks and not via module_render.py
|
2013-08-05 15:24:19 -04:00 |
|
David Baumgold
|
7b01147c1a
|
Translate messages early
|
2013-08-05 13:51:47 -04:00 |
|
David Baumgold
|
8807d9fe51
|
Integrate JsonResponse into lms/djangoapps/instructor/views/api.py
|
2013-08-05 13:00:30 -04:00 |
|
Adam
|
ad73feb7e3
|
Merge pull request #565 from edx/adam/i18n-bug-fixes
more template fixes for faq, press, and help
|
2013-08-05 08:25:29 -07:00 |
|
Adam Palay
|
d0a36076c3
|
more template fixes for faq, press, and help
|
2013-08-05 11:24:25 -04:00 |
|
Vasyl Nakvasiuk
|
a52964a786
|
Hotfix world cloud functionality
|
2013-08-05 17:14:11 +03:00 |
|
chrisndodge
|
85267e6a73
|
Merge pull request #535 from edx/feature/cdodge/add-display-org-and-coursenum
add display_coursenumber and display_organization fields on the CourseModule
|
2013-08-04 18:00:29 -07:00 |
|
Chris Dodge
|
18458bd94b
|
wrong accessor
|
2013-08-02 21:45:51 -04:00 |
|
Chris Dodge
|
eaeaf3a520
|
fix formatting error
|
2013-08-02 21:44:48 -04:00 |
|
Chris Dodge
|
192d51bf7a
|
touch-ups per review feedback
|
2013-08-02 21:37:27 -04:00 |
|
Vik Paruchuri
|
ea2b9191c1
|
Allow student to switch between rubrics, tell user once peer grading required amount is done
|
2013-08-02 15:30:17 -04:00 |
|
marco
|
478fa18beb
|
merge edit cleanup, nothing new
|
2013-08-02 14:30:04 -04:00 |
|
Diana Huang
|
4005b3bd79
|
Merge pull request #554 from edx/diana/django-ratelimit
Limit the rate of logins
|
2013-08-02 11:02:04 -07:00 |
|
Vik Paruchuri
|
aa09006247
|
Hide and show multiple rubrics
|
2013-08-02 13:53:07 -04:00 |
|
Adam
|
553512ba0a
|
Merge pull request #560 from edx/adam/i18n-bug-fixes
template errors
|
2013-08-02 10:45:58 -07:00 |
|
marco
|
ec99e20a35
|
styled rubric, dividers between sections
|
2013-08-02 13:37:53 -04:00 |
|
Vik Paruchuri
|
932bbd2592
|
Fix text issue
|
2013-08-02 13:23:03 -04:00 |
|
Vik Paruchuri
|
a939c152c8
|
Add in support for multiple rubrics
|
2013-08-02 12:56:31 -04:00 |
|
Adam Palay
|
d4a526906e
|
template errors
|
2013-08-02 12:54:46 -04:00 |
|
Vik Paruchuri
|
e2c4b5016a
|
Merge remote-tracking branch 'origin/feature/vik/oe-ui' into feature/vik/oe-ui
|
2013-08-02 12:13:02 -04:00 |
|
Vik Paruchuri
|
30e506777e
|
Render multiple rubrics, collapse rubrics
|
2013-08-02 12:12:38 -04:00 |
|
Chris Dodge
|
c20ca2bf5e
|
fix more rebase conflicts
|
2013-08-02 11:25:05 -04:00 |
|
Diana Huang
|
c867be7961
|
Limit the rate of logins.
|
2013-08-02 11:23:59 -04:00 |
|
Chris Dodge
|
f041ab1ccc
|
fix rebase conflicts
|
2013-08-02 11:22:25 -04:00 |
|
Chris Dodge
|
e41554b24c
|
be sure to encode the display strings
|
2013-08-02 09:56:19 -04:00 |
|
Chris Dodge
|
0937cdcbe6
|
one more escaping
|
2013-08-02 09:56:19 -04:00 |
|
Miles Steele
|
4b671d1195
|
fix pylint violations
|
2013-08-02 09:53:21 -04:00 |
|
Miles Steele
|
2760938e15
|
fix analytics distribution with no data, add unit test, cleanup
|
2013-08-02 09:53:21 -04:00 |
|
Miles Steele
|
f7989cb2ab
|
move to instructor template directory
|
2013-08-02 09:53:21 -04:00 |
|
Miles Steele
|
f88b266c2b
|
add member list widget, add segment.io call for section view
|
2013-08-02 09:53:21 -04:00 |
|
Miles Steele
|
588a307de5
|
add dangerous button confirmation popup
|
2013-08-02 09:53:21 -04:00 |
|