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

12663 Commits

Author SHA1 Message Date
Douglas Hall
dce3d9ca81 Merge pull request #11014 from edx/douglashall/PHX-219/subsection_gating 
PHX-219 Subsection Gating
 2016-01-29 11:05:39 -05:00
Zia Fazal
6e861f266b Merge pull request #11352 from edx/ziafazal/WL-209 
ziafazal/WL-209:Cert Social Sharing customization
 2016-01-29 16:50:17 +05:00
Zia Fazal
06e38e1c24 added branding to 404 and 500 error pages 
changes based on feedback

renamed a definition and added test coverage

fixed broken tests
 2016-01-29 15:46:51 +05:00
Asad Iqbal
87d9a07931 Merge pull request #11242 from edx/asadiqbal08/WL-243-manual-lang 
WL-243 LMS Language Selection
 2016-01-29 14:07:46 +05:00
Douglas Hall
37a7fdc0f2 Added subsection gating feature 2016-01-28 14:05:20 -05:00
asadiqbal
99b883b7be WL-243 LMS Language Selection 2016-01-28 20:07:26 +05:00
Christine Lytwynec
092eae9ff3 Merge pull request #11130 from edx/clytwynec/ac-75 
AC-75 and AC-73
 2016-01-28 08:52:40 -05:00
Zia Fazal
463e8c82cf Cert Social Sharing customization 
changes after feedback from matte
 2016-01-28 14:26:48 +05:00
Ahsan Ulhaq
70eaf18936 caching for requests to credentials service 
ECOM-3278
 2016-01-28 13:05:50 +05:00
Ahsan Ulhaq
5181513629 Show message for earned programs credentials 
ECOM-3015
 2016-01-28 13:05:50 +05:00
Clinton Blackburn
0b8145ee75 Merge pull request #11357 from edx/clintonb/ccx-fix 
Resolved ccx-keys dependency on edx-opaque-keys
 2016-01-27 22:55:13 -05:00
Clinton Blackburn
29f0a5b172 Updated XModule opaque-keys dependency 
Using edx-opaque-keys instead of opaque-keys
 2016-01-27 17:19:39 -05:00
Nimisha Asthagiri
08a2bc9620 Merge pull request #11358 from edx/release 
Hotfix for MA-1981 and safe sessions
 2016-01-27 15:53:20 -05:00
Christine Lytwynec
8c8953fe32 Update discussion markdown editor add link and image modals 2016-01-27 14:43:29 -05:00
Ben Patterson
f43e19615b Merge pull request #11333 from edx/benp/mgmt-command-enroll-in-course 
Enroll already-existing user to a course via management command.
 2016-01-27 12:39:39 -05:00
Ben Patterson
551eaaf706 Enroll already-existing user to a course via management command. 
Our current sandbox provisioning uses a create_user management command,
which creates and enrolls a user into a course. However, for TE-1128, we
will need a way to enroll the same user to multiple courses (which are
dynamic at time of provisioning). Using the existing management
command is no longer feasible for that, so we are using one that accesses
the enrollment API, which is the new standard for new enrollment capabilities.
 2016-01-27 11:49:31 -05:00
Bill DeRusha
f59144b7e3 Merge pull request #11207 from edx/bderusha/yob-fix 
Update age calculation to be more conservative.
 2016-01-27 10:48:47 -05:00
Toby Lawrence
531347b463 Merge pull request #11277 from edx/PERF-251 
Add the basis of configuring a cache TTL for course assets.
 2016-01-27 08:38:16 -05:00
Toby Lawrence
01a9ad2369 Add support to enhance the cacheability of course assets. 
This introduces a mechanism to control the time-to-live for an unlocked
course asset, which will allow browsers and intermediate proxies/caches
to cache these course assets, determinstically.

Locked assets, with their nature of requiring authorization, are not
eligible for caching.
 2016-01-26 21:09:18 -05:00
Nimisha Asthagiri
f3cb692472 Safe Session Cookies Middleware 2016-01-26 17:23:03 -05:00
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
Bill DeRusha
77668afa11 Update age calculation to be more conservative. 2016-01-26 13:19:51 -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