Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,841 Commits 1 Branch 0 Tags
5500cc68164dbbca5fcff567cdd75165bec0da87
Commit Graph

4108 Commits

Author SHA1 Message Date
Carlos Andrés Rocha
5500cc6816 Use default locale to OpenID profile claims. 
If the user has not selected a default locale, then return the default one.
 2014-09-22 15:19:40 -04:00
Carlos Andrés Rocha
19f95f0053 Return OpenID Connect user name from user profile. 2014-09-22 11:34:10 -04:00
Waheed Ahmed
3c8eacd440 Disabled student view if course is not yet released for students. 
LMS-6617
 2014-09-22 12:50:46 +05:00
John Eskew
4aa2dc5289 Merge pull request #5302 from edx/release 
Release merge - post hotfix-2014-09-19-1
 2014-09-19 14:31:16 -04:00
Clinton Blackburn
8705694743 Hiding Insights link for non-staff users 2014-09-19 10:47:54 -04:00
Adam Palay
ac862b7a97 only load tabs if user is enrolled in course (TNL-286) 
add tests for static tabs
 2014-09-19 10:19:23 -04:00
Ned Batchelder
10bd2b003f Merge pull request #5129 from edx/ned/python-zip-assets 
Python zip file importable from an asset
 2014-09-18 19:31:47 -04:00
Ned Batchelder
616bbbab4e Importable python_lib.zip assets 
Lots of plumbing to allow an asset named python_lib.zip to be imported
by jailed Python code.

This function can find the "python_lib.zip" asset, and is passed down
through ModuleSystem and LoncapaSystem so that capa problems have access
to the zipfile.
 2014-09-18 17:59:12 -04:00
John Eskew
9e830d08c4 Merge branch 'release' into 'master' after successful rc/2014-09-17 deploy. 2014-09-18 12:27:32 -04:00
Adam Palay
1b06edb6ff display banner on course info page if user is not enrolled (TNL-286) 
write failing tests for info page banner
 2014-09-18 11:35:18 -04:00
Adam Palay
e569e090c2 redirect users from about page to info page when there is a marketing site (TNL-286) 2014-09-18 11:35:17 -04:00
Adam Palay
7f4da14185 Add middleware optionally to catch unenrolled students who fail has_access (TNL-286) 2014-09-18 11:35:17 -04:00
Usman Khalid
7bb0d5f5d8 Merge pull request #5174 from edx/usman/tnl-208-instructor-permissions 
Added instructor persmission checking to _has_access_error_desc() in courseware.access
 2014-09-18 15:43:58 +05:00
Sarina Canelake
1152555614 Merge pull request #5253 from mitocw/bdero/fix-psychometrics-opaque-keys 
Fixed problems with psychometrics (Opaque Keys)
 2014-09-17 12:50:43 -04:00
Carlos Andrés Rocha
8857509b2d Add edX OAuth2 provider with OpenID Connect support 2014-09-17 11:36:06 -04:00
Brandon DeRosier
efa4400342 Fixed problems with psychometrics 
- Update key comparisons for Opaque Keys
- Search for 'problem_check' instead of 'save_problem_check' when
  filtering TrackingLogs.
 2014-09-17 11:25:00 -04:00
Carlos Andrés Rocha
72651e64ad Modify notification_pref tests to avoid changes to module store 
Calling the client root was causing the module store to be modified,
affecting test in other Django applications that rely on the default
state of the module store.
 2014-09-17 11:16:55 -04:00
Carlos Andrés Rocha
276ea2fe84 Fix tests not using ModuleStoreTestCase 
Some tests test were using `CourseFactory` buy not deriving from
`ModuleStoreTestCase`, introducing a course leaks that broke other
unrelated tests.
 2014-09-17 11:16:55 -04:00
Ned Batchelder
2d05ffacdf Revert "username and email request for lti module" 
This reverts commit 3f159ea52b.
 2014-09-17 07:24:52 -04:00
Ned Batchelder
1a7009ec1f Merge pull request #5251 from edx/ned/revert-lti-username-email 
Revert "username and email request for lti module"
 2014-09-17 06:59:42 -04:00
Ned Batchelder
4edeeb72c2 Revert "username and email request for lti module" 
This reverts commit 3f159ea52b.
 2014-09-16 16:13:41 -04:00
chrisndodge
7593ad3a01 Merge pull request #5050 from edx/muhhshoaib/Ex-74-registration-code-redemption 
Ex-74 Registration Code redemption
 2014-09-16 11:58:42 -04:00
chrisndodge
9d683ed171 Merge pull request #5245 from edx/asadiqbal08/Fix_production_issue 
EX-81 / Ex-84 changes
 2014-09-16 11:17:40 -04:00
asadiqbal08
47cd0f3e62 EX-81 / Ex-84 changes 2014-09-16 18:43:48 +05:00
Muhammad Shoaib
739d2f0906 Ex-74 Registration Code redemption 
fix the translation issues

added a check if a user is already registered in a course. Changed the messages

added course depth=0 and removed pep8 violations
 2014-09-16 07:48:21 +00:00
chrisndodge
23531e8966 Merge pull request #5220 from edx/cdodge/dont-redirect-to-dashboard-when-having-and-empty-dashboard 
only redirect to dashboard if user has course enrollments, otherwise rem...
 2014-09-15 22:06:13 -04:00
Chris Dodge
50cdd2b087 only redirect to dashboard if user has course enrollments, otherwise remain on the course catalog page (aka homepage or root) 
update lettuce test to match new expected behavior

add Jason's feedback

only apply new redirect logic for microsites

switch to use a feature flag to determine whether to support redirect behavior
 2014-09-15 20:52:44 -04:00
Jason Bau
eab1d739be Merge pull request #5203 from Stanford-Online/kluo/fix-unicode-email 
Convert unicode emails to byte strings for CSV grade reports
 2014-09-15 13:32:55 -07:00
Kevin Luo
7627d34339 Remove unicode conversion of email since it should always be unicode 2014-09-15 10:58:09 -07:00
Jesse Zoldak
76517de87d Disable intermittently failing annotation acceptance test TNL-353 2014-09-15 12:23:47 -04:00
Renzo Lucioni
1fbccdaa20 Merge pull request #5183 from edx/renzo/new-audit-track-selection 
Prepare track selection page for new audit track
 2014-09-15 10:09:26 -04:00
chrisndodge
0bb4ddef32 Merge pull request #5209 from edx/cdodge/allow-to-pass-override-cancel-URL 
pass along an extra parameter to CyberSource to sepcify a callback URL i...
 2014-09-15 09:34:29 -04:00
Kevin Luo
f832e4f294 Convert unicode emails to byte strings for CSV grade reports 2014-09-12 17:50:30 -07:00
Jim Abramson
9fc4fbc12a Merge pull request #5172 from edx/jsa/tnl24 
test that group_id attribute is present and correct in LMS responses
 2014-09-12 15:58:50 -04:00
Renzo Lucioni
cc6e63dd22 Prepare track selection page for new audit track 2014-09-12 13:58:13 -04:00
jsa
d3d4d33064 Ensure group info is present in LMS responses. 
TNL-24
 2014-09-12 13:47:05 -04:00
Chris Dodge
68cdf3a59d pass along an extra parameter to CyberSource to sepcify a callback URL if the user clicks cancel 
typo
 2014-09-11 15:38:28 -04:00
Andy Armstrong
82675b2baa Merge pull request #5176 from edx/andya/lms-ux-reference-templates 
Add support for UX reference templates in LMS
 2014-09-11 14:32:25 -04:00
Andy Armstrong
7683cba2c3 Add support for UX reference templates in LMS 2014-09-11 13:52:48 -04:00
cahrens
020094b8fb Create auto cohorts when list_cohorts is called and return number of users per cohort. 
TNL-186
 2014-09-11 13:51:34 -04:00
Usman Khalid
660cdf79c0 Added instructor persmission to _has_access_error_desc() in courseware.access. 
TNL-208
 2014-09-11 19:17:57 +05:00
Waheed Ahmed
5fd1ade766 Fixed 404 on courseware when users last visited subsection becomes unpublished. 
LMS-6492
 2014-09-11 18:35:58 +05:00
Daniel Friedman
95a06d92ae Merge pull request #5088 from edx/dan-f/test-lms-passes-group-id 
Ensure LMS passes correct group_id when querying content
 2014-09-10 17:18:28 -04:00
Daniel Friedman
4d9517b456 Ensure LMS passes correct group_id when querying content 2014-09-10 16:43:06 -04:00
Don Mitchell
8f90e39626 Merge pull request #5149 from edx/mongo/bulk_operation 
Generalize bulk_operations logic
 2014-09-10 16:16:40 -04:00
Don Mitchell
4faed64859 Generalize bulk_operations logic 
LMS-11366
 2014-09-10 15:35:28 -04:00
Ben Patterson
e05f7770e3 Merge pull request #5161 from edx/benp/solano2-lms-failures 
Acceptance tests (lettuce): hardcode sleeps to fix flakiness
 2014-09-10 15:32:59 -04:00
Clinton Blackburn
9f8e2cf5aa Merge pull request #5132 from edx/insights-message-update 
Updated Analytics Dashboard Message
 2014-09-10 15:11:59 -04:00
Diana Huang
484f13c3cf Merge pull request #5154 from edx/diana/pass-along-course-id 
Pass along course id to CyberSource
 2014-09-10 14:58:26 -04:00
Ben Patterson
dc75f6870a Acceptance tests (lettuce): hardcode sleeps to fix flakiness 
This is a quick fix (because the long fix was taking far too long
due to animation). The truer fix is to port these tests to bok-choy.
 2014-09-10 13:44:49 -04:00