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

15210 Commits

Author SHA1 Message Date
Albert (AJ) St. Aubin
43b4141cdf Merge pull request #13613 from edx/aj/TNL-5644_exposed_icon 
Aj/tnl 5644 exposed icon
 2016-10-24 17:47:18 -04:00
Albert St. Aubin
055fd6ea8f Refactored the status icon and span to a unified template and updated tests 2016-10-24 16:48:58 -04:00
Nimisha Asthagiri
2e6d4752a0 Merge pull request #13813 from edx/beryl/rescore-task-name 
Correct task_type for other rescore-if-higher admin commands
 2016-10-24 15:46:15 -04:00
Nimisha Asthagiri
52069197c7 Correct task_type for other rescore-if-higher admin commands. 2016-10-24 13:43:24 -04:00
Christina Roberts
69235ebb50 Merge pull request #13801 from edx/christina/ac-582 
AC-582 progress page markup corrections
 2016-10-24 13:37:13 -04:00
Nimisha Asthagiri
9fb9222a6c Merge pull request #13806 from edx/beryl/gating-again 
Unrevert "Fix Gating to use grades API, instead of its own calculations"
 2016-10-24 13:33:50 -04:00
Nimisha Asthagiri
7aacae9a4f Unrevert "Fix Gating to use grades API, instead of its own calculations" 2016-10-24 12:33:59 -04:00
M. Rehan
5835468d94 Merge pull request #13362 from edx/mushtaq/generate-verified-users-with-audit-certs 
Generate certificates for verified users with audit certificate statuses
 2016-10-24 16:22:45 +05:00
Albert (AJ) St. Aubin
c01df60014 Merge pull request #13786 from edx/aj/TNL-5549_problemMetaRefactor 
Aj/tnl 5549 problem meta refactor
 2016-10-21 13:03:32 -04:00
Matthew Piatetsky
b2c8ff05a6 Merge pull request #13802 from edx/ECOM-5050 
ECOM-5050 Expose mobile-friendly field for course runs returned by Course API
 2016-10-21 10:27:07 -04:00
Qubad786
65ef041a53 Add ability to generate certs for audit_passing/audit_notpassing learners 2016-10-21 16:03:29 +05:00
Mushtaq Ali
dacfcc985f Generate certificates for verified users with audit certificate statues - ECOM-5012 2016-10-21 16:03:28 +05:00
Albert St. Aubin
dbb66f8c09 Updated the problem meta to show a score of 0 and refactored/simplified the JS that build the problem meta string 
TNL-5549
 2016-10-21 06:40:20 -04:00
Nimisha Asthagiri
aa000c1a3d Support for rescoring a problem only if the new score is higher 
TNL-5046
 2016-10-20 15:08:54 -04:00
Matthew Piatetsky
3d72229168 Expose mobile-friendly field for course runs returned by Course API 2016-10-20 14:35:31 -04:00
Ned Batchelder
0e3e1b479a Merge pull request #13800 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-10-20 13:02:22 -04:00
Chris Rodriguez
3b9c970ce5 AC-582 progress page markup corrections 2016-10-20 12:55:59 -04:00
alisan617
0799033693 Merge pull request #13681 from edx/alisan/instructor-dashboard-coffeescript 
Convert instructor dashboard coffeeScript to js
 2016-10-20 12:45:29 -04:00
alisan617
6255e20262 Merge pull request #13646 from edx/alisan/capa-i18n-btn-bar-fix-TNL-5642 
Capa button bar attempt message position for i18n
 2016-10-20 11:55:21 -04:00
Ned Batchelder
08f7198f16 Update translations (autogenerated message) 2016-10-20 15:42:15 +00:00
Eric Fischer
7c1913b702 Merge pull request #13765 from edx/efischer/grades_task_retry 
Recalculate Subsection Grade task retry logic
 2016-10-20 10:47:58 -04:00
Cliff Dyer
ac48c2e42f Merge pull request #13716 from edx/cdyer/fix-problem-block-tests 
Make problem block tests more realistic.
 2016-10-20 10:36:45 -04:00
alisan617
5fe397f8c9 change Instructor Dashboard coffeeScript bundle path and move fixtures to JS folder, plus eslint 2016-10-20 09:32:45 -04:00
J. Cliff Dyer
1cfff02f06 Add tests for scoring of diverse problem types. 
Includes:
* CAPA
* ORA
* LTI
* LTI-Consumer
* SGA
* Randomized Content Block

TNL-5692
TNL-5464
 2016-10-20 09:29:55 -04:00
alisan617
a43c1e9469 change layout in submit button bar for i18n 2016-10-20 09:27:48 -04:00
alisan617
04fa2a4263 Merge pull request #13793 from edx/alisan/page-navs-wraps-TNL-5794 
byte-size fix for 2 lines page navs
 2016-10-20 09:19:15 -04:00
alisan617
9bcbb25b86 byte-size fix for 2 lines page navs 2016-10-19 19:13:58 -04:00
Sanford Student
9209eef7e2 add grading policy hash to transformer 2016-10-19 11:35:51 -04:00
Eric Fischer
2ca7484c1a Merge pull request #13763 from edx/efischer/use_env_tokens 
Allow Celery queue settings to be defined by ENV_TOKENS
 2016-10-19 10:02:22 -04:00
Jeremy Bowman
c8b36a6ac1 Merge pull request #13161 from mitocw/fix/aq/support_django_oauth_toolkit 
Fixed authentication classes to support Django OAUTH Toolkit
 2016-10-19 10:00:15 -04:00
Eric Fischer
529889f3f2 Recalculate Subsection Grade task retry logic 
The task will now be retried if an IntegrityError is encountered, up to
the default of 3 times. Test included.

TNL-5739
 2016-10-19 09:45:34 -04:00
Christina Roberts
6b3aa71102 Merge pull request #13730 from indagation/fix_staticbook_url 
Fix Malformed Staticbook url
 2016-10-18 21:45:56 -04:00
Nimisha Asthagiri
6e7f131c40 Merge pull request #13790 from edx/release 
Merge Release to Master
 2016-10-18 19:23:23 -04:00
Nimisha Asthagiri
ba9ef89e8d Fix CCX migration to be resilient to course-not-found 2016-10-18 13:55:25 -04:00
Robert Raposa
4d301b9b98 Revert MathJax -full config. 2016-10-18 13:55:25 -04:00
Toby Lawrence
6704e17afd [TNL-5632] Optimize the single_thread view. 
Firstly, we're now explicitly instructing the comments service to not
return thread responses/comments if the request isn't AJAX.  So, if you
load the URL for a single discussion thread in your browser, this would
be a non-AJAX call and we'll avoid loading the responses for the entire
thread behind-the-scenes.  Big win here for large threads.

Next, we removed a redundant "get threads" call which was also happening
behind-the-scenes.  This call was redundant as the front-end JS also
grabs the thread list when a topic is chosen, so we were making an
extranenous call for no benefit.  Poof, gone!

Finally, we added some caching of database queries that are required to
drive a lot of the permissions/cohorts machinery around discussion.
This will have a minimal effect but introduced a cleaner way to apply
general memoization at the per-request level which will let us further
cache things as we identify them as issues.
 2016-10-18 13:11:30 -04:00
Douglas Hall
9cf6880534 Merge pull request #13777 from edx/douglashall/fix_session_cookie_domain_middleware 
Refactored middleware that supports SESSION_COOKIE_DOMAIN overrides.
 2016-10-18 11:20:43 -04:00
alisan617
7b9c566f3d convert coffeeScript files in instructor dashboard to JS 2016-10-18 10:57:25 -04:00
Douglas Hall
ac390e13f6 Refactored middleware that supports SESSION_COOKIE_DOMAIN overrides. 2016-10-18 09:07:03 -04:00
Amir Qayyum Khan
f09445ed18 Added more tests 2016-10-18 16:20:57 +05:00
Amir Qayyum Khan
164d324449 Refactor tests 2016-10-18 16:20:57 +05:00
Amir Qayyum Khan
25d8085b79 Fixed authentication classes to support Django OAUTH Toolkit 2016-10-18 16:20:57 +05:00
Christina Roberts
046ee7bd96 Merge pull request #12923 from CredoReference/static-page-for-instructors-only 
Ability to hide Pages from students
 2016-10-17 17:10:33 -04:00
Robert Raposa
13495d88ab Use MathJax -full config. 2016-10-17 16:50:31 -04:00
Eric Fischer
5df9f20160 Allow Celery queue settings to be defined by ENV_TOKENS 
General good-practice cleanup requested by @jibsheet. Also includes some
pylint fixes myh editor flagged during this cleanup.
 2016-10-17 11:45:07 -04:00
Eric Fischer
76b3a65259 Use redefined LOW_PRIORITY queue 
aws.py redefines the default queues in order to expose cross-environment
work. The new recalculate grades routing key shgould use that value
rather than the default defined in common.py.
 2016-10-17 11:32:06 -04:00
Gregory Martin
2f868e5e24 Merge pull request #13733 from edx/yro_localized-datetime 
Set up DateUtil factory, modify requests to handle moment-timezones, moment-with-locales.
 2016-10-17 10:10:58 -04:00
tasawernawaz
ab8e5b82b6 Forgot Password - Verbiage Update 
ECOM-5684
 2016-10-17 11:56:35 +05:00
Dmitry Viskov
bb09fdb7be Ability to hide Pages from students 2016-10-14 22:43:26 +03:00
Greg Martin
4ddda443b8 Implement localized datetimes in browser 
moment-timezone require config

jasmine test fix, duplicate req. cleanup
 2016-10-14 15:25:38 -04:00