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

30040 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Feanil Patel
ffbb623d13 Merge pull request #7934 from edx/feanil/release-merge-test 
Feanil/release merge test
 2015-05-06 10:49:51 -04:00
Martyn James
f04036435d Merge pull request #7945 from edx/dcikatic/index_unpublished_fix 
Fixes index function to not index children without published version - Thank you @dino-cikatic!
 2015-05-06 10:38:02 -04:00
Ben Patterson
c049684dfd Merge pull request #7939 from edx/benp/tnl-1619-flaky 
Mark test as flaky. TNL-1619
 2015-05-06 10:27:34 -04:00
Ben Patterson
0a9ef9c422 Merge pull request #7935 from edx/benp/chromefix-csv-upload-wait 
On faster browsers, we need to wait for the toggle option to appear.
 2015-05-06 10:10:18 -04:00
Sarina Canelake
f66c118d0a Merge pull request #7941 from mcgachey/mcgachey-submissions-version 
[LTI Provider] Updating submissions dependency to pull in new scoring signals
 2015-05-06 09:45:28 -04:00
Dino Cikatic
21917461cf Fixes index function to not index children without published version 2015-05-06 14:46:24 +02:00
Phil McGachey
a6afc29ced [LTI Provider] Updating submissions dependency to pull in new scoring signals 2015-05-06 07:02:46 -04:00
Muzaffar yousaf
77d445c962 Merge pull request #7787 from edx/muzaffar/tnl2051-profile-image-hover 
Adding hover state to image profile for accessibility.
 2015-05-06 14:11:04 +05:00
Muhammad Ammar
63f4aa8ceb Merge pull request #7761 from edx/ammar/tnl1886-add-certificate-columns-in-grade-report 
Add certificate columns in grade report
 2015-05-06 09:32:42 +05:00
Ben Patterson
eacf25673a Mark test as flaky. TNL-1619 2015-05-05 19:37:55 -04:00
Clinton Blackburn
4bd15cf200 Merge pull request #7911 from edx/clintonb/deprecate-verify-later 
Deprecated Verify Later Page
 2015-05-05 18:27:09 -04:00
Ben Patterson
314accdf4d On faster browsers, we need to wait for the toggle option to appear. 
TE-849
 2015-05-05 17:25:20 -04:00
Clinton Blackburn
f7e8b2e4ca Merge pull request #7932 from edx/clintonb/requirement-fix 
Corrected ecommerce-api-client dependency
 2015-05-05 16:54:36 -04:00
Clinton Blackburn
5e68753101 Deprecated Verify Later Page 
We are moving toward a single workflow for verification.
 2015-05-05 16:42:27 -04:00
Jesse Zoldak
43738e4bb4 Merge pull request #7933 from edx/zoldak/TE-871 
Skip intermittently failing test. TE-871
 2015-05-05 16:31:16 -04:00
Feanil Patel
aa6565959d Merge branch 'release' 
Conflict in import because someone had added an import in master that
was not in the release.

Conflicts:
	common/lib/xmodule/xmodule/modulestore/tests/test_xml_importer.py
 2015-05-05 16:27:45 -04:00
Jesse Zoldak
6c7cec6d3c Skip intermittently failing test. TE-871 2015-05-05 16:21:52 -04:00
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
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
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