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

33604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Ned Batchelder
cc8c7e7ce1 Merge pull request #7880 from edx/ned/pedantic-fix-for-deleting-pyc-files 
Don't delete *.pyc files in the .git directory
 2015-05-01 09:24:23 -04:00
Martyn James
c776272a8f Merge pull request #7654 from edx/mjames/SOL-280 
Index course information alongside courseware
 2015-04-30 23:27:17 -04:00
Ned Batchelder
72c0991005 Don't delete *.pyc fils in the .git directory 
If you have a branch named "remove-all-.pyc", the original code would
clobber it inside the .git directory, because branches become files with
the same name.  This prevents find from looking in .git, saving your
precious oddly named branches.
 2015-04-30 18:17:17 -04:00
Greg Price
c006befdaf Merge pull request #7767 from edx/gprice/discussion-api-topics 
Add discussion topic API
 2015-04-30 18:05:08 -04:00
Ben Patterson
5f0cd587fd Add bok-choy shards 4 and 5. When no shard is specified on a test, it 
will fall in 'shard 6'
 2015-04-30 17:34:24 -04:00
Will Daly
05baddb2a6 Add remember me checkbox back to the combined login/registration page 2015-04-30 17:13:03 -04:00
Christine Lytwynec
67ee646989 fix typo in jenkins-report.sh 2015-04-30 16:27:51 -04:00
Adam
af3519ce15 Merge pull request #7835 from edx/release 
Release (DO NOT MERGE)
 2015-04-30 16:24:47 -04:00
Martyn James
b9f1c5db60 Index course information alongside courseware 
Conflicts:
	cms/djangoapps/contentstore/tests/test_courseware_index.py
 2015-04-30 16:05:57 -04:00
Greg Price
ebff94af3f Add discussion topic API 
This is the first stage of the new Discussion API.

JIRA: MA-604
 2015-04-30 14:25:05 -04:00