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

21893 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Antoviaque
cabda59871 mentoring-noworkbench: Remove import of workbench module (moved to SDK) 2014-03-18 14:41:39 -04:00
Calen Pennington
58f05f3687 Merge pull request #2840 from ionis-education-group/double-edxmako-startup 
Add method to clear mako template lookups
 2014-03-18 14:31:13 -04:00
Jim Abramson
32fd073760 Merge pull request #2957 from edx/jsa/forum-user-sync 
Ensure account creation succeeds before creating comments service user
 2014-03-18 14:07:44 -04:00
Greg Price
88b0a0a4c1 Merge pull request #2960 from edx/gprice/FOR-499 
Do not allow students to pin/unpin forum threads
 2014-03-18 14:03:56 -04:00
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
Adam
0a45f8278a Merge pull request #2704 from edx/adam/refactor-static-tab-tests 
refactor static tab tests
 2014-03-18 11:44:36 -04:00
Adam Palay
d6522cd123 refactor static tab tests 2014-03-18 10:43:57 -04:00
Valera Rozuvan
0f0b2622eb Merge pull request #2942 from edx/valera/start_introduction_of_jslint 
Start introduction of JSLint for JavaScript
 2014-03-18 08:34:39 +02:00
Mark Hoeber
a795edcf22 Merge pull request #2666 from pdehaye/patch-2 
further explanation on entry_points
 2014-03-17 17:11:02 -04:00
David Baumgold
6e0a455cd7 Merge pull request #2730 from ionis-education-group/fix-static-urls 
Fix URLs for static resources
 2014-03-17 17:00:30 -04:00
Adam
76566be21b Merge pull request #2939 from edx/zub/story/disableunicodecourseids 
Enable/disable unicodes in course id's
 2014-03-17 12:04:51 -04:00
Calen Pennington
c4c998b55a Merge pull request #2954 from cpennington/pure-xblocks-progress-page 
Fix LMS-2349 (Progress page broken for pure xblocks)
 2014-03-17 12:01:30 -04:00
Mark Hoeber
945d8e0528 Merge pull request #2881 from edx/markhoeber/documentation/ca-reorg-real 
Markhoeber/documentation/ca reorg real
 2014-03-17 11:44:15 -04:00
Mark Hoeber
8100e38f3f edX Course Authors Doc Reorganization 2014-03-17 11:43:32 -04:00
Valera Rozuvan
54d1af1679 Update 10_main.js 
Removing JSLint configuration.
 2014-03-17 17:30:31 +02:00
zubiar-arbi
714da6ab23 Enable/disable unicodes in course id's 2014-03-17 20:24:59 +05:00
Dave St.Germain
372d0846fd Merge pull request #2932 from edx/dcs/fix-matlab-input 
This fixes LMS-2387 by removing a resize call that prevented scrolling.
 2014-03-17 11:15:01 -04:00
Calen Pennington
a5498bcbd7 Make progress page work with pure xblocks 
[LMS-2349]
 2014-03-17 10:45:14 -04:00
Calen Pennington
290fd03566 Add tests that verify progress page with pure XBlocks 
This is known to be broken.

[LMS-2349]
 2014-03-17 10:44:37 -04:00
Dave St.Germain
2a20b3f67e This fixes LMS-2387 by removing a resize call that prevented scrolling. 
It also enables syntax highlighting for matlab input fields, which
wasn't previously enabled.
 2014-03-17 10:35:53 -04:00
Don Mitchell
e13d167045 Merge pull request #2918 from edx/dhm/meld_pretty_factory 
Dhm/meld pretty factory
 2014-03-17 09:44:19 -04:00
Alexander Kryklia
13ef23c308 Merge pull request #2786 from edx/alex/fix_download_html5_subs 
Fix donwload subs for non youtube videos and non-en language.
 2014-03-17 12:48:27 +02:00
Waheed Ahmed
70233a96d7 Merge pull request #2926 from edx/waheed/lms2195-localization-fix-on-staff-grading-page 
Internationalization fixed for error msg on staff grading page.
 2014-03-17 13:15:23 +05:00
Waheed Ahmed
741881b360 Internationalization fixed for error msg on staff grading page. 
LMS-2195
 2014-03-17 12:38:20 +05:00
Valera Rozuvan
9d21d75f6e Initial commit. 2014-03-17 08:12:45 +02:00
Sarina Canelake
137faf4407 Merge pull request #2951 from edx/sarina/031514-language-update 
Update translations (autogenerated message)
 2014-03-15 16:21:20 -04:00
Sarina Canelake
da6fdc332b Update translations (autogenerated message) 2014-03-15 15:40:08 -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
Alexander Kryklia
dd20e84c84 Fix donwload subs for non youtube videos and non-en language. 
Check for status in test.
Add test for track url.
Fix test to use cookie.
Use download_track in feature file.
Add new tests for get_transcript.
Add html5 test.
Add content check.
Add tests for available_translations dispatch.
Disable flaky cms test.
Add  w/o english transcript tests.
Add to changelog.
 2014-03-14 18:30:42 +02: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