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

22691 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Valera Rozuvan
68dd78e9e0 Fixing start-time and end-time related Jasmine tests. 
BLD-1013
 2014-04-23 17:35:47 +03: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
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
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
Mark Hoeber
f6e11f14c9 JavaScript extentions doc update 
doc-255
 2014-04-22 15:58:49 -04:00
David Baumgold
6fc05bcacf Merge pull request #3429 from edx/move-experiments-rst 
Move experiments.rst into the en_us directory
 2014-04-22 15:57:17 -04:00
Alison Hodges
f4d6bbaf3c Merge pull request #3388 from edx/ahodges/documentation/LMS2525 
Ahodges/documentation/lms2525
 2014-04-22 15:45:49 -04:00
Alison Hodges
52c34886d2 doc for LMS-2525: feature changes for student enrollment 2014-04-22 15:44:57 -04:00
Anton Stupak
d861a9a0a2 Merge pull request #3369 from edx/anton/download-handout 
Video: Add Download Handout
 2014-04-22 22:30:10 +03:00
Jay Zoldak
ac980460cc Merge pull request #3428 from edx/zoldak/fix-lang-test 
Wait for ajax post after changing language
 2014-04-22 15:13:44 -04:00
David Baumgold
8b40d728f0 Move experiments.rst into the en_us directory 2014-04-22 15:11:23 -04:00
polesye
127bf7ed3f BLD-1000: Download handout. 2014-04-22 21:44:36 +03:00
David Baumgold
7c89055089 Merge pull request #3404 from edx/watchdog-in-paver-reqs 
Added watchdog to Paver requirements
 2014-04-22 14:39:27 -04:00
Jay Zoldak
7d0297f0df Wait for ajax post after changing language 2014-04-22 14:28:10 -04:00
Stephen Sanchez
b993dfbdb3 Merge pull request #3424 from edx/ora2/release-2014-04-22T16.55 
Release for Apr 22, 2014
 2014-04-22 14:03:46 -04:00
David Baumgold
8351869346 Fixes #3409 2014-04-22 13:30:49 -04:00
Sef Kloninger
f3842dcc01 Merge pull request #2834 from edx/sef/theme-embargo-master 
make embargo template theme-able
 2014-04-22 10:04:08 -07:00
Stephen Sanchez
575c92c8c3 Release for Apr 22, 2014 2014-04-22 13:02:04 -04:00
Adam
1934586afa Merge pull request #3422 from edx/usman/lms2554-tinymce-js 
Fixed path of tinymce.js.
 2014-04-22 12:31:17 -04:00
ichuang
d4201f028e Merge pull request #3413 from edx/bugfix/ichuang/multiple-choice-question-hints 
bugfix: allow multiple choice questions to display hints

Thanks, @sarina, @pmitros
 2014-04-22 12:03:43 -04:00
Stephen Sanchez
28e2bf3ffa Merge pull request #3420 from edx/ora2/release-2014-04-22T15.15 
Release for Apr 22, 2014
 2014-04-22 11:58:48 -04:00
Renzo Lucioni
26fdf5d2af Merge pull request #3421 from edx/renzo/segment-io-identify-fix 
Correct ordering of Segment.io identify and page calls
 2014-04-22 11:45:29 -04:00
Usman Khalid
543306b29f Fixed path of tinymce.js. 
LMS-2554
 2014-04-22 20:41:02 +05:00
Renzo Lucioni
cfd841b872 Correct ordering of Segment.io identify and page calls 2014-04-22 11:29:36 -04:00