Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
28,558 Commits 1 Branch 0 Tags
7c02782f90934d201d94de8de368da56121d45cf
Commit Graph

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Waqas Khalid
9e6333f689 Remember the user last thread sort preference 
FOR-545
 2014-06-18 14:26:30 +05:00
Ned Batchelder
708bb8a57e Merge pull request #4141 from IONISx/tusbar/end-mktg-urls 
Add missing $ at the end of the MKTG URLs
 2014-06-17 17:45:56 -04:00
Gabe Mulley
2ca79f34cf Merge branch 'release' 2014-06-17 17:07:13 -04:00
srpearce
9fd2fb0af3 Merge pull request #4120 from edx/sylvia/docs/release_notes_6_16 
Release notes 6/16/2014
 2014-06-17 16:46:39 -04:00
Sarina Canelake
a8cd760ce3 Merge pull request #4121 from edx/sarina/fix-i18n-bugs 
Fix i18n translation issues
 2014-06-17 16:14:41 -04:00
Piotr Mitros
30f77cc73f Merge pull request #4005 from edx/pmitros/add-animation-xblock 
Add MVP animation XBlock. Incorporate styling changes of Done XBlock.
 2014-06-17 15:49:42 -04:00
Mathew Peterson
9659f24d02 Merge pull request #4133 from edx/mathewpeterson/fix_unicode_in_url_bug 
404 error for unwanted unicode in url
LMS-2488
 2014-06-17 14:46:35 -04:00
Minh-Tue Vo
ca045aaa3d Merge pull request #4139 from edx/mvo/removing-dots 
Removing dot in scenario names
 2014-06-17 14:43:03 -04:00
Jay Zoldak
b835ccf912 Merge pull request #4140 from edx/zoldak/disable-courses-page-test 
Temporarily disable the studio bok-choy CoursePagesTest
 2014-06-17 14:37:07 -04:00
srpearce
0c540e6cc5 Merge pull request #4129 from edx/sylvia/docs/BLD-933 
Sylvia/docs/bld 933
 2014-06-17 14:25:44 -04:00
Sylvia Pearce
4f2e18026a Add information about creating a video table of contents 2014-06-17 14:25:10 -04:00
Bertrand Marron
573eda0d61 Add missing $ at the end of the MKTG URLs 2014-06-17 20:03:31 +02:00
Jay Zoldak
e52c948135 Temporarily disable the studio bok-choy CoursePagesTest 2014-06-17 13:28:10 -04:00
Sarina Canelake
b70bd2be78 Use ngettext rather than "word(s)" for plural phrases 2014-06-17 13:25:46 -04:00
Mat Peterson
c86cbe466c 404 error for unwanted unicode in url 
LMS-2488
 2014-06-17 16:10:45 +00:00
Sarina Canelake
c68fce1f0a Fix i18n translation issues 2014-06-17 12:03:27 -04:00
Sylvia Pearce
7d8536bfd6 Release notes 6/17/2014 2014-06-17 12:01:07 -04:00
Ben Patterson
086373388b Merge pull request #4126 from edx/benp/remove-old-jenkins-scripts 
Remove deprecated Jenkins script paths.
 2014-06-17 11:24:26 -04:00
Mathew Peterson
a6fb2ac826 Merge pull request #4110 from edx/mathewpeterson/invalid_characters_error 
courseware/views.py index function position value integer error correction and test
 2014-06-17 11:23:00 -04:00
muhammad-ammar
95769fe442 Merge pull request #4123 from edx/ammar/reduce-captions-wait-time 
Reduce captions wait time.
 2014-06-17 20:15:47 +05:00
muhammad-ammar
ac26f27898 Merge pull request #4125 from edx/ammar/improve-certificates-test-time 
Improve certificates test time
 2014-06-17 18:45:35 +05:00
Jay Zoldak
14a80e9c3c Merge pull request #4114 from edx/zoldak/fix-negative-assertion 
Speed up test by fixing negative assertion
 2014-06-17 09:12:11 -04:00
Jay Zoldak
6d53bf710d Merge pull request #4115 from edx/zoldak/fix-test-captions-closed 
Speed up test for closed caption state
 2014-06-17 09:11:47 -04:00
Don Mitchell
17210d18ad Merge pull request #4078 from edx/dhm/heartbeat 
Refactor heartbeat to delegate to the modulestores and sql
 2014-06-17 08:44:37 -04:00
Piotr Mitros
d989454a9b Add MVP animation XBlock. Incorporate styling changes of Done XBlock. 2014-06-17 08:30:26 -04:00
Dave St.Germain
0b37c987c6 Merge pull request #3908 from edx/dcs/support-dashboard 
Added manual refund page for support.
PR-615
 2014-06-17 08:27:34 -04:00
Dave St.Germain
f2fb57e196 Added manual refund page for support. 
PR-615
 2014-06-17 08:24:02 -04:00
Ben Patterson
bfbd9deafc Remove deprecated Jenkins script paths. 
These now exist under scripts/
 2014-06-17 08:08:26 -04:00
Szczork
77fc849cce log stop_video event 2014-06-17 13:56:40 +02:00
zubair-arbi
3a26e813bf Merge pull request #3898 from edx/zub/bugfix/std1629-annotationtool 
fix reply/return to annotation links
 2014-06-17 16:35:13 +05:00
Anton Stupak
bf8876e198 Merge pull request #4106 from edx/anton/fix-seek-log 
Video: fix seek tracking log.
 2014-06-17 12:05:20 +03:00
Muhammad Ammar
346164189f Improve certificates test time 2014-06-17 08:54:52 +00:00
Muhammad Ammar
d907d24fa5 Reduce captions wait time. 2014-06-17 07:39:12 +00:00
zubair-arbi
6cb6680139 fix reply/return to annotation links 
STUD-1629
 2014-06-17 12:16:07 +05:00
polesye
af67873b7b Fix seek log. 2014-06-17 08:59:11 +03:00
Sarina Canelake
8191d3c77e fixup! Fix i18n translation issues 2014-06-16 23:10:03 -04:00
Minh Tue Vo
ae9955b290 changing dot into v 2014-06-16 17:40:28 -04:00
Mat Peterson
06dbb68e75 courseware/views.py index function position value integer error correction and test 
LMS-2844
 2014-06-16 20:30:06 +00:00
Jim Abramson
0b398c8976 Merge pull request #4118 from edx/jsa/bugfix-cc-user 
bugfix: avoid side-effects when overriding User.default_retrieve_params
 2014-06-16 16:24:15 -04:00
jsa
51f3b94f53 bugfix: avoid side-effects when overriding User.default_retrieve_params 2014-06-16 16:01:13 -04:00
Diana Huang
6808790306 Merge pull request #4108 from edx/diana/update-choose-form 
Revise course mode choose page.
 2014-06-16 14:51:21 -04:00
Diana Huang
2dbf9442a6 Revise course mode choose page. 
LMS-2796
 2014-06-16 14:08:40 -04:00
Jay Zoldak
4ac1079a99 Speed up test for closed caption state 2014-06-16 13:59:19 -04:00
polesye
0dbcf06280 Fix i18n in ChoiceGroup and ChoiceTextGroup. 2014-06-16 13:57:28 -04:00
Gabe Mulley
72dbd05fc9 Merge pull request #4111 from edx/waheed/lms2807-matlab-run-code-bug-fixed 
Waheed/lms2807 matlab run code bug fixed
 2014-06-16 13:56:23 -04:00
Gabe Mulley
4a086fa711 Merge pull request #4099 from edx/andya/rc-xblocks-as-advanced-problems 
Allow xblocks to be added as advanced problem types
 2014-06-16 13:56:09 -04:00
Jay Zoldak
c33261aefc Speed up test by fixing negative assertion 2014-06-16 13:47:14 -04:00
Don Mitchell
3c9b10112f Refactor heartbeat to delegate to the modulestores and sql 
LMS-2801
 2014-06-16 13:16:32 -04:00
Waheed Ahmed
872d7b6f42 Fixed MATLAB Run Code bug with answer boxes. 
LMS-2807
 2014-06-16 20:58:35 +05:00
zubair-arbi
b60b7c7e5a Merge pull request #4054 from edx/zub/bugfix/std1775-uploadpdfbutton 
trigger change event for file field while uploading pdf
 2014-06-16 20:17:14 +05:00