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

14265 Commits

Author SHA1 Message Date
Adam Palay
cc48800d54 add logging for orders when 'purchase' is called on them multiple times ECOM-630 2014-11-10 12:40:38 -05:00
chrisndodge
6df676b9b8 Merge pull request #5712 from edx/cdodge/change-shoppingcart-context-processor-to-be-microsite-aware 
allow for overrides on ENABLE_PAID_COURSE_REIGSTRATIONS via mircosites
 2014-11-10 09:08:16 -05:00
Chris Dodge
3d955523d1 allow for overrides on ENABLE_PAID_COURSE_REIGSTRATIONS via mircosites 2014-11-09 21:05:45 -05:00
chrisndodge
c4a957c159 Merge pull request #5876 from edx/cdodge/catalog-visibility 
Add new course_module field which describes what the catalog visibility ...
 2014-11-09 21:02:49 -05:00
Chris Dodge
3c36f7cbad Add new course_module field which describes what the catalog visibility should be (both, about, none) 2014-11-09 10:36:00 -05:00
Carlos Andrés Rocha
1b858e5497 Merge pull request #5749 from rocha/cache-oauth2-handler-course-values 
Cache user course privileges during OpenID Connect authorization.
 2014-11-07 14:38:09 -05:00
Will Daly
578c04f62f Put logistration page behind a feature flag 2014-11-07 13:05:17 -05:00
Adam
893cb9c21a Merge pull request #5873 from edx/release 
Release
 2014-11-06 16:53:05 -05:00
Christina Roberts
fd587b976c Merge pull request #5710 from edx/christina/general-component-errors 
Support validation messages for any xblock (on container page).
 2014-11-06 16:47:49 -05:00
cahrens
08ce09bde7 Display validation messages for any xblock on the container page. 
TNL-683
 2014-11-06 15:48:55 -05:00
Don Mitchell
e4e45018fe Merge pull request #5871 from edx/dhm/remove_test 
Remove multi-threading test as unnecessary and flakey
 2014-11-06 14:21:13 -05:00
Carlos Andrés Rocha
fac73e88d0 Cache user course privileges during OpenID Connect authorization. 2014-11-06 13:46:32 -05:00
Dennis Jen
d3e051ce29 fixed quaility errors in instructor_dashboard.py, moved test_instructor_dashboard under tests/views directory 2014-11-06 13:42:00 -05:00
Don Mitchell
396a8aca07 Remove multi-threading test as unnecessary and flakey 
also fix other users of check_mongo_calls to use None if they don't care about sends
PLAT-239
 2014-11-06 13:22:48 -05:00
Diana Huang
e932820ae1 Add a created field to OrderItem. 2014-11-06 11:29:31 -05:00
Adam Palay
31b200cdcb add logging for cybersource errors; fix minor unicode bug 2014-11-06 10:25:42 -05:00
Nimisha Asthagiri
82a9b84f34 Fix broken test (due to merge conflict). 2014-11-06 09:19:40 -05:00
Ben Patterson
bba4014d1e Skip test broken on master. Sent to team for review. 2014-11-06 08:56:55 -05:00
Dennis Jen
66b3e3828f added tests for instructor_dashboard.py, added docstring for _is_small_course, removed check for settings.ANALYTICS_DASHBOARD_URL when creating dashboard link 2014-11-05 17:14:33 -05:00
Akiva Leffert
58d84e4747 Merge pull request #5798 from edx/aleffert/mobile-beta-enrollments-access 
https://openedx.atlassian.net/browse/MA-76
 2014-11-05 14:39:55 -05:00
Akiva Leffert
ffd6d89451 Update course enrollments API to allow beta users to see a course. 
Also adds me as an author
JIRA: https://openedx.atlassian.net/browse/MA-76
 2014-11-05 13:04:51 -05:00
Daniel Friedman
eaa63da463 Merge branch 'release' 2014-11-05 12:10:55 -05:00
Muhammad Ammar
e8e7e78e09 Merge pull request #5655 from edx/ammar/unit-improvements 
Unit Test Improvements
 2014-11-05 19:55:39 +05:00
Renzo Lucioni
d9d09e2b4b Fix track selection tests 2014-11-04 15:25:38 -05:00
Renzo Lucioni
5d110273a9 Merge pull request #5834 from edx/renzo/fix-track-selection-copy 
Fix track selection header copy
 2014-11-04 14:03:05 -05:00
Renzo Lucioni
17a3f556fb Fix track selection header copy 2014-11-04 13:54:31 -05:00
Dennis Jen
b27401554c Feature flagged enrollment counts on instructor dashboard. 
* enrollments counts removed from legacy dashboard
 2014-11-04 12:56:53 -05:00
Diana Huang
a971e71792 Merge branch 'will/logistration-third-party-auth-fixes' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/course_modes/views.py
 2014-11-04 10:50:09 -05:00
Sarina Canelake
bc20ccb332 Merge pull request #5828 from edx/sarina/moar-pep8 
Remove more pep8 violations
 2014-11-04 08:58:17 -05:00
Sarina Canelake
725e4908e3 Remove more pep8 violations 2014-11-04 07:37:41 -05:00
Clinton Blackburn
22952af61f Merge pull request #5782 from edx/remove-analytics-demographics 
Updates to Demographics Display
 2014-11-03 10:07:31 -05:00
Carlos Andrés Rocha
6ad235f5db Ignore errors during cleanup of course export command. 2014-10-31 15:20:17 -04:00
Martyn James
9f3b9c7ba3 Merge pull request #5818 from edx/release 
Merging latest updates to release
 2014-10-31 14:49:04 -04:00
Calen Pennington
b4562ffe6b Merge pull request #5783 from cpennington/proxy-through-module-system-to-descriptor-system 
Fix PLAT-191
 2014-10-31 09:31:13 -04:00
muhammad-ammar
fcaa783e43 Unit Test Improvements 
TE-489
 2014-10-31 11:55:13 +00:00
Jim
3ceb0e5c6a Commenting out flaky string input test case 2014-10-30 14:33:36 -07:00
Renzo Lucioni
4157e5c0f6 i18n logistration 2014-10-30 14:09:15 -04:00
Chris Dodge
fea9432b50 Add the ability for course staff to specify a Survey and make it required so that a student must fill it out before starting the course 2014-10-30 13:11:02 -04:00
Daniel Friedman
8b73de9123 Merge pull request #5728 from edx/dan-f/grade-export-split-test 
Verify grade export works for problems in split tests
 2014-10-30 11:04:54 -04:00
Daniel Friedman
9bf22ea9fe Verify grade export works for problems in split tests 
TNL-41
 2014-10-30 09:58:16 -04:00
Nimisha Asthagiri
994ac6da6d Fixes for MOB-836 and MOB-766 and MA-96. 2014-10-29 22:06:42 -04:00
Martyn James
f61b968e01 Merge branch 'release' 2014-10-29 15:36:26 -04:00
Calen Pennington
34d09085ab Remove proxying of resources_fs, and add a unittest that exposes the problem 
[PLAT-191]
 2014-10-29 13:48:57 -04:00
Clinton Blackburn
13579ca9a8 Updates to Demographics Display 
- Gating on feature enabled for Open edX users
- If feature disabled and Insights URL is set, displaying message pointing users to Insights
 2014-10-29 12:31:44 -04:00
Clinton Blackburn
a3171eb8d8 Removed Analytics API Client 
Instructors should use Insights instead.
 2014-10-29 10:25:18 -04:00
Will Daly
c553a47c26 Update third party auth on the logistration form 2014-10-28 17:00:48 -04:00
Diana Huang
13986d8475 Update tests to match new text. 2014-10-28 16:28:58 -04:00
Will Daly
48bc4776be Merge branch 'will/third-party-auth-fixes' into will/combine-reg-login-form 
Conflicts:
	common/djangoapps/third_party_auth/__init__.py
	common/djangoapps/third_party_auth/pipeline.py
 2014-10-28 15:16:27 -04:00
Diana Huang
9f441d22b0 Merge pull request #5745 from edx/will/third-party-auth-fixes 
Third Party Auth Fixes
 2014-10-28 13:06:40 -04:00
Diana Huang
92b0bf10c1 Update tests to match new text. 2014-10-28 11:58:41 -04:00