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

30013 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clinton Blackburn
cd9c900b9a Corrected ecommerce-api-client dependency 2015-05-05 15:58:07 -04:00
Ben Patterson
0cd749f6fc Merge pull request #7920 from edx/benp/fix-cohort-wait-chrome 
Add wait for upload form.
 2015-05-05 15:21:46 -04:00
Greg Price
f22756128d Merge pull request #7881 from edx/gprice/discussion-api-thread-list 
Add thread list endpoint to the new discussion API
 2015-05-05 13:56:10 -04:00
Marco Morales
6426e28846 Merge pull request #7591 from jolyonb/jbloomfield/printing-links 
Print CSS: Fixing Links
 2015-05-05 13:35:25 -04:00
Marco Morales
cc478af4e8 Merge pull request #7592 from jolyonb/jbloomfield/printing-pagesize 
Fix Print Media CSS: Page margins
 2015-05-05 13:34:01 -04:00
Christina Roberts
7c7b0dd7c2 Merge pull request #7915 from edx/christina/flaky-search 
Label flaky test test_reindex.
 2015-05-05 12:46:18 -04:00
Jim Abramson
1ce4baa67a Merge pull request #7892 from edx/jsa/xcom-208 
Pass tracking context to ecommerce api client.
 2015-05-05 12:42:08 -04: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
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
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
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
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
Will Daly
5d16ed46a2 Enrollment API course details include credit modes. 
Credit modes are hidden by default, since the user
isn't allowed to select them on the track selection page.
This commit exposes credit modes through the enrollment
API so that consumers can see that a course has a credit
track.
 2015-05-01 12:36:30 -04:00
E. Kolpakov
6db974c8ee Fixes for course import-export: 
* Updated XBlock hash - new version forces exposes force_dirty method on fields
* Includes Scope.children fields into xml_importer._update_module_location so that they are updated as well.
* Tests for mutable fields xml_importer._update_module_location with mutable fields and children
 2015-05-01 18:36:14 +03:00
Ben Patterson
270ac747ea Merge pull request #7851 from edx/benp/pep8-pycharm-helpers 
Pep8 should ignore pycharm-helpers files on folks' workstations/VMs.
 2015-05-01 10:36:24 -04:00
Will Daly
f6e8ce24af Merge pull request #7879 from edx/will/restore-remember-me 
Add remember me checkbox back to the combined login/registration page
 2015-05-01 09:57:45 -04:00
Ben Patterson
8cd5f42ca9 Merge pull request #7850 from edx/benp/bok-choy-shard-5 
Add bok-choy shards 4 and 5. New default is 'shard 6'
 2015-05-01 09:26:32 -04:00