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

11695 Commits

Author SHA1 Message Date
Andy Armstrong
7b5f9b8009 Implement RequireJS Optimizer in the LMS 
TNL-2487
 2015-07-20 13:59:54 -04:00
Max Rothman
80cf4d6ecb Merge pull request #8969 from edx/release-merge-test 
Release merge test
 2015-07-20 10:38:37 -04:00
Matt Drayer
4c0b00f45e Merge pull request #8952 from edx/ziafazal/SOL-1045 
SOL-1045: Enable certificate generation by students for self-paced courses
 2015-07-20 10:22:02 -04:00
Max Rothman
babf2420b3 Fix test failure due to missing settings import 2015-07-20 09:54:00 -04:00
tlindaliu
0c837adfce Refactor auth.has_access to auth.user_has_role 
Change name of method to clear up confusion with the access.has_access method.
 2015-07-19 20:42:29 -04:00
tlindaliu
e0840d2d43 MA-849: Change has_access return type 
New classes for the return type, and changes to the has_access function and tests to make them compatible.
 2015-07-19 20:42:29 -04:00
Max Rothman
c97314413b Merge branch 'release' into release-merge-test 
Conflicts:
	lms/djangoapps/commerce/urls.py
	lms/djangoapps/commerce/views.py
 2015-07-17 17:42:03 -04:00
Adam
2735b2b5bb Revert "Decorated instructor dashboard with sudo_required." 2015-07-17 12:11:38 -04:00
srpearce
b12d3f6303 Merge pull request #8773 from edx/sylvia/docs/DOC-2102 
Sylvia/docs/doc 2102
 2015-07-17 15:42:59 -04:00
Jesse Zoldak
c2b4cf210f Skip test that had a hardcoded date expectation MA-1038 2015-07-17 13:05:58 -04:00
Jesse Zoldak
913a5dfe29 Merge pull request #8943 from edx/zoldak/more-flaky-js 
Disable potentially flaky jasmine tests
 2015-07-17 12:13:38 -04:00
Sylvia Pearce
eea3b31105 Delete white spaces that are causing test failures 2015-07-17 16:12:53 +00:00
Ben McMorran
2cf3390ba8 Merge pull request #8837 from edx/benmcmorran/discussion-caching-3 
TNL-2389 Use discussion id map cache for thread creation and update
 2015-07-17 11:33:02 -04:00
Jesse Zoldak
da68af5c04 Disable potentially flaky jasmine tests SOL-1065 2015-07-17 10:40:08 -04:00
Vedran Karačić
c0de94295a Merge pull request #8953 from edx/vkaracic/TNL-394-additional-testing 
TNL-394: Additional testing
 2015-07-17 16:20:46 +02:00
vkaracic
f5234b1a9b TNL-394: Additional testing 
This is an additional test for:
https://openedx.atlassian.net/browse/TNL-394
to test if the get_user function escapes values correctly.
 2015-07-17 07:28:25 +00:00
Awais Jibran
2d19eafa7c Merge pull request #7404 from edx/waheed/plat407-decorate-instructor-dashboard-with-sudo-required 
Decorated instructor dashboard with sudo_required.
 2015-07-16 21:12:43 +05:00
aamir-khan
d5dda6470e ECOM-1816: added the provider detail on the receipt page. 2015-07-16 18:25:03 +05:00
Zia Fazal
bed7d80777 enable certificate generation for html certificates 
Enable Student-Generated Certificates for HTML certs flow
 2015-07-16 13:32:14 +05:00
Tasawer
1ded8b546c Update code of get_eligibility api. 
ECOM-1858
 2015-07-16 12:52:16 +05:00
Waheed Ahmed
bc052db1ee Added DjangoSudo functionality for instructor dashboard and course team page 2015-07-16 11:14:11 +05:00
Renzo Lucioni
60c818f030 Import missing settings module in tests of commerce views 2015-07-15 19:03:26 -04:00
Sarina Canelake
bb7ba752bd Merge pull request #7322 from edx/sarina/remove-old-analytics-dashboard 
Remove everything gated by ENABLE_INSTRUCTOR_ANALYTICS flag AN-4583
 2015-07-15 16:36:28 -04:00
jsa
7449f68522 Support setting email opt-in in calls to the Otto shim 
XCOM-499
 2015-07-15 16:22:36 -04:00
Renzo Lucioni
d4a5ad4818 Mark basket creation and order retrieval endpoints as v0 
These endpoints are currently for internal use only, but should be versioned nonetheless; Drupal will begin using the basket creation endpoint soon. No functionality has been changed. XCOM-494.
 2015-07-15 16:22:29 -04:00
Clinton Blackburn
6088bc3401 Pulling JWT settings from envs tokens 
XCOM-281
 2015-07-15 16:06:17 -04:00
Sylvia Pearce
d2b6ac84d3 Reorganize and update API documentation 2015-07-15 14:31:02 -04:00
asadiqbal
19d9ccbf67 asadiqbal08/SOL-1050: Support split mongo course id for Twitter sharing URL 2015-07-15 12:22:09 -04:00
Zia Fazal
b5c32ec4f1 ziafazal/SOL-980: Fix error while generating certificates 2015-07-15 12:21:50 -04:00
Sarina Canelake
376fe0a57c Remove outdated Analytics scripts, code, and css 2015-07-15 11:11:10 -04:00
Sarina Canelake
4f2be41a48 Add messaging about Insights to Analytics instructor tab 2015-07-15 11:11:09 -04:00
Sarina Canelake
9b905ae729 Remove everything gated by ENABLE_INSTRUCTOR_ANALYTICS flag 2015-07-15 11:11:09 -04:00
Ben McMorran
d36eb83a03 Add query count tests 2015-07-15 14:56:04 +00:00
asadiqbal
56015fecf3 asadiqbal08/SOL-1046: Convert LinkedIn anchor tag to button 
* remove the onclick event
* add mako check to Javascript handler
 2015-07-15 10:30:35 -04:00
zubair-arbi
10bfcb83a0 add url link for credit checkout page 
ECOM-1524
 2015-07-15 00:31:15 +05:00
Marco Morales
a930fec852 Merge pull request #8812 from edx/marco/UX-384/reminder-icon-change 
UX-384: Improved visual indicator for graded subsections in LMS sidebar
 2015-07-14 14:26:31 -04:00
jsa
afa77f86bf Support setting email opt-in in calls to the Otto shim 
XCOM-499
 2015-07-14 11:28:59 -04:00
Adam
95dbec60bb Merge pull request #8902 from edx/things-to-tack-on-rc 
Things to tack on rc
 2015-07-14 09:26:22 -04:00
frances botsford
2e7da1985a Merge pull request #8321 from edx/frances/lms/user-menu-cleanup 
LMS User menu cleanup
 2015-07-14 09:23:36 -04:00
Marco Morales
493200734e Merge pull request #8296 from edx/marco/find-courses-page/styling-changes 
Styling improvements to openedX search through Find Courses page
 2015-07-14 08:14:35 -04:00
Matt Drayer
d57fd0e47c Merge pull request #8847 from edx/ziafazal/SOL-1021 
ziafazal/SOL-1021: Create Analytics events for certificate actions
 2015-07-14 07:58:55 -04:00
vkaracic
3ec3cf64cc Added sanitization of id names 
This is a fix for
https://openedx.atlassian.net/browse/TNL-394
escaped all escapable characters in id name strings.
 2015-07-14 08:31:19 +00:00
Zia Fazal
57f1dc92b3 ziafazal/SOL-1021: Capture additional certificate configuration events 
* Changed certificate_id to configuration_id
* Fix for acceptance test faiiure
* Add waits to bok choy tests

fix for flaky test
 2015-07-14 11:12:09 +05:00
Marco Morales
b30c2f3bd0 updated graded icon indicator to use data-tooltip, font-awesome, plus hides it from screenreaders 2015-07-13 22:31:20 -04:00
Sven Marnach
3d7246ecc8 Allow masquerading as a specific user different from the logged in user. 2015-07-13 18:55:45 -07:00
Sarina Canelake
49f78b4742 Remove logging-not-lazy Pylint violations 2015-07-13 17:34:54 -04:00
Sarina Canelake
39d3537410 Pylint logging-format-interpolation: Convert logging calls to use %s formatting 2015-07-13 17:33:29 -04:00
Sarina Canelake
8283c07e32 Remove superfluous-parens pylint violations 
Skipped 'print' statement violations, as print() is Py3k syntax.
 2015-07-13 17:33:28 -04:00
Sarina Canelake
22bbdacee9 Convert Meta classes to new-style classes 2015-07-13 17:33:26 -04:00
Sarina Canelake
b41e70f541 Remove Pylint violations deprecated-pragma, bad-option-value 2015-07-13 17:33:26 -04:00