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

39167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
a54c4ea4f9 Revert "Unrevert "Fix Gating to use grades API, instead of its own calculations"" 
This reverts commit 7aacae9a4f.
 2016-11-01 15:02:04 -04:00
Eric Fischer
caeac6921a Fast-fail grades tasks if feature flag disabled 2016-11-01 13:34:10 -04:00
Matthew Piatetsky
333c68665b Merge pull request #13865 from edx/release-candidate 
Release Candidate rc/2016-11-01
 2016-11-01 10:52:21 -04:00
Matthew Piatetsky
5eece3a935 Merge pull request #13870 from edx/include_hidden_revert 
Revert "Merge pull request #13846 from edx/ECOM-5050"
 2016-10-31 14:22:49 -04:00
Matthew Piatetsky
dc5f251938 Revert "Merge pull request #13846 from edx/ECOM-5050" 
This reverts commit c6b6d0bc74, reversing
changes made to fa2b1ae470.
 2016-10-31 10:04:20 -04:00
Edward Fagin
e1eb23dfe4 Merge pull request #13774 from edx/efagin/auth-logging 
Add logging when header permissions in use.
 2016-10-28 11:08:18 -04:00
alisan617
cd62fc39bc Merge pull request #13861 from edx/alisan/instructor-email-history-modal-fix 
Instructor dashboard email history modal fix
 2016-10-28 11:06:53 -04:00
Diana Huang
5bb4fd1b8b Merge pull request #13859 from edx/release 
Merge Release back into master
 2016-10-28 09:42:18 -04:00
Eugeny Kolpakov
1dc7567282 Merge pull request #13723 from edx/ekolpakov/enterprise_app 
Enterprise Customer: model and admin integration
 2016-10-28 12:51:22 +03:00
Ahsan Ulhaq
875f5424aa Merge pull request #13842 from edx/ahsan/ECOM-5365-Expose-user-email-to-api-admin 
Expose the user email to the api-admin view
 2016-10-28 14:27:05 +05:00
Ahsan Ulhaq
53e84390de Expose the user email to the api-admin view 
ECOM-5365
 2016-10-28 12:55:27 +05:00
Tasawer Nawaz
73559f39d6 Merge pull request #13849 from edx/tasawer/ecom-6213-revert-ecom-4763 
Revert "update error messages in enrollment API"
 2016-10-28 11:25:04 +05:00
tasawernawaz
84314e7a14 Revert "update error messages in enrollment API" 
This reverts commit 21746f1e93.
 2016-10-28 10:12:17 +05:00
alisan617
2d2f41668c typo in prop 2016-10-27 22:04:50 -04:00
Douglas Hall
c604cada09 Merge pull request #13830 from edx/hasnain-naveed/WL-614 
WL-614 | In Studio "View Live" button fix for theming.
 2016-10-27 21:13:46 -04:00
Ned Batchelder
26d5a5c399 Merge pull request #13856 from edx/ned/update-translations 
Update translations (autogenerated message)
 2016-10-27 17:35:08 -04:00
sanfordstudent
be8a56cda9 Merge pull request #13804 from edx/beryl/course_grades_glue 
Beryl/course grades glue
 2016-10-27 15:52:27 -04:00
Matthew Piatetsky
c6b6d0bc74 Merge pull request #13846 from edx/ECOM-5050 
ECOM-5769 Add hidden flag and return courses hidden in LMS when include_hidden is passed
 2016-10-27 15:48:00 -04:00
Sanford Student
a1d5ea905d Persistent Course Grades Glue Layer 
Initial commit

TNL-5484
 2016-10-27 14:56:45 -04:00
Ned Batchelder
26ab60f2f9 Update translations (autogenerated message) 2016-10-27 14:36:21 -04:00
Hasnain
b2572ee2b3 WL-614 | In Studio "View Live" button fix for theming feature. 2016-10-27 14:35:14 -04:00
Matthew Piatetsky
ef0699c4d8 Add hidden flag and return courses hidden in LMS when include_hidden is passed 2016-10-27 13:43:35 -04:00
Calen Pennington
fa2b1ae470 Merge pull request #13857 from cpennington/pin-markey 
Pin markey to 0.7
 2016-10-27 13:05:18 -04:00
Calen Pennington
2a3f8c9cf0 Upgrade django-babel-underscore and markey 2016-10-27 11:50:10 -04:00
Diana Huang
5ec6f9c224 Merge pull request #13847 from edx/release-candidate 
Patch Release: Update proctoring version.
 2016-10-27 11:41:05 -04:00
Calen Pennington
a630cbe8bc Pin markey to 0.7 2016-10-27 11:05:02 -04:00
Ahsan Ulhaq
c9676e4835 Merge pull request #13829 from edx/ahsan/ECOM-6185-errors-during-password-reset 
errors during password reset
 2016-10-27 18:45:33 +05:00
Ben Patterson
e51afc9e93 Merge pull request #13814 from edx/benp/fix-bok-choy-mp 
Bug fix: collect test results when running in multiprocess mode.
 2016-10-26 20:28:06 -04:00
Diana Huang
804b302b4e Update proctoring version. 2016-10-26 13:23:20 -04:00
Ben Patterson
8aa132d44e Always xunitmp since it's supported no matter the # of processes 2016-10-26 12:43:46 -04:00
Nimisha Asthagiri
f1ad94bdeb Merge pull request #13839 from edx/beryl/read-only-grades 
Update CourseGradeFactory.create to be read_only by default
 2016-10-26 12:15:06 -04:00
Jesse Zoldak
7e1a528db2 Merge pull request #13824 from edx/zoldak/fix-team-page-objects 
Fix flakiness of bok choy tests by improving the wait_for_page pattern
 2016-10-26 11:49:43 -04:00
Jesse Zoldak
29cf6be876 Merge pull request #13821 from edx/zoldak/TE-1673 
Only install python coverage prereqs for coverage paver tasks  TE-1673
 2016-10-26 11:47:21 -04:00
Albert (AJ) St. Aubin
b2efd78d8d Merge pull request #13831 from edx/aj/TNL-5283_tab_panels 
Updated learner profile to only use the tab panel view when there is …
 2016-10-26 11:42:54 -04:00
Douglas Hall
7097e5d02c Merge pull request #13817 from edx/ibrahimahmed443/WL-744-registration-error-message 
Edit error message for Username on registration
 2016-10-26 10:41:45 -04:00
Stu Young
f875738df3 Merge pull request #13826 from edx/estute/add-requirements-for-testing 
add testing requirements file
 2016-10-26 10:33:14 -04:00
Jesse Zoldak
fea64a66ff Only install python coverage prereqs for coverage paver tasks TE-1673 2016-10-26 10:15:08 -04:00
Jesse Zoldak
eedc441824 Patterns for better bok choy tests 
* visit() already does a wait_for_page()
* wait_for_page() already asserts on is_browser_on_page(), as it will raise a BrokenPromise after polling
* don't use is_browser_on_page() in an assertion unless you are 100% certain you're already on the page
* if an action takes you to another page, synchronize with a wait_for_page() for that new page
 2016-10-26 10:09:39 -04:00
Christina Roberts
237c20cb49 Merge pull request #13833 from edx/christina/remove-ignores 
Cleanup a11y ignores/tickets
 2016-10-26 09:52:25 -04:00
Ahsan Ulhaq
49d46edd48 Merge pull request #13799 from edx/ahsan/ECOM-5968-Redirect-parameter-next-login-page-redirect 
parameter next on login page would redirect regardless url safe
 2016-10-26 15:24:08 +05:00
Ibrahim
1459b23456 Edit error message for Username on registration 2016-10-26 14:48:23 +05:00
Ned Batchelder
ab9452434d Merge pull request #13837 from edx/release 
Release to master
 2016-10-26 05:28:04 -04:00
Jesse Zoldak
413cd6e672 Merge pull request #13838 from edx/zoldak/node-options 
Add npm config file with retry options
 2016-10-25 22:40:47 -04:00
Nimisha Asthagiri
4a20370f37 Update CourseGradeFactory.create to be read_only by default 
TNL-5835
 2016-10-25 20:49:43 -04:00
Jesse Zoldak
4ab66c9f2a Add npm config file with retry options 2016-10-25 16:57:08 -04:00
Eric Fischer
a1499e28bb Merge pull request #13766 from edx/efischer/course_grade_update 
Course Grade Update Signal/Task
 2016-10-25 16:39:11 -04:00
Ned Batchelder
afcf89213a Merge pull request #13811 from edx/release-candidate 
Release Candidate rc/2016-10-25
 2016-10-25 16:33:22 -04:00
stu
a5420b11a1 add testing requirements file 2016-10-25 16:29:14 -04:00
cahrens
f399508d46 Fix pylint issue to get under threshold. 2016-10-25 15:24:18 -04:00
Albert St. Aubin
a3459eae6a Updated learner profile to only use the tab panel view when there is accomplishments. 
TNL-5283
 2016-10-25 14:54:11 -04:00