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

7763 Commits

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
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
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
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
Alexander Kryklia
7fe675b1d0 Allow uppercase transcripts srt extension. 2014-03-13 17:06:17 +02: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
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
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
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
Greg Price
3884ba4758 Merge pull request #2909 from edx/gprice/bok-choy-robustness 
Improve robustness of bok choy discussion tests
 2014-03-12 11:05:59 -04:00
ichuang
21ac2e4cc9 Merge pull request #2667 from edx/fix/ichuang/infinity 
add infinity symbol to calc preview
 2014-03-11 22:10:35 -04:00
Valera Rozuvan
28bdb0bb3e Merge pull request #2822 from edx/valera/convert_collapsible_to_js 
Converting Collapsible module to JS.
 2014-03-11 22:53:28 +02:00
Greg Price
cc0d227928 Improve robustness of bok choy discussion tests 
A test failed because an element disappeared between the evaluation of
the clauses of a conjunction, so rewrite to make the conjunction
unnecessary.
 2014-03-11 16:44:52 -04:00
David Baumgold
5be58fc157 Merge pull request #2883 from edx/db/fix-import 
Fix undefined references to pytz, and update tests
 2014-03-11 16:41:20 -04:00
Giulio Gratta
1cd5a80d1e replace unicode 'X' with font-awesome 'remove' 2014-03-11 12:48:58 -07:00
David Baumgold
f25a7870a5 fix tests 2014-03-11 14:48:03 -04:00
Dave St.Germain
5e4c25dd82 Merge pull request #2894 from edx/dcs/a11y-restore-outline 
Remove outline:none to assist keyboard navigation
 2014-03-11 14:33:37 -04:00
Dave St.Germain
6d9ca6008c Remove outline:none 2014-03-11 14:33:04 -04:00
Anton Stupak
d64049c4c3 Merge pull request #2901 from edx/anton/fix-video-in-flash-mode 
Video: Fix issues related to videos that have separate YouTube IDs for the different video speeds.
 2014-03-11 20:32:12 +02:00
polesye
ddf41ce9c5 BLD-915: Fix issues with different videoIDs. 2014-03-11 20:21:06 +02:00
Giulio Gratta
61a4aaa9a9 raise contrast of 'points possible' text to WCAG AA 2014-03-11 11:05:42 -07:00
Greg Price
654239dc2c Merge pull request #2890 from edx/gprice/user-api-with-prefs 
Augment user API to allow easier access to user preferences
 2014-03-11 13:37:50 -04:00
Andy Armstrong
750640b6f0 Merge pull request #2902 from edx/usman/lms2136-wiki-slug-renamespacing-fix 
Do not remap the wiki_slug if reimporting into the same course.
 2014-03-11 13:08:03 -04:00
Greg Price
bbd6f788ad Add endpoint to get user list for a preference 
The endpoint includes the key of the desired preference in the URL and
returns the list of users for whom the preference is set (regardless of
the value).
 2014-03-11 12:03:33 -04:00
Sarina Canelake
e6c9a6c9d9 Merge pull request #2889 from edx/sarina/fix-abtest-for-sequentials 
Bugfix for split test on sequential save
 2014-03-11 11:59:17 -04:00
Usman Khalid
cb2243a495 Do not remap the wiki_slug if reimporting into the same course. 
LMS-2136
 2014-03-11 20:47:21 +05:00
polesye
43c16bd093 BLD-915: Fix issues with different videoIDs. 2014-03-11 17:38:29 +02:00
Greg Price
8f01756c6c Include preferences in users returned by user API 2014-03-11 11:17:13 -04:00
Valera Rozuvan
481253d6ec Merge pull request #2893 from edx/valera/add_missing_comment 
Add a missing comment documenting the changes done in PR 2841.
 2014-03-11 17:11:53 +02:00
Sarina Canelake
119ffd4677 Bugfix for split test on sequential save 
Bug would occur when comparing Groups or UserPartitions - because these types
lacked comparator methods, different objects would come up as different when
their values were equal.
 2014-03-11 10:51:39 -04:00
Sarina Canelake
1ece8f78af Merge pull request #2896 from edx/sarina/LMS-2302 
Put language modal in alphabetical order LMS-2302
 2014-03-11 10:33:32 -04:00
Don Mitchell
adb7fbcb4b Merge pull request #2849 from edx/dhm/split_course_id 
Make course_id a required arg to split.create_course
 2014-03-11 10:22:46 -04:00
Sarina Canelake
5c1c96923a Put language modal in alphabetical order LMS-2302 2014-03-11 10:20:21 -04:00
Sarina Canelake
e3a70ce6df Fix for CourseFactory bug - course object not saved after setattr called 2014-03-11 10:00:42 -04:00
Dave St.Germain
be239bdbca remove old version of codemirror, to prevent confusion 2014-03-11 09:31:29 -04:00
Valera Rozuvan
fc4686b8e2 Add a missing comment documenting the changes done in PR 2841. 2014-03-11 15:20:59 +02:00
Valera Rozuvan
1136336fc4 Converting collapsible module to JavaScript. 2014-03-11 11:28:46 +00:00
Valera Rozuvan
cf47f522c0 Fix Firefox YouTube default Flash mode 
BLD-895
 2014-03-11 10:47:47 +00:00
Dave St.Germain
cc76690db7 Merge pull request #2874 from edx/dcs/remove-old-codemirror 
remove old version of codemirror css, to prevent confusion
 2014-03-10 17:13:16 -04:00
Calen Pennington
31a070d480 Merge remote-tracking branch 'edx/release' into merge-release-2014-03-10 
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
 2014-03-10 16:21:08 -04:00
David Baumgold
2f3d2ecac0 Fix undefined references to pytz 2014-03-10 16:19:10 -04:00
Greg Price
08ed1c5439 Merge pull request #2832 from edx/gprice/create-account-lang-pref 
Save language preference on account creation
 2014-03-10 15:13:15 -04:00
Greg Price
fa29a35ab8 Save language preference on account creation 
This is necessary to allow non-browser-based services (e.g. notifier)
to know a user's preferred language even if the user has not explicitly
selected one.
 2014-03-10 13:28:12 -04:00
Sarina Canelake
a10d8d41d2 Merge pull request #2878 from edx/sarina/LMS-2302 
Put language modal in alphabetical order LMS-2302
 2014-03-10 12:51:17 -04:00
Calen Pennington
0a79b30ec4 Delay import of xmodule packages until after sys.path fixup 2014-03-10 12:04:00 -04:00
Calen Pennington
760027bd2a Normalize the representation of Scope.content data in MongoModulestore FieldData 
Without this, the new 'items' field in the course_info xmodule caused
bizarre behavior. If you added the text 'items' to a course_info
section, then the LMS would throw a 500, because the field name isn't
'data', but the stored data is a string, leading to the check of
`key.field_name in self._data`, where key.field_name is the string 'items',
and self._data is the content string.
 2014-03-10 12:01:57 -04:00