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

22732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Sylvia Pearce
283e4b0bc3 Re-add mutiple choice advanced options 2014-04-24 13:56:30 -04:00
jsa
f71e78b69f add acceptance tests for user profile pagination. 
JIRA: FOR-492
 2014-04-24 13:47:03 -04:00
Greg Price
909903eb9c Merge pull request #3391 from edx/gprice/user-profile-pagination 
Add pagination to forum user profile
 2014-04-24 13:34:53 -04:00
clytwynec
693e5f7b7b Merge pull request #3456 from edx/clytwynec/remove-trailing-periods-in-scenario-names 
Remove trailing periods in scenario names
 2014-04-24 13:00:05 -04:00
Christine Lytwynec
ea3c48cf02 Removed trailing periods in two scenario names 2014-04-24 12:00:51 -04:00
Alison Hodges
2e57236511 Merge pull request #3287 from edx/ahodges/documentation/DOC115 
Ahodges/documentation/doc115
 2014-04-24 10:53:53 -04:00
Alison Hodges
128beb5c97 DOC-115 adds topics to make data interpretation easier 2014-04-24 10:53:22 -04:00
srpearce
d599bc6f7f Merge pull request #3453 from edx/sylvia/docs/DOC-224 
Typo corrections
 2014-04-24 10:51:55 -04:00
Sylvia Pearce
61f797bbdd Typo corrections 2014-04-24 10:51:00 -04:00
jmclaus
e7e9fb32bb Merge pull request #3447 from edx/jmclaus/bugfix_hd_button_activates_by_itself 
Set initial video quality to large instead of default to avoid automatic switch to HD when iframe resizes. [BLD 981]
 2014-04-24 10:32:37 -04:00
srpearce
38378cdaac Merge pull request #3360 from edx/DOC-224 
Doc 224
 2014-04-24 10:19:21 -04:00
Sylvia Pearce
c85a1557b6 Separate each problem type into its own file 
Separate all exercise and tool types, and create a new folder to contain them.
 2014-04-24 10:17:13 -04:00
jmclaus
69ed95b482 Set initial video quality to large instead of default to avoid automatic switch to HD when iframe resizes. [BLD 981] 2014-04-24 09:37:26 -04:00
zubair-arbi
b293325092 Merge pull request #3304 from edx/zub/story/deletecoursegroups 
properly remove users from instructor/staff groups on a course delete
 2014-04-24 18:34:37 +05:00
zubiar-arbi
7b5c647c8e properly remove users from instructor/staff groups on a course delete 
STUD-1555
 2014-04-24 17:11:19 +05:00
Greg Price
0e59038c72 Add pagination to forum user profile page 2014-04-23 16:49:50 -04:00
Mark Hoeber
9d90339682 Merge pull request #3430 from edx/markhoeber/documentation/doc-273 
Release notes draft 4-23-14
 2014-04-23 16:39:23 -04:00
Mark Hoeber
74042bff9e Release notes draft 4-23-14 2014-04-23 16:38:56 -04:00
Jay Zoldak
8da80b5e45 Merge pull request #3341 from edx/ammar/bok-choy-video-tests-batch2 
Convert video tests from lettuce to bok-choy - batch 2
 2014-04-23 16:15:24 -04:00