Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
44,462 Commits 1 Branch 0 Tags
95e76dcafe945b62dc7bbaebde1a32434002464a
Commit Graph

44462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
bd08e46bd7 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 16:00:28 -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
Chris Rodriguez
0dcd3d2da2 Simplifying styles 2016-05-12 15:45:07 -04:00
Adam Palay
91ae60f5e9 refine from_addr length limits (TNL-4264) 2016-05-12 15:12:41 -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
Douglas Hall
eb3c6ab813 Always include the course price in the course_about template context 2016-05-12 11:32:26 -04:00
Douglas Hall
4c0019c3d8 Include course price in course_about template context if either the ecommerce service is enabled or shoppingcart is enabled 2016-05-12 11:31:58 -04:00
Matt Drayer
13b8b10c5a mattdrayer/course-mode-bulk-sku: Add new CourseMode field 
* mattdrayer: Add bulk checkout link to course views
* asadiqbal08: MAYN-225 replace the "Verify Now" button by the "Go to Dashboard" button in case of themed sites.
* mattdrayer: Add bulk_sku check in courseware.views
 2016-05-12 11:31:39 -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
Renzo Lucioni
91d049794b Merge pull request #12421 from edx/renzo/backpopulate-command 
Add management command for backpopulating missing program credentials
 2016-05-11 14:09:07 -04:00
Ben Patterson
c788a1bed3 Merge pull request #12431 from edx/benp/flaky-tnl-4561 
Flag test as flaky.
 2016-05-11 14:04:17 -04:00
Renzo Lucioni
46bdbe1310 Merge pull request #12429 from edx/renzo/program-task-logging 
Extend program certification task logging to facilitate monitoring during backpopulation
 2016-05-11 13:37:59 -04:00
Ben Patterson
e3469160c4 Flag test as flaky. 2016-05-11 13:01:38 -04:00
Matt Drayer
f1538132e4 Merge pull request #12315 from edx/mattdrayer/course-mode-bulk-sku 
mattdrayer/course-mode-bulk-sku: Add new CourseMode field
 2016-05-11 12:47:55 -04:00
Renzo Lucioni
065300ba65 Extend program certification task logging to facilitate monitoring during backpopulation 
Log a message at the info level when the task is called for a user with no completed programs, and another when the task is called for a user who is not eligible for any new program certificates. Part of ECOM-3924.
 2016-05-11 12:38:05 -04:00
Douglas Hall
f81e90fb33 Merge pull request #12427 from edx/release 
Merging Hotfix Release 2016-05-11 back to master
 2016-05-11 12:17:31 -04:00
Renzo Lucioni
c931d4d14b Add management command for backpopulating missing program credentials 
This command triggers program certification tasks for any users in the system who may qualify for a program credential. ECOM-3924.
 2016-05-11 11:36:48 -04:00
Matt Drayer
a9b7e4c63d mattdrayer/course-mode-bulk-sku: Add new CourseMode field 
* mattdrayer: Add bulk checkout link to course views
* asadiqbal08: MAYN-225 replace the "Verify Now" button by the "Go to Dashboard" button in case of themed sites.
* mattdrayer: Add bulk_sku check in courseware.views
 2016-05-11 10:57:24 -04:00
Douglas Hall
9c834feb35 Merge pull request #12420 from edx/hotfix/2016-05-11 
Hotfix 2016-05-11
 2016-05-11 10:53:47 -04:00
Robert Raposa
e57777d3fb Merge pull request #12425 from edx/robrap/revert-safe-commit 
Revert: Enhance Jenkins integration of safe template linting
 2016-05-11 10:01:42 -04:00
Robert Raposa
5ea529ae39 Revert: Enhance Jenkins integration of safe template linting 2016-05-11 09:56:23 -04:00
Christina Roberts
8340703f41 Merge pull request #11620 from openfun/regisb/include_geo_data_in_student_profile_report 
Include non-obsolete location info in student profile report
 2016-05-11 09:25:59 -04:00
Robert Raposa
ad4e185f0d Merge pull request #12391 from edx/robrap/jenkins-rule-thresholds 
TNL-4509: Set Jenkins thresholds per rule.
 2016-05-11 09:14:51 -04:00