Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,915 Commits 1 Branch 0 Tags
140fd85eb71197d6d26698099d2fa367e817cfcb
Commit Graph

36915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Douglas Hall
140fd85eb7 Merge pull request #12472 from edx/hasnain-naveed/WL-446 
ML-446 / Aligned the labels in login and registration pages
 2016-05-16 09:41:29 -04:00
Peter Fogg
89838d40ed Merge pull request #12373 from edx/peter-fogg/password-change-session-invalidation 
Expire sessions after a password change.
 2016-05-16 09:17:45 -04:00
Christine Lytwynec
c61846fbb5 Merge pull request #12462 from edx/clytwynec/ac-367 
update pa11ycrawler version
 2016-05-16 09:09:52 -04:00
Hasnain
c5f0fb87c8 ML-446 / Aligned the labels in login and registration pages 2016-05-16 12:35:08 +00:00
Douglas Hall
14587a5d3e Merge pull request #12442 from edx/ibrahimahmed443/WL-450-save-cancel-button-on-instructor-image-path 
show Save and Cancel button when admin change Instructor image asset …
 2016-05-15 07:28:14 -04:00
Ibrahim
b3411074af show Save and Cancel button when admin change Instructor image asset path from Studio schedule and details page 2016-05-14 16:25:44 -04:00
Douglas Hall
7d96ba50f2 Merge pull request #12446 from edx/ibrahimahmed443/WL-449-asset-image-fix 
WL-499 Fix the issue where images do not appear when set through asset linki…
 2016-05-14 06:46:12 -04:00
Ibrahim
2a2560e30e fix the issue where images do not appear when set through asset linkin Studio scheduls and details page 2016-05-13 16:22:44 -04:00
Robert Raposa
5a372a2c88 Merge pull request #12463 from edx/robrap/safelint-thresholds 
Update thresholds.
 2016-05-13 16:21:16 -04:00
Robert Raposa
06505c45ba Update thresholds. 2016-05-13 15:12:55 -04:00
Christine Lytwynec
86a96b5af0 update pa11ycrawler version 2016-05-13 14:22:14 -04:00
Renzo Lucioni
9129e5df87 Merge pull request #12459 from edx/renzo/kill-tabs 
Remove tab characters
 2016-05-13 12:56:42 -04:00
Robert Raposa
f4eacbc7d3 Merge pull request #12432 from edx/robrap/jenkins-safe-commit-fix-2 
Integration of Safe Templates Commit into Jenkins
 2016-05-13 10:57:45 -04:00
Renzo Lucioni
6975b66c08 Remove tab characters 2016-05-13 10:12:34 -04:00
Robert Raposa
143a22fb9f Enhance Jenkins integration of safe templates take 2 
- Handle case when no files are linted
- Skip deleted files for safe commit script
- Add verbose options for safe commit
 2016-05-13 09:59:23 -04:00
Ned Batchelder
ebc11849be Merge pull request #12454 from edx/ned/remove-useless-asserts 
These asserts are never run.
 2016-05-13 09:45:44 -04:00
Robert Raposa
1720645302 Merge pull request #12180 from edx/robrap/safe-template-marathon 
TNL-4290: Safe template marathon work
 2016-05-13 09:42:46 -04:00
Christina Roberts
c3dbcd08dd Merge pull request #12415 from edx/christina/delete-unused-files 
These old discussion templates are not referenced in the codebase.
 2016-05-13 09:21:43 -04:00
Matt Drayer
238ae554cb Merge pull request #12456 from edx/mattdrayer/add-bulk-sku-default-none 
mattdrayer/add-bulk-sku-default-none: Fix MySQL insert error
 2016-05-13 07:47:25 -04:00
Matt Drayer
e65dcc37a7 mattdrayer/add-bulk-sku-default-none: Fix MySQL insert error 2016-05-12 23:20:20 -04:00
AlasdairSwan
7bca66c23e Merge pull request #12408 from edx/alasdair/ECOM-4215-program-details-page-setup 
ECOM-4215 adding setup for new program details page
 2016-05-12 18:25:13 -04:00
Peter Fogg
524e229245 Expire sessions after a password change. 
This is slightly more complicated than it should be since we're using
custom authentication middleware (i.e., not Django's standard
middleware class). We have to check that the session auth hash we have
stored is equal to the request's session auth hash (since the stored
hash is a function of the password). Normally this gets handled in
`django.contrib.auth.get_user`, but due to our caching we don't go
through that function, even in the cache miss case.

ECOM-4288
 2016-05-12 16:44:56 -04:00
Renzo Lucioni
a3e1854bf1 Fix a11y tests 2016-05-12 16:40:22 -04:00
AlasdairSwan
bc5daffc96 ECOM-4215 adding setup for new program details page 2016-05-12 16:39:23 -04:00
Ben Patterson
3ba1b20b41 Merge pull request #12434 from edx/benp/require-firefox-42 
Firefox version must meet a minimum
 2016-05-12 16:17:56 -04:00
Matt Drayer
4d08379bfc Merge pull request #12451 from edx/mattdrayer/microste-jwt-auth 
mattdrayer/microsite-jwt-auth: Access setting through theming/microsites
 2016-05-12 15:59:40 -04:00
Matt Drayer
55cf0fb2c4 mattdrayer/microsite-jwt-auth: Access setting through microsites/theming framework 
* mattdrayer: Remove individual JWT settings
* mattdrayer: Add settings defaults to JWT_AUTH calls
 2016-05-12 15:04:26 -04:00
Ned Batchelder
4ef850f815 These asserts are never run. 2016-05-12 14:54:54 -04:00
Ned Batchelder
adb9200e0a Merge pull request #12447 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-05-12 14:35:51 -04:00
Robert Raposa
2089728703 Safe template marathon work 2016-05-12 14:23:35 -04:00
Bill DeRusha
25a7d60aed Merge pull request #12448 from edx/bderusha/st-wiki-2 
Safe Templatize: wiki templates
 2016-05-12 14:19:02 -04:00
Bill DeRusha
e5b1994eea Merge pull request #11901 from edx/bderusha/st-choose 
Safe templatize: choose.html
 2016-05-12 14:14:59 -04:00
Christine Lytwynec
510eaa3c95 Merge pull request #12423 from edx/clytwynec/ac-367 
Speed up pa11ycrawler runs on Jenkins, Update pa11ycrawler to v0.0.2
 2016-05-12 13:16:19 -04:00
Renzo Lucioni
e88a4e5c74 Merge pull request #12437 from edx/renzo/filter-by-passing-certs 
Tune program credential backpopulation command
 2016-05-12 12:12:11 -04:00
Christine Lytwynec
f68747ec96 Speed up pa11ycrawler runs on Jenkins, Update pa11ycrawler to v0.0.2 2016-05-12 11:33:58 -04:00
Bill DeRusha
98254e5cec Safe templatize: choose.html 2016-05-12 11:29:20 -04:00
Bill DeRusha
970fd6db1d Safe Templatize: wiki templates 2016-05-12 11:27:16 -04:00
Ned Batchelder
76449b6a32 Merge pull request #12400 from reciproco/master 
Fix CRI-57 Bug
 2016-05-12 11:22:41 -04:00
Clinton Blackburn
6a0c6f7a14 Merge pull request #12439 from edx/clintonb/credit-admin-update 
Updated credit admin
 2016-05-12 11:14:14 -04:00
Clinton Blackburn
5cc306ae7e Merge pull request #12440 from edx/clintonb/jwt-auth-updates 
Updated usage of JWT authentication
 2016-05-12 11:10:00 -04:00
Ned Batchelder
1ef94b7694 Update translations (autogenerated message) 2016-05-12 14:48:44 +00:00
Douglas Hall
32c6c20be9 Merge pull request #12438 from edx/douglashall/WL-461/followup 
WL-461 Always include the course price in the course_about template context
 2016-05-11 22:53:25 -04:00
Renzo Lucioni
dbe6dfc2ae Tune program credential backpopulation command 
Filter certificates by passing status when looking for users who may be eligible for a program certificate. Doing so dramatically accelerates the query and further reduces the set of targeted users. Part of ECOM-3924.
 2016-05-11 22:29:48 -04:00
Clinton Blackburn
28d4e2e8f4 Updated credit admin 
ECOM-4379
 2016-05-11 22:28:12 -04:00
Clinton Blackburn
e53d36b363 Updated edx-organizations 
This latest version uses our custom JwtAuthentication class.

ECOM-4414
 2016-05-11 22:25:43 -04:00
Clinton Blackburn
23e990df1d Replaced all usages of JSONWebTokenAuthentication with JwtAuthentication 
JwtAuthentication knows how to parse our custom claims.

ECOM-4414
 2016-05-11 22:25:35 -04:00
Douglas Hall
6c4f471787 Always include the course price in the course_about template context 2016-05-11 21:26:56 -04:00
Douglas Hall
f347e30b1b Merge pull request #12436 from edx/douglashall/WL-461/fix_course_price 
WL-461 Include course price in course_about template context
 2016-05-11 20:35:17 -04:00
Ben Patterson
62df58fafd Firefox version must meet a minimum 
This will be a backwards-compatible change, which will allow
developers that use older versions of firefox (e.g., 28) to
continue with development while also supporting a build system
and development that uses newer firefox versions (e.g., 42)
 2016-05-11 19:25:17 -04:00
Douglas Hall
2e7a5a0f6a Include course price in course_about template context if either the ecommerce service is enabled or shoppingcart is enabled 2016-05-11 16:35:07 -04:00