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

36885 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Palay
91ae60f5e9 refine from_addr length limits (TNL-4264) 2016-05-12 15:12:41 -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
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
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
Douglas Hall
4bd7b71f99 Remove course details field character limits 2016-05-10 16:00:54 -04:00
Robert Raposa
afdec6a99b Enhance Jenkins integration of safe template linting 
- Add rule based thresholds
- Add safecommit to Jenkins
 2016-05-10 15:50:45 -04:00
Douglas Hall
98f6785bc3 Merge pull request #12418 from edx/douglashall/WL-453/remove_course_details_field_character_limits 
WL-453 Remove course details field character limits
 2016-05-10 15:45:40 -04:00
Robert Raposa
80c3f84262 Fix safe template issues for 0 violations for some rules 2016-05-10 15:35:57 -04:00
Robert Raposa
73966d1a05 Add output of violation counts by rule 2016-05-10 15:35:57 -04:00
Douglas Hall
24b4d5d29f Remove course details field character limits 2016-05-10 13:23:04 -04:00
Nimisha Asthagiri
dced13a827 Merge pull request #12397 from edx/tnl/block-transformer-memcache 
Set infinite timeout for Block Structure cache entries
 2016-05-10 13:17:42 -04:00
Brian Jacobel
e8d2a626d4 Merge pull request #12417 from edx/bjacobel/fix-release-2016-05-10-merge-conflicts-with-master 
Fix release 2016 05 10 merge conflicts with master
 2016-05-10 13:03:19 -04:00
AlasdairSwan
599070e5ef Merge pull request #12412 from edx/alasdair/program-listing-certificate-fix 
If not certificates remove the container element from the DOM
 2016-05-10 13:00:11 -04:00
Régis Behmo
fe41e50d74 Include non-obsolete location info in student profile report 
The student profile report that can be downloaded from the course staff
dashboard included the "location" field (which is obsolete) and the
mailing address, which is seldom completed. Here, we add the "country"
and "city" fields to the csv report. To do so, we need to be able to
dump the new fields to JSON so we convert the user fields to unicode
when needed.

Note that this breaks compatibility with earlier reports.
 2016-05-10 18:25:15 +02:00
Brian Jacobel
d88aad7d79 Merge branch 'release' into bjacobel/fix-release-2016-05-10-merge-conflicts-with-master 2016-05-10 12:15:42 -04:00
AlasdairSwan
9becd565b3 If not certificates remove the container element from the DOM 2016-05-10 11:42:29 -04:00
Brian Jacobel
8a5a69f4cd Merge pull request #12392 from edx/rc/2016-05-10 
Release Candidate rc/2016-05-10
 2016-05-10 09:47:00 -04:00
tasawernawaz
6404150365 Merge pull request #12403 from edx/tasawer/story/ecom-3729-update-verification-status-area 
Update student verification area
 2016-05-10 18:00:50 +05:00
Awais Jibran
db05aeb7e0 Merge pull request #12384 from edx/aj/fix-cms-dashboard-for-ccx 
Studio Edge cannot load the Course Dashboard for CCX courses.
 2016-05-10 17:29:01 +05:00