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

22819 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David Baumgold
05e55641eb remove duplicate "should" 2014-04-24 09:12:24 -04:00
David Baumgold
99897c4310 Add example for how scrum teams spend time reviewing contributor pull requests 2014-04-24 09:11:14 -04:00
David Baumgold
ab5a2a4150 core committers, not contributors 2014-04-24 09:08:07 -04: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
David Baumgold
4bc3ec285c Added a visualization of the PR process 2014-04-23 17:19:22 -04:00
David Baumgold
44e4f96dc6 link to docs to rebase a pull request 2014-04-23 17:09:49 -04:00
David Baumgold
09f8923884 Include analytics team in dev process 2014-04-23 17:05:36 -04: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
Greg Price
643069c64c Remove cruft from user profile threads 
This removes the vote button from threads on the user profile, which was
the only interaction available on the page other than the link to view
the thread in the main discussion view.
 2014-04-23 16:07:36 -04:00
David Baumgold
6773105264 Merge pull request #3425 from edx/pk-set-can-be-none 
pk_set can be None
 2014-04-23 15:30:37 -04:00
cahrens
f61421d7fe Tests for raw editor and minor wording changes. 2014-04-23 15:14:08 -04:00
Mark Hoeber
fe50a350b5 UI String Updates for Raw HTML Editor Change 
Modified the Raw HTML template text and the help string for the Editor
setting.
 2014-04-23 15:13:56 -04:00
Frances Botsford
6e8ccc51db adjust codemirror window on raw HTML editor 2014-04-23 15:13:31 -04:00
cahrens
ae886f1bc6 Add support for raw HTML editor. 
STUD-1562
 2014-04-23 15:12:38 -04:00
Jay Zoldak
6e4a451f92 Reword docstrings for bok-choy video tests 2014-04-23 14:37:26 -04:00
Muhammad Ammar
1bbfbedb1f Bok-Choy video tests batch2 2014-04-23 14:37:26 -04:00
David Baumgold
3b49c17c06 Merge pull request #3382 from TheJJ/patch-1 
fixed retry invokation for calling setState
 2014-04-23 13:34:33 -04:00
Valera Rozuvan
9d9f28dab3 Merge pull request #3275 from edx/valera/l52a 
TESTS: Add tests for fix of end-time functionality in the video player
 2014-04-23 19:26:11 +03:00
Valera Rozuvan
450dfe17b0 TESTS: Add tests for fix of end-time in the video player. 
BLD-662
 2014-04-23 18:44:10 +03:00
Valera Rozuvan
dc373f22b1 Merge pull request #3350 from edx/valera/l63a 
Fixing start-time and end-time related Jasmine tests.
 2014-04-23 18:40:01 +03:00
Andy Armstrong
56bf7d8631 Merge pull request #3437 from edx/andya/rc-fix-tinymce 
Make TinyMCE more tolerant about HTML elements
 2014-04-23 10:38:58 -04:00
Valera Rozuvan
68dd78e9e0 Fixing start-time and end-time related Jasmine tests. 
BLD-1013
 2014-04-23 17:35:47 +03:00
Adam
0e72c8c06b Merge pull request #3442 from edx/adam/fix-template-error 
fixes templating error (LMS-2560)
 2014-04-23 10:04:07 -04:00
Andy Armstrong
4cfa280502 Remove verify_html as it isn't supported in TinyMCE 4 2014-04-23 09:52:23 -04:00
John Jarvis
27256bbbb4 Merge pull request #3396 from edx/jarv/change_enrollment_cmd 
adding django admin command to change enrollment
 2014-04-23 09:44:46 -04:00
Adam Palay
d61abab1d8 fixes templating error (LMS-2560) 2014-04-23 09:20:51 -04:00
Mark Hoeber
5f0d8f31cd Merge pull request #3267 from edx/markhoeber/documentation/doc-255 
JavaScript update in developer documentation
 2014-04-23 09:17:17 -04:00
Waqas Khalid
1a086927ac Merge pull request #3410 from mlkwaqas/waqas/lms2510-banner-toggle-off 
User doesn't exist in verify student banner toggle off view
 2014-04-23 18:10:01 +05:00
Waqas
442db0b4aa User doesn't exist in verify student banner toggle off view 
LMS-2510
 2014-04-23 15:36:56 +05:00
zubair-arbi
c9b419d5ad Merge pull request #3250 from edx/zub/bugfix/std1441-editdiscussioncomp 
remove location of item from loc_mapper
 2014-04-23 14:40:17 +05:00
Waheed Ahmed
04b9f3371a Merge pull request #3368 from edx/waheed/stud1514-toggle-cheatsheet-not-working 
Fixed toggle cheatsheet not working on component editors.
 2014-04-23 14:34:11 +05:00
zubiar-arbi
d2b8b4f0dd remove location of item from loc_mapper and cache 2014-04-23 13:29:39 +05:00
Waheed Ahmed
df96c17e65 Fixed toggle cheatsheet not working on component editors. 
STUD-1514
 2014-04-23 11:08:12 +05:00
Andy Armstrong
b5e99614c3 Make TinyMCE more tolerant about HTML elements 
STUD-1565
 2014-04-22 18:53:52 -04:00
David Baumgold
ac1e566bce Refer to process docs in CONTRIBUTING.rst 2014-04-22 17:08:22 -04:00
David Baumgold
4db7f33196 Added process documentation 2014-04-22 17:06:16 -04:00
srpearce
97d587c4c8 Merge pull request #3431 from edx/sylvia/docs/DOC-263 
Update screenshots and add feedback prompt info
 2014-04-22 17:02:47 -04:00
Alison Hodges
1ca6a86c79 Merge pull request #3433 from edx/ahodges/documentation/changelog 
Removed rebase error from change log
 2014-04-22 16:41:02 -04:00
Alison Hodges
3c8c7bb5fd Removed rebase error from change log 2014-04-22 16:40:32 -04:00
Sylvia Pearce
ac86b54858 Update screenshots and add feedback prompt info 2014-04-22 16:03:19 -04:00