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

13864 Commits

Author SHA1 Message Date
Jesse Shapiro
8533fd9734 Adding change to staff role for new users and draft migration 2016-10-07 11:52:59 -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
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
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
Matjaz Gregoric
977e664afe Don't fail if platform name contains non-ascii characters. 2016-09-23 15:38:23 +02:00
attiyaishaque
fe136122db Adding celery task for sending activation email. 2016-09-23 11:43:26 +05:00
attiyaishaque
4bbeaf32ae ECOM-5281 Add retires for email sending while registering. 2016-09-23 11:43:26 +05:00
Awais Jibran
45e243da5c Merge pull request #13480 from edx/aj/fix-password-rest-confirm 
Show error on password reset form
 2016-09-23 09:56:25 +05:00
alisan617
fb35ffb07d Merge pull request #13449 from edx/alisan/discussion-sidebar-topics-menu-TNL-5169 
Add aria attributes to discussion topics sidebar
 2016-09-22 17:48:57 -04:00
Douglas Hall
8f6182aabf Allow for site override of MKTG_URLS setting in index view 2016-09-22 15:58:27 -04:00
alisan617
0ffeb4639b Make the left sidebar in Discussion page accessible 
TNL-5169
 2016-09-22 15:28:29 -04:00
Andy Armstrong
810835700a Merge pull request #13527 from edx/release 
Release
 2016-09-22 13:05:33 -04:00
Muddasser
8774728226 Base url for help links is changed 2016-09-22 09:58:34 +00:00
Muddasser
9aee093300 Addressed Comments 2016-09-22 07:15:54 +00:00
Muddasser
3683ee7f32 Help Links second pass 2016-09-22 07:15:54 +00:00
Muddasser
c64d9aaabe automate help links 2016-09-22 07:15:54 +00:00
Awais Jibran
3f21b0718f Show error message on password reset if provided passwords does not match. 2016-09-22 10:36:53 +05:00
Felipe Volpone
14f1fdf3c9 Disabling the "View Unit in Studio" button to CCX courses 2016-09-22 00:45:18 -03:00
sanfordstudent
5b7f48c5ed Merge pull request #13495 from edx/beryl/test-explicit-graded 
tests for changing grade policy
and moving progress page tests into separate file
 2016-09-21 12:28:33 -04:00
Chris
4f28b81fee Merge pull request #13334 from edx/clrux/ac-571-video-transcript-download 
AC-571 updating video download/transcript area
 2016-09-21 10:32:20 -04:00
Sanford Student
a98e33afd8 TNL-5466 tests for changing grade policy 
and moving progress page tests into separate file
 2016-09-21 09:48:46 -04:00
Giulio Gratta
0eca0eadaf Revert "Add fa loading spinner to CAPA problems" 
This reverts commit a3eb726f5f.
 2016-09-20 12:56:20 -07:00
Brian Jacobel
1c90b3186a Fix alignment of "mark as answer button" by adding btn-link class 
TNL-5586
 2016-09-20 11:30:49 -04:00
Chris Rodriguez
0ebc90472c AC-571 updating video download/transcript area 2016-09-20 06:22:24 -04:00
Muzaffar yousaf
087acb8ae0 Merge pull request #13434 from edx/mushtaq/a11y-discussions-icon-aria-hidden 
Remove icon-aria-hidden rule for a11y discussions
 2016-09-19 19:34:27 +05:00
Brian Jacobel
a2bf4696e4 Merge pull request #13428 from edx/bjacobel/topic-list-dropdown 
Replace discussion topic selector with a native dropdown
 2016-09-19 09:53:17 -04:00
Mushtaq Ali
a1945c18d1 Remove icon-aria-hidden rule for a11y discussions 
TNL-4637 TNL-4641 TNL-4645
 2016-09-19 12:30:20 +05:00
Muddasser
dd876d8be1 Merge pull request #13312 from edx/muddasser/TNL-5315 
lms/navigation.feature to bokchoy
 2016-09-19 11:17:39 +05:00
Matjaz Gregoric
c47561e1bb Don't show error in studio when fetching YouTube metadata fails. 
The error message was very confusing ("Studio is having trouble saving
your work").

Log a warning in the JS console instead.
 2016-09-18 16:42:50 +02:00
Brian Jacobel
c28fc04b78 Commenting out color-contrast tests for DiscussionOpenClosedThreadTest because of Jenkins issues 2016-09-16 13:11:21 -04:00
Brian Jacobel
a229e1f028 Fix DiscussionHomePageTest color-contrast issues - TNL-4635 2016-09-16 13:11:21 -04:00
Brian Jacobel
a19274c84f Fix DiscussionOpenClosedThreadTest color-contrast issues - TNL-4644 2016-09-16 13:11:20 -04:00
Brian Jacobel
ad1aa2b35f Fix DiscussionTabMultipleThreadTest color-contrast issues - TNL-4639 2016-09-16 13:11:20 -04:00
Sanford Student
bf1fcc68cd bok choy tests for persistent grades 2016-09-15 13:23:20 -04:00