Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Greg Price
f56de914d5 Do not allow students to pin/unpin forum threads 
The wrong permission was being checked for pinning/unpinning, so a
sufficiently clever student could pin and unpin threads.

JIRA: FOR-499
 2014-03-12 17:58:31 -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
Don Mitchell
fedc06806d Test schema is set in each collection 2014-03-12 15:15:47 -04:00
Don Mitchell
0895e90ab8 Generate split test data via split 2014-03-12 15:15:47 -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
Don Mitchell
542b146f2f Split: add schema version and drop pretty_id (was placeholder looking for purpose) 
STUD-1359
 2014-03-12 11:30:44 -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