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

23317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Greg Price
c96bf07be6 Merge pull request #3817 from edx/gprice/forum-search-event-page 
Add page num to forum search tracking log events
 2014-05-23 12:51:38 -04:00
Mark Hoeber
38e882e8d9 Merge pull request #3857 from edx/markhoeber/documentation/doc-484 
Fixed typo in Studio Home Page panel help text
 2014-05-23 12:36:49 -04:00
Greg Price
eb0e6c909b Add page num to forum search tracking log events 2014-05-23 11:55:45 -04:00
Jay Zoldak
753189f4d5 Merge pull request #3854 from edx/zoldak/skip-flaky-js-video-tests 
Skip intermittently failing js video tests
 2014-05-23 11:54:19 -04:00
Mark Hoeber
8c4be448aa Fixed typo in Studio Home Page panel help text 
DOC-484
 2014-05-23 11:46:19 -04:00
Jay Zoldak
bb4f9148e0 Skip intermittently failing js video tests 2014-05-23 11:21:57 -04:00
Will Daly
234550422d Merge pull request #3805 from edx/sanchez/TIM-563-Check-Django-Admin 
Adding new attribute to the xmodule_runtime to check admin privileges on users
 2014-05-23 10:41:31 -04:00
muhammad-ammar
ff1e9466be Merge pull request #3849 from edx/ammar/uniqe-course-fix 
Unique Course Fix
 2014-05-23 19:04:07 +05:00
Muhammad Ammar
3919b4a47b Unique Course Fix 2014-05-23 13:29:12 +00:00
zubair-arbi
0054b79d5a Merge pull request #3306 from edx/zub/bugfix/std1523-uploadassetbutton 
move upload asset code for assets to AssetsView
 2014-05-23 18:24:24 +05:00
Stephen Sanchez
afd55164e6 Adding new attribute to the xmodule_runtime to check admin privileges on users 2014-05-23 09:23:21 -04:00
Jay Zoldak
33a2725919 Merge pull request #3850 from edx/zoldak/revert-paver-quality 
Revert "added and updated pavelib/quality.py..."
 2014-05-23 08:42:55 -04:00
Jay Zoldak
4771242d57 Revert "added and updated pavelib/quality.py from dglance branch, deprecated rake quality tasks" 
This reverts commit 7fd2305f39.
 2014-05-23 08:40:43 -04:00
Anton Stupak
77c3233f29 Merge pull request #3824 from edx/anton/fix-transcript-on-ipad 
Video: Fix transcript displaying on iPad.
 2014-05-23 10:49:56 +03:00
polesye
2133ebd0a2 BLD-1033: Fix transcript displaying on iPad. 2014-05-23 08:31:26 +03:00
Andy Armstrong
b6f933a1f5 Merge pull request #3838 from louyihua/translation-fix 
i18n: Make static strings in xmodule files extractable
 2014-05-23 00:30:22 -04:00
Diana Huang
16f0c9d1ee Merge pull request #3840 from antoviaque/mentoring-opaque-keys 
mentoring-opaque-keys: Adds support for opaque keys
 2014-05-22 15:45:48 -04:00
Jay Zoldak
9f6d0594d3 Merge pull request #3835 from edx/zoldak/skip-brittle-test 
Skip brittle HTML editor lettuce test
 2014-05-22 15:45:09 -04:00
Xavier Antoviaque
9df7e1d1cf mentoring-opaque-keys: Adds support for opaque keys 
Updates commit hash to add support for opaque keys in mentoring. See
https://github.com/gsehub/xblock-mentoring/pull/2 for the relevant
commits.
 2014-05-22 15:31:59 -04:00
Jay Zoldak
72cb5ec93f Merge pull request #3828 from edx/ammar/flaky-for-video-tests 
Flaky for Bok-Choy Video Tests
 2014-05-22 15:12:11 -04:00
srpearce
956b4c4569 Merge pull request #3837 from edx/sylvia/docs/movePA 
Update index file; change link in PA for Students
 2014-05-22 14:23:09 -04:00
louyihua
a6bae4d238 i18n: Make static strings in xmodule files extractable 
They can now be extracted.
 2014-05-23 01:58:19 +08:00
Sylvia Pearce
fb6dc771b4 Update index file; change link in PA for Students 2014-05-22 13:50:18 -04:00
Mark Hoeber
afe306439f Merge pull request #3592 from edx/markhoeber/documentation/doc-389 
New Open edX Install/Operations doc
 2014-05-22 12:39:25 -04:00
Mark Hoeber
608eef2750 Merge pull request #3800 from edx/markhoeber/documentation/release-notes-fix 
Modified description of transcript bug fix
 2014-05-22 12:37:58 -04:00
Mark Hoeber
ad8a314aad Modified description of transcript bug fix 
As well as updated the index page for usability
 2014-05-22 12:37:07 -04:00
Jay Zoldak
7db6e639e2 Skip brittle test 2014-05-22 12:22:55 -04:00
Mark Hoeber
b2647dab43 Set up for new Open edX Installation and Operations Guide 
doc-389
 2014-05-22 11:58:26 -04:00
Dave St.Germain
7bbffd8bee Merge pull request #3254 from edx/dcs/a11y-dragdrop 
This fixes a few accessibility problems with drag and drop
 2014-05-22 11:45:04 -04:00
Andy Armstrong
dfbfd7b204 Merge pull request #3802 from louyihua/translation-fix 
i18n: Make checklists translatable
 2014-05-22 11:22:04 -04:00
Alison Hodges
7044cbb800 Merge pull request #3790 from edx/ahodges/documentation/DOC156 
Ahodges/documentation/doc156
 2014-05-22 10:58:55 -04:00
Ben Patterson
7d8b5ad2c3 Merge pull request #3796 from edx/benpatterson/disable-course-export-acc-test 
Benpatterson/disable course export acc test
 2014-05-22 10:56:29 -04:00
Muhammad Ammar
33d01232de Flaky is a plugin for nose that automatically reruns flaky tests. 2014-05-22 14:51:57 +00:00
Alison Hodges
9955e9e383 Merge pull request #3798 from edx/ahodges/documentation/DOC402 
Adaptive hint correct_answer must be lc
 2014-05-22 10:50:47 -04:00
Alison Hodges
dc00ade1f0 Adaptive hint correct_answer must be lc 2014-05-22 10:49:39 -04:00
Dave St.Germain
285c07fc22 Addressed review feedback. 2014-05-22 10:40:31 -04:00
Alison Hodges
4e38b10af9 Merge pull request #3818 from edx/ahodges/documentation/DOC368 
Ahodges/documentation/doc368
 2014-05-22 10:23:06 -04:00
Alison Hodges
5ce9b418b6 Reorganized, updated, & streamlined sections in Running Your Course 2014-05-22 10:22:35 -04:00
louyihua
34d2f051a4 i18n: Make checklists translatable 
Now the description & action_text strings in checklists can be extracted and translated.
 2014-05-22 22:15:45 +08:00
Dave St.Germain
232df30b3e support aria-grabbed and aria-dropeffect 2014-05-22 09:51:50 -04:00
Dave St.Germain
f4391b5eb9 fixing drag and drop 2014-05-22 09:51:50 -04:00
Ben Patterson
dd07967805 Disable cms test due to failure on master build. 2014-05-22 09:24:13 -04:00
zubair-arbi
72d9a91f1d Merge pull request #3766 from edx/zub/bugfix/std1616-editdraft 
create draft request gets already created version if it exists
 2014-05-22 18:18:56 +05:00
Alison Hodges
6d1e9f9bad Anton's edit, date change 2014-05-22 08:53:15 -04:00
Waheed Ahmed
a7184c03cf Merge pull request #3774 from edx/waheed/lms2719-fix-register-on-edge 
Fixed register button on edge homepage.
 2014-05-22 12:49:33 +05:00
Waheed Ahmed
b6a90e0bfa Fixed register button on edge homepage. 
LMS-2719
 2014-05-22 12:09:23 +05:00
clytwynec
18ee082cc3 Merge pull request #3708 from edx/clytwynec/rake2paver-quality 
Switch quality tasks to paver
 2014-05-21 17:10:03 -04:00
srpearce
fb300029b9 Merge pull request #3765 from edx/sylvia/docs/TIM-243 
Sylvia/docs/tim 243
 2014-05-21 16:17:20 -04:00
Christina Roberts
eb362fba67 Merge pull request #3579 from edx/andya/container-add-buttons 
Allow creation of components on container page
 2014-05-21 16:15:14 -04:00
Sylvia Pearce
d8d7c2fd2f Deprecate old ORA; add links to new ORA permanent docs 2014-05-21 16:13:11 -04:00