Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,859 Commits 1 Branch 0 Tags
b20c8f9248e9761d5e685ac8a529cf659ac449cf
Commit Graph

21859 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jsa
b20c8f9248 Ensure account creation succeeds before creating comments service user 
Also improves handling in cases where account creation did succeed, but
comments service user creation did not.

Depends on commit 88abdd8a0b20bc9816f487b25abdea1953f5661d in https://github.com/edx/cs_comments_service

JIRA: FOR-522
 2014-03-18 13:24:30 -04:00
Mark Hoeber
16523b9912 Merge pull request #2947 from edx/markhoeber/documentation/doc-34 
Edits from Alison's initial review
 2014-03-14 15:52:33 -04:00
Mark Hoeber
bb85698450 Edits from Alison's initial review 
DOC-34
 2014-03-14 15:02:35 -04:00
srpearce
f666b8542c Merge pull request #2943 from edx/sylvia/documentation/BLD-850 
Consolidate information from data.edx.org, Appendix E, and problem types
 2014-03-14 14:37:19 -04:00
Carlos Andrés Rocha
f7892da063 Merge pull request #2944 from rocha/improve-dumps-course-ids-tests 
Improve dump_course_ids test for unicode course_ids
 2014-03-14 13:54:07 -04:00
Carlos Andrés Rocha
e5c042aa4f Improve dump_course_ids test for unicode course_ids 2014-03-14 10:21:31 -04:00
Sylvia Pearce
6c20d1bace Consolidate information from data.edx.org, Appendix E, and problem types 2014-03-14 09:41:10 -04:00
Julia Hansbrough
ac6b9f8e2a Merge pull request #2936 from edx/flowerhack/dark-lang-docs 
Fixed confusing docstring
 2014-03-13 18:44:32 -04:00
Julia Hansbrough
08939b64dc Fixed confusing docstring 2014-03-13 22:09:29 +00:00
David Baumgold
73d0d093f9 Merge pull request #2654 from pdehaye/patch-1 
missed rst
 2014-03-13 16:34:18 -04:00
frances botsford
c87a1138a3 Merge pull request #2923 from lduarte1991/master 
CSS changes regarding TinyMCE in annotation tool & accessibility issues
 2014-03-13 12:55:55 -04:00
Christina Roberts
cbbf38b40a Merge pull request #2838 from edx/andya/container-publishing 
Support publishing of nested xblocks
 2014-03-13 12:34:22 -04:00
Alexander Kryklia
e457135ee7 Merge pull request #2931 from edx/alex/allow_uppercase_srt_extension 
Allow uppercase transcripts srt extension.
 2014-03-13 18:27:35 +02:00
Andy Armstrong
891cf8bb08 Merge pull request #2924 from edx/andya/studio-split-test-support-2 
Fix split_test xblock so that it can render in Studio
 2014-03-13 12:11:01 -04:00
cahrens
5166461c62 Don't translate reference code. 2014-03-13 11:58:26 -04:00
cahrens
496a6b8be6 Improve text referencing link for translators. 2014-03-13 11:58:08 -04:00
cahrens
1453a86122 Minor code cleanup. 2014-03-13 11:57:30 -04:00
Alison Hodges
2218764e94 Merge pull request #2930 from edx/ahodges/documentation/updateindex 
Added internal refs to help researchers find the data format files
 2014-03-13 11:25:16 -04:00
Alison Hodges
d65a216d69 Added internal refs to help researchers find the data format files 2014-03-13 11:24:11 -04:00
Alexander Kryklia
7fe675b1d0 Allow uppercase transcripts srt extension. 2014-03-13 17:06:17 +02:00
Sarina Canelake
7d2f9b88e3 Merge pull request #2857 from edx/adam/new-data-download 
Update data download dash for parity (LMS-1203)
 2014-03-13 10:58:50 -04:00
Sarina Canelake
52c38a9192 Merge pull request #2927 from edx/adam/allow_usernames_or_email 
make widget accept usernames or emails (LMS-1438)
 2014-03-13 10:57:23 -04:00
Dave St.Germain
2261aa81ed Merge pull request #2929 from edx/dcs/add-cssjs-to-codemirror 
Fixes STUD-1434 by including the CodeMirror css mode in codemirror-compressed.js
 2014-03-13 10:42:03 -04:00
Carlos Andrés Rocha
67ab115169 Merge pull request #2920 from rocha/make-course-export-related-command-unicode-aware 
Support unicode in course ids when dumping all courses
 2014-03-13 10:30:08 -04:00
Dave St.Germain
da72cd355d Fixes STUD-1434 by including the CodeMirror css mode in 
codemirror-compressed.js
 2014-03-13 10:12:25 -04:00
Alison Hodges
32d6eed2c4 Merge pull request #2795 from edx/ahodges/documentation/studentdata 
Ahodges/documentation/studentdata
 2014-03-13 09:34:27 -04:00
Alison Hodges
a5cc790835 Updates and corrections for DOC-169 2014-03-13 09:32:44 -04:00
Sarina Canelake
6ca099d5b6 Acceptance tests for beta instructor dash 
LMS-1203
 2014-03-13 07:49:40 -04:00
Adam Palay
4874f21f6f Inst Dash membership widget accepts usernames 
In addition to email addresses. LMS-1438
 2014-03-13 07:44:07 -04:00
Adam Palay
74714c4ed7 Update data download dash for parity (LMS-1203) 2014-03-13 06:47:40 -04:00
Carlos Andrés Rocha
9ecf2c00c0 Support unicode in course ids when dumping all courses 
Fixes: AN-657
 2014-03-12 18:02:05 -04:00
Andy Armstrong
58483c0649 Fix split_test xblock so that it can render in Studio 
This change addresses STUD-1403 where split_test modules could not render in Studio.
It changes Studio to pass a new parameter 'runtime-type' of 'studio' when rendering
 an xblock. In split_test, this will then cause all of the children to be rendered,
 rather than just the one that matches the conditional.
 2014-03-12 17:21:04 -04:00
lduarte1991
e52e544fb6 As per request #2898, changed the css for annotator tool to affect tinymc only when in annotator-wrapper. 
Also removed the outline:none for accessibility requirements and
removed two redundant css files from lms.
 2014-03-12 17:09:20 -04:00
Frances Botsford
089a1db677 adjusted Studio container publishing status message 2014-03-12 16:56:54 -04:00
cahrens
dd22bf49a3 Update tests and minor cleanup. 2014-03-12 16:13:07 -04:00
Andy Armstrong
6d2cd987dc Merge release-2014-03-12 back to master. 
https://edx-wiki.atlassian.net/wiki/display/ENG/Release+Page%3A+2014-03-12
 2014-03-12 16:07:00 -04:00
Andy Armstrong
3bb4be7d95 Add publishing sidebar to container page 2014-03-12 19:33:52 +00:00
Frances Botsford
b59d7ba9ec first stab at publishing status for the container page 2014-03-12 19:33:52 +00:00
Andy Armstrong
ad27107343 Support making drafts of nested xblocks 2014-03-12 19:33:52 +00:00
David Ormsbee
a51c993fca Merge pull request #2916 from antoviaque/mentoring-csv-courseid 
mentoring data export: Only export answers from the current course
 2014-03-12 15:01:04 -04:00
Mark Hoeber
5629c7ac93 Merge pull request #2897 from edx/markhoeber/documentation/release-notes-3-11-14 
Release notes 3-11-14  Doc-73
 2014-03-12 14:44:56 -04:00
Mark Hoeber
648422f966 Release notes 3-11-14 
DOC-73
 2014-03-12 14:44:10 -04:00
srpearce
1b5e110a7e Merge pull request #2917 from edx/sylvia/documentation/BLD-888 
Update video doc to reflect new LMS **Download transcript** button
 2014-03-12 14:25:19 -04:00
Jay Zoldak
a58f06a4f5 Merge pull request #2913 from edx/zoldak/fix-ora-bc-test 
Return valid feedback from ORA stub
 2014-03-12 13:31:31 -04:00
Valera Rozuvan
1c71c7379f Merge pull request #2915 from edx/valera/fix_typo_2 
Fix typo in Video acceptance test.
 2014-03-12 19:24:41 +02:00
Sylvia Pearce
11aa95cefb Update video doc to reflect new LMS **Download transcript** button 2014-03-12 13:22:04 -04:00
Valera Rozuvan
c2de0a1346 Fix typo in Video acceptance test. 2014-03-12 18:50:55 +02:00
Xavier Antoviaque
fd830f22c5 mentoring data export: Only export answers from the current course 2014-03-12 12:50:38 -04:00
Jay Zoldak
fecc5658a6 Return valid feedback from ORA stub 
so that the logs will be much cleaner.
See test_root/log/bok_choy_lms.log
 2014-03-12 12:40:10 -04:00
Giulio Gratta
e555a2d9f9 Merge pull request #2851 from edx/giulio/high-a11y-issues-mar2014 
High priority a11y issues march 2014
 2014-03-12 09:28:02 -07:00