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

13894 Commits

Author SHA1 Message Date
Andy Armstrong
ecf4515b6e Introduce id verification step for proctored exams 
TNL-5083
 2016-10-05 17:22:35 -04:00
Jesse Zoldak
ce1eb237d1 Merge pull request #13651 from edx/revert-13483-itsjeyd/inline-discussion-assets 
Revert "Have DiscussionXBlock take care of loading assets it depends on"
 2016-10-05 17:20:56 -04:00
Jesse Shapiro
22c42dbf78 Merge pull request #13602 from open-craft/haikuginger/deprecate-dnd-v1 
[SOL-1612] Add DnDv2 to advanced problems; relabel DnDv1 as deprecated
 2016-10-05 15:28:50 -04:00
Marko Jevtić
1e1b7e1ad3 Merge pull request #13648 from edx/mjevtic/TNL-5709 
[TNL-5709] Mark a test as flaky
 2016-10-05 19:55:12 +02:00
alisan617
66ea22cab6 Merge pull request #13587 from edx/alisan/bookmark-btn-TNl-5625-unit-title-TNL-5623 
add new unit title and renew bookmark button
 2016-10-05 12:53:40 -04:00
Jesse Zoldak
dbab855742 Revert "Have DiscussionXBlock take care of loading assets it depends on" 2016-10-05 12:37:12 -04:00
Jesse Shapiro
47d18c35fe Add DnDv2 to advanced problems; relabel DnDv1 as deprecated 2016-10-05 09:22:35 -04:00
Marko Jevtic
5d128f32ee [TNL-5709] Mark a test as flaky 2016-10-05 10:45:14 +00:00
Muddasser
c943d42b7d Merge pull request #13566 from edx/muddasser/help/cohort 
cohort help tests
 2016-10-05 12:33:31 +05:00
Cliff Dyer
bd38ed2645 Merge pull request #13620 from edx/cdyer/flakies-2016-09-30 
Flaky test annotations 2016
 2016-10-04 17:03:24 -04:00
alisan617
a0a46c461e add new unit page title TNL-5623 
new bookmark button placement and look TNL-5625
 2016-10-04 16:51:34 -04:00
Christina Roberts
ddce329118 Merge pull request #13629 from ubc/fix-OpenSeaDragonAnnotation 
Fix the wrong target.src for annotations
 2016-10-04 14:41:42 -04:00
Muzaffar yousaf
29061fcd97 Merge pull request #13528 from edx/mushtaq/fix-flaky-edxnotes-test 
Fix flaky test test_easy_access_from_notes_page
 2016-10-04 16:02:35 +05:00
Mushtaq Ali
0abd2fce81 Increase connect & read timeout to fix flaky test test_easy_access_from_notes_page. 
TNL-4590
 2016-10-04 14:52:41 +05:00
Muddasser
cde90fd120 cohort help tests 2016-10-04 06:51:50 +00:00
sanfordstudent
44bddf8a69 Merge pull request #13610 from edx/sstudent/TNL-4171 
Removing Scored/has_score from randomized content block
 2016-10-03 16:14:57 -04:00
Jillian Vogel
f7fba5525d Merge pull request #13483 from open-craft/itsjeyd/inline-discussion-assets 
Have DiscussionXBlock take care of loading assets it depends on
 2016-10-04 02:13:31 +10:30
Tim Krones
baa9d06e97 Have DiscussionXBlock take care of loading JS and CSS files it depends on. 
* Add openedx.core.lib.xblock_builtin.get_css_dependencies and get_js_dependencies,
  which respect PIPELINE_ENABLED setting when determining dependencies.
* Move new discussion-related Sass files into discussion subdirectory.
* Use "load_unicode" instead of "render_template" to load JS to add to fragment for DiscussionXBlock.
* Remove unused "course" parameter from context for DiscussionXBlock.student_view.
* Add RTL stylesheet for DiscussionXBlock, and enable the block to load correct stylesheet.
* Load MathJax only once, and include code for configuring MathJax in discussion bundle.
* Make sure username renders correctly in DiscussionXBlock response header.
* Move WYSIWYIG Markdown editor styles to _build-discussion.scss.
* Remove unnecessary import of discussion/utilities/v1-compatibility from _build-discussion.scss.
* Keep courseware-chromeless.html in sync with courseware.html.
* Load CSS for discussions on Teams tab.  This makes it possible to remove CSS for discussions from Sass files for "Course" tab.
* Load js/src/tooltip_manager.js, jquery.autocomplete.js and jquery.autocomplete.css on "Course" tab.
 2016-10-03 22:11:31 +10:30
Ahsan
c5d975577a Invalidate access token 
ECOM-4641
 2016-10-03 13:02:52 +05:00
Pan Luo
03809c8c5c Fix the wrong target.src for annotations 
The annotation.target.src was assigned to a function instead of a string
because the missing brackets.
 2016-10-02 00:20:50 -07:00
J. Cliff Dyer
9c5759ed1c Flaky test decorators. Tickets exist: 
TNL-5643:
    test_lms_courseware:ProctoredExamTest.test_timed_exam_flow
TNL-4132:
    test_lms_matlab_problem:MatlabProblemTest.test_run_code
TNL-5582:
    test_studio_course_info.UsersCanAddUpdatesTest.test_delete_course_update
TNL-5691:
    test_account_settings.AccountSettingsPageTest.test_full_name_field
 2016-09-30 16:50:46 -04:00
Adam
9aa35cd8ad Merge pull request #13614 from edx/efischer/revert_grades 
Potential Grades revert PR
 2016-09-30 14:08:58 -04:00
Sanford Student
39fb66fccf removing scored/has_score from randomized content block 
for TNL-4171
 2016-09-30 09:59:39 -04:00
Nimisha Asthagiri
1628c17695 Merge pull request #13603 from edx/beryl/grades_reset_capa 
Update grade when CAPA problem state is reset
 2016-09-29 14:01:21 -04:00
Nimisha Asthagiri
d3d776388f Update grade when CAPA problem state is reset 
TNL-5686
 2016-09-29 08:44:37 -04:00
J. Cliff Dyer
ddb383c3c2 Test different problem types. 2016-09-28 16:38:38 -04:00
cahrens
e77b5eb3c3 Merge with release. 2016-09-28 09:58:14 -04:00
Nimisha Asthagiri
663fbbbaa0 Merge pull request #13547 from edx/beryl/correct_weight 
Fix Problem grades that have weight values
 2016-09-27 12:24:12 -04:00
Muhammad Ammar
3f7441c80f Merge pull request #13505 from edx/ammar/tnl-5557 
allow html inside label and descriptions
 2016-09-27 21:00:42 +05:00
Matjaz Gregoric
d2c0ac3286 Merge pull request #13475 from open-craft/mtyaka/youtube-api-error 
Don't show error in studio when fetching YouTube metadata fails.
 2016-09-27 17:30:10 +02:00
Nimisha Asthagiri
5ba77275d8 Fix problem weights in persisted grades 
TNL-5599
 2016-09-27 10:09:09 -04:00
attiyaishaque
e8f109a328 Revert "ECOM-5281 Add retires for email sending while registering." 
This reverts commit 4bbeaf32ae.
 2016-09-27 17:21:24 +05:00
attiyaishaque
648bc7efb4 Revert "Adding celery task for sending activation email." 
This reverts commit fe136122db.
 2016-09-27 17:20:57 +05:00
Awais Jibran
b74e964d7c Revert "Fix user registration " 2016-09-27 16:19:34 +05:00
muhammad-ammar
6ff762b63e allow html inside label and descriptions 
TNL-5557
 2016-09-27 15:48:27 +05:00
Jesse Zoldak
d6a4d7c0da Merge pull request #13558 from edx/zoldak/fix-capa-imports 
Move helper methods from the capa tests module __init__ file
 2016-09-26 16:50:39 -04:00
Douglas Hall
f806f3a165 Merge pull request #13474 from open-craft/bdero/site-sso 
ENT-16 Make SSO configurable per Site
 2016-09-26 14:54:40 -04:00
Douglas Hall
d1a3af9460 Merge pull request #13526 from edx/douglashall/JER-157/allow_for_site_override_of_mktg_urls_setting 
JER-157 Allow for per-Site override of MKTG_URLS setting
 2016-09-26 14:01:36 -04:00
Brandon DeRosier
3dcf689ee2 Implement Site settings for Third Party Auth providers 2016-09-26 12:43:00 -04:00
Jesse Shapiro
6b9b34886c Merge pull request #13537 from open-craft/haikuginger/adjust-saml-expiration-type 
[ENT-23] Convert SAML cache expiration to timezone-aware datetime.datetime
 2016-09-26 12:33:23 -04:00
Jesse Shapiro
4360c50d6f Merge pull request #13252 from felipevolpone/master 
Disable the "View Unit in Studio" button in CCX courses
 2016-09-26 11:55:57 -04:00
Jesse Shapiro
45bca67f79 Set up type conversion in third_party_auth to allow cacheDuration attribute to work 2016-09-26 10:28:39 -04:00
Awais Jibran
10f6bd1703 Celery need to serialize the arguments for a task. Here, user is not serializable,replace it with ID. ECOM-5784 2016-09-26 18:15:25 +05:00
Muddasser
f1f4f2e226 Merge pull request #13145 from edx/muddasser/edx/automate_help 
automate help links
 2016-09-26 18:10:20 +05:00
Jesse Zoldak
3de366dcf9 Fix pylint errors 2016-09-24 06:53:26 -04:00
Douglas Hall
1d1952c8d3 Added SiteMixin for tests that need to test Site specific functionality 2016-09-23 15:57:08 -04:00
Brandon DeRosier
cdf413bda2 Disambiguate queryset extensions for ConfigurationModels 
This change disambiguates the use of `id` in the
ConfigurationModelManager queryset extensions. This is required
when specifying KEY_FIELDS where there is more than one key and
at least one of them is a ForeignKey. The table must be specified
in this case because the query extension may be appended to the
WHERE clause of queries selecting `id` fields from multiple tables
via an INNER JOIN clause.
 2016-09-23 13:47:06 -04:00
Jesse Zoldak
24ae284f34 Move helper methods from the capa tests module __init__ file 2016-09-23 13:21:49 -04:00
Jesse Zoldak
7242fe138b Declare additional requirements for installing the capa module 2016-09-23 13:07:00 -04:00
Matjaz Gregoric
344c72b3e2 Use non-ascii PLATFORM_NAME in tests. 
It should help catch unicode encoding problems earlier.

This also updates python-saml dependency to a version that includes a
patch for unicode strings.
 2016-09-23 15:38:23 +02:00