Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
34,927 Commits 1 Branch 0 Tags
7d773df52d24e0c8c1915fd4cf03cc844a932efb
Commit Graph

12642 Commits

Author SHA1 Message Date
Eric Fischer
7d773df52d Merge pull request #11171 from edx/andya/fix-discussion-more-icons 
Fix bug with discussion response "More..." actions
 2016-01-26 15:08:41 -05:00
Eric Fischer
d1ef73e90a Don't renderAttrs unnecessarily 
It is unneeded here, and causes bad behavior.
 2016-01-26 13:08:42 -05:00
Andy Armstrong
10ca0a3870 Discussion Test Updates 
Updates discussion tests to not mock out so much. Also adds new
test coverage for the bug being investigated here.
 2016-01-26 13:08:42 -05:00
Adam Palay
c37715a7c7 Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/base.txt
	requirements/edx/github.txt
 2016-01-26 11:25:41 -05:00
Adam
5a5b5e8026 Merge pull request #11279 from edx/remove-old-mgmnt-commands 
remove old  management commands
 2016-01-26 09:23:25 -05:00
Matt Drayer
b575d50ae0 Merge pull request #11287 from edx/ziafazal/WL-287 
ziafazal/WL-287: moved IS_EDX_DOMAIN dependent features to edx.org theme
 2016-01-25 22:27:25 -05:00
Adam Palay
bb2d75d80e Revert "Merge pull request #11241 from edx/feature/credentials-phase-1" 
This reverts commit 46df454536, reversing
changes made to 039e6cdfe6.
 2016-01-25 12:46:57 -05:00
clrux
519e292d82 Merge pull request #11294 from edx/clrux/ac-323 
Adjusting .sr mixins for NVDA/JAWS on Windows
 2016-01-25 11:53:11 -05:00
M. Rehan
8c26178df3 Merge pull request #11095 from edx/mushtaq/improve_get_item 
Get only those block items which have their path to root
 2016-01-23 02:50:25 +05:00
Muhammad Rehan
352e2190eb improve get_items and has_path_to_root with temporary caches. 2016-01-23 01:50:05 +05:00
Zia Fazal
c0648ab164 moved IS_EDX_DOMAIN dependent feature to edx.org theme 2016-01-22 15:32:19 -05:00
Saleem Latif
2d83449240 Remove microsite_configuration/microsite.py references from individual templates 
* mattdrayer: Updated get_themed_template_path
 2016-01-22 14:27:58 -05:00
Mushtaq Ali
70b55cf1d4 Append Item only if it has path to root. 
Code refactor
 2016-01-23 00:21:32 +05:00
Douglas Hall
8e22e855cb Merge pull request #11274 from edx/ibrahimahmed443/enable-copyright-url 
uncomment copyright url to enable it in microsites
 2016-01-22 13:37:12 -05:00
Ibrahim
0f09bb8a94 raise 404 when copyright template is missing 2016-01-22 12:02:46 -05:00
Jesse Zoldak
fc45b2c82e Merge pull request #11292 from edx/zoldak/phantom-bok-choy 
Harden page objects
 2016-01-22 11:49:46 -05:00
Peter Fogg
6cd12f9f39 Merge pull request #11296 from edx/peter-fogg/fix-certs-migrations 
[wip] Reintroduce generated certificate changes, with updates to not require a giant migration.
 2016-01-22 11:19:54 -05:00
Ned Batchelder
106a822def Merge pull request #11305 from edx/ned/fix-flaky-test 
Add @flaky
 2016-01-22 11:11:59 -05:00
raeeschachar
8b24d6380a Merge pull request #11303 from edx/raees/chrome-bokchoy-test-can-create-edit-signatories-of-certificate 
Fixed test can create and edit signatories of certificate failing on …
 2016-01-22 21:10:17 +05:00
Peter Fogg
96cc38951d Disable audit certificates for new audit enrollments. 
Two new certificate statuses are introduced, 'audit_passing' and
'audit_notpassing'. These signal that the GeneratedCertificate is not
to be displayed as a cert to the user, and that they either passed or
did not. This allows us to retain existing grading logic, as well as
maintaining correctness in analytics and reporting.

Ineligible certificates are hidden by using the
`eligible_certificates` manager on GeneratedCertificate. Some places
in the coe (largely reporting, analytics, and management commands) use
the default `objects` manager, since they need access to all
certificates.

ECOM-3040
ECOM-3515
 2016-01-22 10:27:55 -05:00
Ned Batchelder
30209b1486 Add @flaky 2016-01-22 09:48:25 -05:00
Ahsan Ulhaq
46df454536 Merge pull request #11241 from edx/feature/credentials-phase-1 
Feature/credentials phase 1
 2016-01-22 18:39:53 +05:00
raeeschachar
8dbf66fbd9 Fixed test can create and edit signatories of certificate failing on Chrome 2016-01-22 18:29:17 +05:00
Chris Rodriguez
a0a9617a86 Replacing height and width in lieu of word-wrap 2016-01-21 15:18:05 -05:00
Chris Rodriguez
33f967c04b Adjusting .sr mixins for NVDA/JAWS on Windows 2016-01-21 12:42:58 -05:00
Adam
c6b21d139a Merge pull request #11293 from edx/release 
Release
 2016-01-21 12:36:03 -05:00
Jesse Zoldak
6fc490e3d4 Harden page objects 2016-01-21 10:31:37 -05:00
Syed Hasan raza
fb8478b084 Merge pull request #11228 from edx/shr/bug/AN-4509-HTTP_USER_AGENT 
Fix HTTP_USER_AGENT latin1 characters
 2016-01-21 15:23:16 +05:00
Braden MacDonald
5e3cc70783 Merge pull request #10943 from open-craft/email-authorized-list-master 
Allow each instance to configure restrictions on allowed email addresses
 2016-01-20 14:51:29 -08:00
Martin Segado
a15388b20c Allow python variable interpolation in CustomResponse 'expect' and 'answer' attributes 2016-01-20 15:11:51 -05:00
Eric Fischer
e65e8df2b5 Merge pull request #11269 from edx/efischer/flaky_tests 
Flaky test fix
 2016-01-20 15:01:37 -05:00
Peter Pinch
02a7d6eb47 Merge pull request #10931 from mitocw/gdm_push_ccx_info_to_connector_#128 
Added CCXCon app and CCXCon URL in course advanced settings
 2016-01-20 14:28:48 -05:00
Adam Palay
9981c86718 remove old management commands 2016-01-20 14:11:54 -05:00
Eric Fischer
2b2f6d18d6 Wait for text to appear 
Adding a wait statement to allow ajax calls to finish before making assertions
about text that has changed. Fixes TNL-3943 flaky test ticket.
 2016-01-20 14:08:13 -05:00
Braden MacDonald
110714ee81 Allow each instance to configure restrictions on allowed email addresses 2016-01-20 11:03:30 -08:00
Diana Huang
ea2a0cab27 Merge pull request #11069 from OmarIthawi/edraak/oithawi/draggable-capa-rtl 
Fixup: draggable capa icons disappear in RTL layout
 2016-01-20 13:32:56 -05:00
Bill DeRusha
754e230f63 Update change_enrollment management command to be more robust and tested 2016-01-20 12:46:56 -05:00
Ben Patterson
31841bdcbb Merge pull request #11271 from edx/benp/9-bokchoy-shards 
Benp/9 bokchoy shards
 2016-01-20 12:09:53 -05:00
Giovanni Di Milia
bb36ab013f Added CCXCon app 
The CCXCon app is used to push course updated to the CCXCon
 externale service.
 2016-01-20 10:47:37 -05:00
Mushtaq Ali
d8b902ad58 Merge pull request #11200 from edx/mushtaq/ecom2082-fix-enrollment-msg 
Escape Course Name in enrolment message
 2016-01-20 20:04:23 +05:00
Peter Fogg
52d538444e Revert "Disable audit certificates for new audit enrollments." 
This reverts commit 60860e3aa8.
 2016-01-20 09:53:58 -05:00
Syed Hassan Raza
de91ceaae2 Fix HTTP_USER_AGENT latin1 characters 2016-01-20 18:40:09 +05:00
Muhammad Ammar
4938601cd9 Merge pull request #11177 from edx/ammar/fix-play-video-event 
Avoid emitting play_video event during buffering
 2016-01-20 17:59:04 +05:00
Matt Drayer
68d770116b Merge pull request #11262 from edx/saleem-latif/WL-276 
WL-276: Move microsite_configuration/templatetags/microsite.py from individual templates to static_content.html
 2016-01-20 07:49:36 -05:00
Mushtaq Ali
8f76f3385a Fix enrollment message 2016-01-20 15:59:27 +05:00
Saleem Latif
6c8c67cad5 Remove microsite_configuration/templatetags/microsite.py references from individual templates. 2016-01-20 14:36:07 +05:00
Ahsan Ulhaq
8fb998fee7 caching for requests to credentials service 
ECOM-3278
 2016-01-20 12:51:28 +05:00
Ahsan Ulhaq
4ce58a6f67 Show message for earned programs credentials 
ECOM-3015
 2016-01-20 12:50:30 +05:00
raeeschachar
536ac77af0 Merge pull request #11263 from edx/raees/chrome-bokchoy-test-course-rerun 
Fixed test course rerun failing on Chrome
 2016-01-20 12:39:54 +05:00
Omar Khan
ab688e63ea Redirect to login when SAML accessed without idp param 
The python social auth SAML page returns a 500 response when accessed
without the 'idp' query param. It should redirect to the login page if
the param is missing.

SOL-1550
 2016-01-20 09:36:31 +07:00