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

30469 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
muzaffaryousaf
0d2e2660e2 Adding hover state to image profile for accessibility. 
TNL-2051
 2015-05-05 21:01:47 +05:00
Jolyon Bloomfield
bf4a1d47a9 Fixing page size print CSS (rebase commit). 2015-05-05 11:45:56 -04:00
Greg Price
90f28dce31 Add thread list endpoint to the new discussion API 
This is an initial implementation that only allows retrieval of all
threads for a course and only returns an easily computed subset of the
fields that are needed, in order to keep this change from getting too
large.

JIRA: MA-641
 2015-05-05 11:45:09 -04:00
Jolyon Bloomfield
d4a5bf7490 Fixing links in print media (combined commit for rebase). 2015-05-05 11:39:37 -04:00
Calen Pennington
73bbb89297 Merge pull request #7839 from cpennington/fix-plat-541 
Move entry_point down into XModule/XModuleDescriptor so that 'xmodule.v1...
 2015-05-05 11:08:08 -04:00
Ben Patterson
7d9ac7da80 Merge pull request #7917 from edx/benp/pdf-tabs-skip 
Setting this test to skip. TNL-2083.
 2015-05-05 10:53:16 -04:00
jsa
26f9a5d76f Pass tracking context to ecommerce api client. 
XCOM-208
 2015-05-05 10:50:46 -04:00
Ned Batchelder
4cba033bbc Merge pull request #7854 from edx/ned/te-855 
Run pylint on all our code, and only our code. TE-855
 2015-05-05 10:37:48 -04:00
David Baumgold
98a3362409 Merge pull request #7884 from open-craft/eugeny/flaky-tests 
Added flaky decorators to potentally flaky tests
 2015-05-05 09:51:02 -04:00
Ben Patterson
6a0787de61 Add wait for upload form. 
This is necessary for automation using chrome. TE-849
 2015-05-05 09:04:39 -04:00
muhammad-ammar
3bb7a2508d Add certificate columns to existing grade report 
TNL-1886
 2015-05-05 17:43:08 +05:00
E. Kolpakov
fab123829d Added flaky decorator to potentally flaky test test_cohort_course_wide_discussion_topic 2015-05-05 12:52:24 +03:00
Ahsan Ulhaq
702663d978 Merge pull request #7889 from edx/ahsan/AC-102-forums-vote-tracking-missing-spaces-awkward-reading 
Forums vote tracking missing spaces causes awkward reading
 2015-05-05 05:48:59 -04:00
Shrhawk
d60b4eed13 Merge pull request #7871 from edx/shr/bug/TNL-2094-6.00.x-export-issue 
update the attrib using dict-->update() function
 2015-05-05 12:08:29 +05:00
Christina Roberts
31a19c0f63 Merge pull request #7823 from edx/christina/notes-tagging 
Add tags plugin.
 2015-05-04 20:56:52 -04:00
Ben Patterson
8d81398e92 Setting this test to skip. TNL-2083. 2015-05-04 20:34:59 -04:00
cahrens
353caea766 Label flaky test test_reindex. 
SOL-835
 2015-05-04 17:03:39 -04:00
Brian Talbot
714b5a9f63 Merge pull request #7903 from edx/talbs/fix-font-face-imports-v2 
FIX - Missing Open Sans typeface files
 2015-05-04 16:38:11 -04:00
Feanil Patel
0866f056c8 Merge pull request #7910 from edx/jeskew/PLAT_452_drafts_show_as_published 
Fix issue PLAT-452: Draft block showing as published.
 2015-05-04 16:15:17 -04:00
cahrens
8e636677ff Display tags in note template. 2015-05-04 16:00:23 -04:00
cahrens
64047478d3 edxnotes is now enabled in bok choy configuration 2015-05-04 16:00:23 -04:00
cahrens
5fe384ca2b Add tags plugin. 
TNL-1924
 2015-05-04 16:00:18 -04:00
Christine Lytwynec
41a9e027f0 Revert "Revert "Clytwynec/unique dirs for test results"" 
This reverts commit 52c4aacad5.
 2015-05-04 15:26:11 -04:00
Ned Batchelder
24e0c2c80f Run pylint on all our code, and only our code. TE-855 
With the old logic, we weren't running pylint on openedx at all.  We
were also running it on lms/lib/comment_client twice, and on the
installed xblock third-party library.
 2015-05-04 15:23:55 -04:00
John Eskew
8ca57f83d3 Separate draft/published import into two separate bulk operations. 
Add import_drafts abstract method in addition to import_children.
 2015-05-04 14:54:54 -04:00
John Eskew
b290b305df Reorganize code, change method name, & fix comments. 
Change xml file reading code when importing a course.
 2015-05-04 14:54:50 -04:00
John Eskew
1c6ab4cc6a Add has_changes check for draft modules before exporting them. 
Only export draft modules that have changes w.r.t. the published branch
should be exported to the /drafts directory in the course export.
 2015-05-04 14:54:12 -04:00
John Eskew
062ad95f79 Change str to repr and change formatting. 2015-05-04 14:54:11 -04:00
John Eskew
61aa3c2789 If BlockKey already, then return. 2015-05-04 14:54:11 -04:00
John Eskew
45ad00ae38 Add tests for more draft/published import/export. 
Include tests that mimic behavior in PLAT-452.
 2015-05-04 14:54:11 -04:00
John Eskew
c21cf66569 Only include published items in course export. 2015-05-04 14:54:11 -04:00
Marco Morales
095a1b617b lightened harshness of dashboard modal styling 2015-05-04 14:46:14 -04:00
Brian Talbot
f7bc309a2c adding missing Open Sans typeface files expected by Bourbon Sass mixin 2015-05-04 13:07:51 -04:00
Syed Hassan Raza
1175047d12 update the attrib using dict-->update() function 2015-05-04 21:07:40 +05:00
Christine Lytwynec
e952143252 Merge pull request #7904 from edx/revert-7709-clytwynec/unique-dirs-for-test-results 
Revert "Clytwynec/unique dirs for test results"
 2015-05-04 11:54:13 -04:00
Sarina Canelake
3169825a9f Merge pull request #7870 from mitocw/feature/cg/disable_ssl_cache 
Remove anonymous caching when SSL is enabled
 2015-05-04 10:59:41 -04:00
Christine Lytwynec
52c4aacad5 Revert "Clytwynec/unique dirs for test results" 2015-05-04 10:58:25 -04:00
Ben Patterson
fad6ad77df Merge pull request #7899 from edx/benp/annotation-flaky 
Flag test as flaky.
 2015-05-04 09:38:09 -04:00
Christine Lytwynec
4f5aeb3f49 Merge pull request #7709 from edx/clytwynec/unique-dirs-for-test-results 
Clytwynec/unique dirs for test results
 2015-05-04 08:55:38 -04:00
Ben Patterson
0847f8c24e Flag test as flaky. 2015-05-04 07:00:57 -04:00
zubair-arbi
7a1060cf56 Merge pull request #7849 from edx/zub/story/reverification-sevice-get-attempts-method 
add 'get_attempts' method for 'ReverificationService'
 2015-05-04 12:49:01 +05:00
Awais Jibran
1ec7dc813f Merge pull request #7797 from edx/aj/tnl2008-stop-video-event-not-emitted-correctly 
Videos should emit `stop_video` event once the video segment is compelte...
 2015-05-04 12:08:45 +05:00
Awais Jibran
e9f26a99a8 Merge pull request #7829 from edx/aj/tnl1530-discussion-section-jump-to-bottom 
Switching between discussion threads take focus to bottom of the page.
 2015-05-04 12:03:51 +05:00
Ahsan Ulhaq
95b2b82896 Forums vote tracking missing spaces causes awkward reading 
AC-102
 2015-05-02 19:52:20 +05:00
Clinton Blackburn
bfb201ec7d Merge pull request #7822 from edx/clintonb/receipt-page-update 
Updated Receipt Page for Oscar
 2015-05-02 09:32:11 -04:00
Clinton Blackburn
1a1fe56b29 Added Oscar-Compatible Receipt Page 2015-05-02 00:18:05 -04:00
Ahsan Ulhaq
436453e7dc Merge pull request #7751 from edx/ahsan/tnl-1677-numerical-input-accessibility-problem 
Numerical Input assessment has multiple accessibilty issues
 2015-05-01 18:23:03 -04:00
Ahsan Ulhaq
918afe64fd Numerical Input assessment has multiple accessibilty issues 
TNL-1677
 2015-05-01 23:15:33 +05:00
Eugeny Kolpakov
4d076fceed Merge pull request #7816 from open-craft/ekolpakov/children-import-fix 
Fixed loosing children in drafts on import
 2015-05-01 20:59:01 +03:00
Will Daly
6ed41b2263 Merge pull request #7885 from edx/will/credit-through-enrollment-api 
Enrollment API course details include credit modes.
 2015-05-01 13:43:54 -04:00