Commit Graph

21831 Commits

Author SHA1 Message Date
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
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
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
Sarina Canelake
f2cfb493a6 Merge pull request #2911 from edx/sarina/new-languages
Add new languages
2014-03-12 11:42:00 -04:00
Sarina Canelake
a24d8f2b89 Add new languages 2014-03-12 11:08:02 -04: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
Greg Price
117924f7d3 Merge pull request #2907 from edx/gprice/FOR-523
Add missing import
2014-03-12 11:00:25 -04:00
Will Daly
acea6c83fa Merge pull request #2891 from edx/will/allow-advanced-components-local-dev
Enable advanced components by default in devstack
2014-03-12 09:56:28 -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
Andy Armstrong
14d0378447 Merge pull request #2906 from edx/anton/fix-for-different-videoids
Video: Fix issues related to videos that have separate YouTube IDs for the different video speeds.
2014-03-11 16:50:50 -04: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
Greg Price
834692b2e3 Add missing import
JIRA: FOR-523
2014-03-11 14:51:08 -04: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
40c1090ca8 Upload files explicitly in tests. 2014-03-11 20:21:15 +02:00
polesye
ddf41ce9c5 BLD-915: Fix issues with different videoIDs. 2014-03-11 20:21:06 +02:00
Giulio Gratta
0b3a67d287 focus management and js syntax fix 2014-03-11 11:10:27 -07:00
Giulio Gratta
2ae18c005f change 'modal' wording to something more general and less jargony 2014-03-11 11:05:42 -07:00
Giulio Gratta
61a4aaa9a9 raise contrast of 'points possible' text to WCAG AA 2014-03-11 11:05:42 -07:00
Usman Khalid
e117957e2a Fixed module urls creation in legacy instructor dashboard.
LMS-2327
2014-03-11 13:40:00 -04:00
frances botsford
28382316aa Merge pull request #2867 from edx/frances/feature/lms-inst-dash-cleanup
cleanup of instructor dash membership
2014-03-11 13:38:36 -04: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
Frances Botsford
fd1014457d cleanup of instructor dash membership 2014-03-11 13:05:30 -04:00
polesye
2dad79db11 Upload files explicitly in tests. 2014-03-11 18:41:24 +02:00