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

8980 Commits

Author SHA1 Message Date
Adam Palay
7f4da14185 Add middleware optionally to catch unenrolled students who fail has_access (TNL-286) 2014-09-18 11:35:17 -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
Carlos Andrés Rocha
8857509b2d Add edX OAuth2 provider with OpenID Connect support 2014-09-17 11:36:06 -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
Adam Palay
d4b6780751 rename footer files for wiki 2014-09-16 16:28:16 -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
chrisndodge
7225420fa0 Merge pull request #5170 from edx/muhhshoaib/Ex-79-BUG-if-no-coupon-code-defined-registration-codes-modal-dialog-box-does-not-appear 
Ex-79 Bug Fixed. If there is no coupon code, 'Generate Registration Codes' modal dialog does not appear.
 2014-09-14 21:29:27 -04:00
lduarte1991
a1541b61f2 [TNL-288] Annotation Tools: Give staff/instructors full permissions 
- changed role to 'in' condition

 - fixed comment about get_real_user

 - Adding Tests and Fixing Pep8 Violations
 2014-09-13 13:42:06 -04:00
Kevin Luo
f832e4f294 Convert unicode emails to byte strings for CSV grade reports 2014-09-12 17:50:30 -07:00
Renzo Lucioni
9239253614 Remove Django Waffle 2014-09-12 16:22:03 -04: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
698c9b5914 Merge pull request #5184 from edx/renzo/upsell-tracking 
Add tracking on expand of upsell message
 2014-09-12 14:21:32 -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
Renzo Lucioni
22f58be4aa Add tracking on expand of upsell message 2014-09-12 11:58:24 -04:00
Piotr Mitros
af12acc904 Clean up conventions for underscores vs. dashes in config setting. 2014-09-12 11:52:11 -04:00
Anton Stupak
535e6e4f57 Merge pull request #4983 from lduarte1991/lduarte-harvardx-pr20 
Annotation Tools: Turn off Private/Public option and add missing css group to MyNotes
 2014-09-12 16:24:44 +03:00
Muhammad Shoaib
4ecb846052 Ex-79 Bug Fixed. If there is no coupon code, 'Generate Registration Codes' modal dialog does not appear 2014-09-12 12:39:16 +05: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
Adam
d9567c3537 Merge pull request #5178 from edx/release 
Release
 2014-09-11 15:15:13 -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
Christina Roberts
610710cff8 Merge pull request #5133 from edx/christina/cohorts-api 
Create auto cohorts when list_cohorts is called.
 2014-09-11 14:30:45 -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
Nimisha Asthagiri
dedd88ccf4 Merge pull request #4977 from edx/split/paver 
Split/paver LMS-11211
 2014-09-11 12:28:41 -04:00
Brian Talbot
35d92f42c8 Merge pull request #4963 from edx/talbs/platform-footer 
LMS: edX-centric  New Footer Style/Markup clean-up
 2014-09-11 11:23:48 -04:00
Usman Khalid
fc895fe8bf Moved imports to startup.py. 2014-09-11 20:14:37 +05:00
Nimisha Asthagiri
7637f063e9 LMS-11371 Fix register bug - encoding of course_id. 2014-09-11 10:53:05 -04:00
Nimisha Asthagiri
4d36276573 LMS-11297 BokChoy and Acceptance tests configure default_store with update_module_store_settings. 2014-09-11 10:48:08 -04:00
Calen Pennington
b033a214cf Merge pull request #5131 from cpennington/split/prod-import-export-tests 
Split-mongo block uniqueness constraint [LMS-11364]
 2014-09-11 10:43:43 -04:00
Don Mitchell
4ebe26696e Merge branch 'release' 
Conflicts:
	common/djangoapps/student/views.py
 2014-09-11 10:31:53 -04:00
Waheed Ahmed
02a2851019 Merge pull request #4329 from edx/waheed/lms6492-fix-404-when-users-last-visted-subsection-unpublished 
Fixed 404 on courseware when users last visited subsection becomes unpublished.
 2014-09-11 19:24:16 +05:00
Will Daly
f6bcf84edb Merge pull request #5167 from edx/will/third-party-acceptance 
Enable third party auth in LMS acceptance tests
 2014-09-11 09:55:08 -04:00
Calen Pennington
7b81dcc3ea Make split_mongo assert block identity uniqueness only over (block_type, block_id) tuples [LMS-11364] 2014-09-11 09:38:13 -04:00