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

9009 Commits

Author SHA1 Message Date
Carlos Andrés Rocha
874c338175 Merge pull request #5316 from rocha/use-default-locale-in-openid-claim 
Use default locale to OpenID profile claims.
 2014-09-22 17:36:26 -04:00
Carlos Andrés Rocha
c35f4bf794 Merge pull request #5314 from rocha/configurable-oauth-enforce-secure 
Allow SSL enforcement for OAuth2 provider to be configurable
 2014-09-22 17:35:43 -04:00
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
e04c6c2a48 Merge pull request #5315 from rocha/fix-fullname-in-oauth2-handler 
Return OpenID Connect user name from user profile.
 2014-09-22 15:14:15 -04:00
Adam
ef525f288f Merge pull request #5295 from edx/adam/add-simple-help-modal-test 
add simple help-modal-test
 2014-09-22 13:17:47 -04:00
Carlos Andrés Rocha
19f95f0053 Return OpenID Connect user name from user profile. 2014-09-22 11:34:10 -04:00
Carlos Andrés Rocha
37d604a90f Allow SSL enforcement for OAuth2 provider to be configurable 2014-09-22 10:47:20 -04:00
Adam Palay
5fa38cb59e add simple help-modal-test 2014-09-22 09:34:32 -04:00
Waheed Ahmed
3e64faeaa3 Fixed wiki merge url regex. 
TNL-413
 2014-09-22 15:41:19 +05: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
Renzo Lucioni
135ce24977 Merge pull request #5248 from edx/renzo/cleanup-translated-strings 
Clean up translated strings in registration page, dashboard, and track selection flow
 2014-09-19 12:57:39 -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
Sarina Canelake
196bb3de6b Merge pull request #5275 from stvstnfrd/dashboard/analytics/hr 
Move <HR> inside of template conditional
 2014-09-18 10:12:57 -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
stv
be8e01e5fe Move <HR> inside of template conditional 
Otherwise, if `settings.ENABLE_INSTRUCTOR_ANALYTICS` is set to `False`,
two horizontal rules are rendered consecutively.

The <HR> has also been indented to align with surrounding tags.
 2014-09-17 18:03:23 -07:00
Renzo Lucioni
c78594b286 Restore copy originally present on the registration page 2014-09-17 16:53:25 -04:00
Renzo Lucioni
66187ab907 Clean up translated strings in registration page, dashboard, and track selection flow 2014-09-17 14:38:24 -04:00
Carlos Andrés Rocha
35fdcf43b7 Merge pull request #5263 from rocha/rc-oauth2-provider 
Add edX OAuth2 provider with OpenID Connect support
 2014-09-17 13:25:47 -04: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
Chris Dodge
8e1d0f7f23 For microsites, since we don't have a footer override yet for django templates, remove the footer all together 2014-09-17 10:52:04 -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
Adam Palay
d4b6780751 rename footer files for wiki 2014-09-16 16:28:16 -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
Sarina Canelake
95a9ca131a Merge pull request #5148 from lduarte1991/lduarte-harvardx-pr24 
Annotation Tools: Give staff/instructors full permissions (bug fix)
 2014-09-15 14:25:19 -04: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
Piotr Mitros
78ed5c2c54 Merge pull request #5194 from edx/pmitros/pyfs-convention-cleanup 
Clean up conventions for underscores vs. dashes in config setting.
 2014-09-15 12:08:20 -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
Renzo Lucioni
f896d64ac0 Merge pull request #5195 from edx/renzo/remove-waffle 
Remove Django Waffle
 2014-09-15 09:43:22 -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