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

24025 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam
7cc85b43e1 Merge pull request #4160 from edx/adam/browser-warning-lte-ie8 
only display browser warning for <= IE8 (LMS-2732)
 2014-06-19 09:48:41 -04:00
clytwynec
e2936d0eb2 Merge pull request #4020 from edx/clytwynec/rake2paver-i18n 
Clytwynec/rake2paver i18n
 2014-06-19 09:03:33 -04:00
Tim Babych
808bc65977 Merge pull request #4151 from edx/i18n-dont-print-exception-msg-twice 
Do not print exception message below stacktrace
 2014-06-19 13:43:14 +03:00
Tim Babych
ceb25fc4ee adding Tim Babych to AUTHORS 2014-06-19 12:19:21 +03:00
Tim Babych
f4280377c5 Do not print exception message below stacktrace 2014-06-19 12:19:21 +03:00
Sarina Canelake
4477c2857f Merge pull request #4156 from edx/sarina/fix-i18n-bugs 
Fix variable names to give context for translators
 2014-06-19 00:13:38 -04:00
Sarina Canelake
30c8da1596 Fix variable names to give context for translators 
fix other various i18n issues
 2014-06-18 23:28:39 -04:00
Adam
d3d45b8863 Merge pull request #4157 from edx/release 
Release
 2014-06-18 17:26:39 -04:00
Adam Palay
c3a81f1cce only display browser warning for <= IE8 (LMS-2732) 2014-06-18 17:02:18 -04:00
Ben McMorran
bba85e8037 Merge pull request #4154 from edx/benmcmorran/remove-datetuple 
Removes DateTuple field type
 2014-06-18 16:33:36 -04:00
Adam
b36b459bfd Merge pull request #4148 from edx/usman/lms2852-code-problems-output 
Set position for collapsible.js full-bottom link.
 2014-06-18 16:27:58 -04:00
clytwynec
9875b34424 Update i18n.rst for rake to paver transition 2014-06-18 16:23:07 -04:00
Christine Lytwynec
35efa6af6f deprecating i18n tasks from rake to paver 2014-06-18 16:23:07 -04:00
Christina Roberts
b7eea135d4 Merge pull request #4119 from edx/christina/requirejs-promise 
Wait for scripts defined in common xmodule code to execute.
 2014-06-18 14:56:10 -04:00
Ben McMorran
a8817b83ab Removes DateTuple field type 2014-06-18 14:55:43 -04:00
Calen Pennington
7a452b6265 Merge pull request #4113 from cpennington/remove-locator 
Remove locator.py (now sourced from the external opaque_keys library)
 2014-06-18 14:44:10 -04:00
Calen Pennington
c00f80d4fa Remove locator.py (now sourced from the external opaque_keys library) 
[LMS-2757]
 2014-06-18 13:16:25 -04:00
Ben McMorran
702bdd36a9 Merge pull request #4060 from edx/benmcmorran/edit-tracking 
Tracks last edited date and user, and adds has_changes for blocks
 2014-06-18 13:13:26 -04:00
cahrens
3acf394d05 Wait for scripts defined in common xmodule code to execute. 
STUD-1792
 2014-06-18 13:11:37 -04:00
David Baumgold
67da499866 Merge pull request #4152 from edx/db/code-ownership 
link to code ownership page from CONTRIBUTING.rst file
 2014-06-18 11:52:39 -04:00
David Baumgold
1fa49ca1f8 link to code ownership page from CONTRIBUTING.rst file 2014-06-18 11:52:20 -04:00
Ben McMorran
ea97dd4508 Tracks last edited date and user, and adds has_changes for blocks. 2014-06-18 11:36:49 -04:00
srpearce
fa8536a5ef Merge pull request #4149 from edx/sylvia/docs/release_notes_6_16 
Add info about Mandarin Chinese option to LMS
 2014-06-18 10:30:10 -04:00
Sylvia Pearce
68a0820c14 Add info about Mandarin Chinese option to LMS 2014-06-18 10:28:49 -04:00
Alison Hodges
ef05d6780b Merge pull request #4142 from edx/ahodges/documentation/DOC599 
Fixes: DOC-599
 2014-06-18 09:25:36 -04:00
Alison Hodges
9c838d76f3 Fixes: DOC-599 2014-06-18 09:24:59 -04:00
Usman Khalid
3d0409773b Set position for collapsible.js full-bottom link. 
Currently it is covering the whole parent div.

LMS-2852
 2014-06-18 18:20:11 +05:00
Waqas Khalid
4d22f572b8 Merge pull request #3738 from mlkwaqas/waqas/for545-user-last-thread-not-remembered 
Waqas/for545 user last thread not remembered
 2014-06-18 15:16:00 +05:00
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