Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,754 Commits 1 Branch 0 Tags
441055d8d606cfde40e7fc3007862067de00a504
Commit Graph

22754 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Cox
441055d8d6 Update changelog 2014-04-25 14:32:03 -07:00
John Cox
0379bd34a0 Fix acceptance tests 2014-04-25 13:34:18 -07:00
John Cox
1192b5f7c9 Make dispatch logic clearer 2014-04-25 12:11:20 -07:00
John Cox
c80b596890 Fix two error message corner cases 2014-04-25 12:11:20 -07:00
John Cox
ce0b640712 Add third-party auth implementation and tests 2014-04-25 12:11:20 -07:00
David Baumgold
838530982a Merge pull request #3380 from fmyzjs/patch-4 
install and set up paver before using it
 2014-04-25 14:05:09 -04:00
David Baumgold
0a022e13ba Merge pull request #3371 from carsongee/cg/pdf_textbook_urls 
Switch PDF Textbooks to use portable URLs
 2014-04-25 13:46:28 -04:00
Mark Hoeber
a4f4d7baf4 Merge pull request #3475 from edx/markhoeber/documentation/doc-107 
bug fix - wrong problem name
 2014-04-25 13:45:58 -04:00
Mark Hoeber
95e4728a89 bug fix - wrong problem name 
doc-289
 2014-04-25 13:44:20 -04:00
srpearce
fad631bfee Merge pull request #3474 from edx/sylvia/docs/typo_in_jsinput 
Fix note formatting problem in JSInput doc
 2014-04-25 13:21:49 -04:00
Sylvia Pearce
4f3efa6a1d Fix note formatting problem in JSInput doc 2014-04-25 13:20:56 -04:00
srpearce
34b17d4b08 Merge pull request #3473 from edx/sylvia/docs/DOC-237 
Update label information; correct typo; add XML to PWAH
 2014-04-25 13:13:21 -04:00
Sylvia Pearce
5ef9618f64 Update change log 2014-04-25 13:13:01 -04:00
Andy Armstrong
f6fc10f34b Merge pull request #3463 from aboudreault/xblock-initialization-issue 
XBlocks are something initialized before all resources (url) are loaded
 2014-04-25 13:09:49 -04:00
Sylvia Pearce
faf35d4277 Update label information; correct typo; add XML to PWAH 2014-04-25 12:33:11 -04:00
Alan Boudreault
901920b0cd no need for $.when() here.. 2014-04-25 11:51:08 -04:00
Usman Khalid
9d3ea699e6 Merge pull request #3455 from edx/usman/lms1466-email-formatting 
Wraps long lines in bulk email messages.
 2014-04-25 20:23:32 +05:00
Jay Zoldak
76b9ecf4e1 Merge pull request #3472 from edx/zoldak/disable-video-test 
Disable flaky video test
 2014-04-25 10:32:57 -04:00
Mark Hoeber
dfa83a81e0 Merge pull request #3379 from edx/ahodges/documentation/AN870 
AN-900: new event types for PDFs
 2014-04-25 09:36:52 -04:00
Alison Hodges
1203001c0d AN-900: new event types for PDFs 2014-04-25 09:36:28 -04:00
srpearce
1499f0b9a0 Merge pull request #3465 from edx/sylvia/docs/TIM-463 
Add information about per-criterion feedback
 2014-04-25 09:29:06 -04:00
Sylvia Pearce
7411bc6258 Minor change 2014-04-25 09:28:33 -04:00
Usman Khalid
8fd14bfca7 Wraps long lines in bulk email messages. 
RFC 2822 states that line lengths in emails must be less than 998.
Some MTA's add newlines to messages if any line exceeds a certain
limit (the exact limit varies). Sendmail goes so far as to add
'!\n' after the 990th character in a line. To ensure that bulk
mail messages look consistent long lines are wrapped to a
conservative length.

LMS-1466
 2014-04-25 18:25:20 +05:00
Jay Zoldak
490d2fef8f Disable flaky video test 2014-04-25 09:12:02 -04:00
Oleg Marshev
7966ca45bd Merge pull request #3384 from edx/oleg/fix-matlab-timeout 
Run Code infinite queueing fix. BLD-994.
 2014-04-25 11:09:53 +03:00
Waheed Ahmed
9fc190dd53 Merge pull request #3445 from edx/waheed/stud1514-toggle-cheatsheet-not-working 
Added code to remove css on closing cheatsheet.
 2014-04-25 12:44:05 +05:00
Oleg Marshev
0f70a997f5 Add timestamp and wait for 35 sec. 2014-04-25 10:26:46 +03:00
Waheed Ahmed
49ef8c5686 Added code to remove css on closing cheatsheet. 2014-04-25 11:35:52 +05:00
Mark Hoeber
dead780148 Merge pull request #3454 from edx/markhoeber/documentation/stud-1566 
HTML Editor Changes - Raw Editor
 2014-04-24 18:34:38 -04:00
Mark Hoeber
a75b6ea5b9 HTML Editor Changes - Raw Editor 
stud-1566
 2014-04-24 18:33:39 -04:00
Alison Hodges
6994f2562a Merge pull request #3468 from edx/ahodges/documentation/chglogchgs 
Removed evil HEAD line
 2014-04-24 18:23:31 -04:00
Alison Hodges
015b1c3abc Removed evil HEAD line 2014-04-24 18:23:10 -04:00
Alison Hodges
1e2adc6891 Merge pull request #3390 from edx/ahodges/documentation/LMS2476 
Ahodges/documentation/lms2476
 2014-04-24 17:30:47 -04:00
Sylvia Pearce
e714409178 Add information about per-criterion feedback 2014-04-24 17:29:15 -04:00
Alison Hodges
bb4b547442 Changes for batch add beta testers feature 2014-04-24 17:28:27 -04:00
Jim Abramson
bf56d30355 Merge pull request #3458 from edx/jsa/user-profile-pagination-acceptance 
add acceptance tests for user profile pagination.
 2014-04-24 16:06:41 -04:00
Alan Boudreault
4d1d1a75ce Wait that all resources are loaded and fragments rendered before initializing the xblock 2014-04-24 15:54:23 -04:00
David Baumgold
d1d3e6b167 Merge pull request #3460 from edx/release 
Merging release back to master
 2014-04-24 15:08:00 -04:00
Mark Hoeber
6686eb54b0 Merge pull request #3448 from edx/ahodges/documentation/DOC275 
DOC-275, location & Language columns
 2014-04-24 14:54:46 -04:00
Alison Hodges
b7c757514a DOC-275, location & Language columns 
additional small typos and fixes
 2014-04-24 14:54:24 -04:00
srpearce
e629e88460 Merge pull request #3461 from edx/sylvia/docs/table_images 
Experiment with cell widths to see if images will appear
 2014-04-24 14:46:45 -04:00
Sylvia Pearce
3c9b79dcd9 Experiment with cell widths to see if images will appear 2014-04-24 14:44:59 -04:00
cahrens
29d32d35ff Tests for raw editor and minor wording changes. 2014-04-24 14:18:13 -04:00
Mark Hoeber
abc6d49ce1 UI String Updates for Raw HTML Editor Change 
Modified the Raw HTML template text and the help string for the Editor
setting.
 2014-04-24 14:18:13 -04:00
Frances Botsford
4960026bc6 adjust codemirror window on raw HTML editor 2014-04-24 14:18:12 -04:00
cahrens
ad3d8c7871 Add support for raw HTML editor. 
STUD-1562
 2014-04-24 14:18:12 -04:00
Andy Armstrong
01fdc22323 Remove verify_html as it isn't supported in TinyMCE 4 2014-04-24 14:17:43 -04:00
Adam Palay
c83797ed94 fixes templating error (LMS-2560) 2014-04-24 14:17:43 -04:00
Andy Armstrong
f4e4082b7d Make TinyMCE more tolerant about HTML elements 
STUD-1565
 2014-04-24 14:17:42 -04:00
srpearce
2825f432e1 Merge pull request #3459 from edx/sylvia/docs/multiple_choice 
Re-add mutiple choice advanced options
 2014-04-24 13:57:06 -04:00