Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,917 Commits 1 Branch 0 Tags
54f62a85f6164545151c32a063916cbeec94de46
Commit Graph

30917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Zoldak
bb4e57762f Decorate flaky test SOL-336 2015-03-20 10:13:11 -04:00
Brian Talbot
f4c3a732be certificates: revising compiled CSS paths to match existing LMS patterns 2015-03-20 09:54:58 -04:00
David Baumgold
f30d2a1516 Update path.py to version 7.2 
Due to this warning when trying to install requirements from github:

DEPRECATION: Uninstalling a distutils installed project (path.py) has been deprecated and will be removed in a future version. This is due to the fact that uninstalling a distutils project will only partially uninstall the project.
 2015-03-20 09:51:05 -04:00
Ahsan Ulhaq
60cb7cf33a Merge pull request #7325 from edx/ahsan/tnl-1693-standarize-button-on-assessment-types 
Standrize buttons in assessment problems
 2015-03-20 18:50:27 +05:00
Sarina Canelake
90a0459e50 Merge pull request #7380 from OmarIthawi/edraak/platform-name-in-password-reset-confirm 
Keep platform_name in the password_reset_confirm.html always TNL-1654
 2015-03-20 09:14:40 -04:00
Shrhawk
1e73c272f5 Merge pull request #7405 from edx/shr/bug/PLAT-466-Bad-course-about-page-value-500-error 
handle invalid-key exception for split courses
 2015-03-20 17:57:48 +05:00
Syed Hassan Raza
d17a0c6ad2 handle invalid-key exception for split courses 2015-03-20 16:18:27 +05:00
Martyn James
5d54036090 Fix pylint violation 2015-03-20 10:41:56 +01:00
stv
8838d07fc9 Override COURSE_*_VISIBILITY_PERMISSION from ENV_TOKENS 2015-03-19 21:14:54 -07:00
Dino Cikatic
ee90c5fe36 SOL-217 Remove Google Analytics calls 2015-03-19 21:52:24 +00:00
Martyn James
dd34bada71 pylinty minty 2015-03-19 21:52:24 +00:00
Dino Cikatic
2117d168a4 SOL-217 Adding basic analytics events logging for courseware search and index 2015-03-19 21:52:23 +00:00
Mark Sadecki
989a8a0679 new css to go with DOM changes 2015-03-19 17:32:10 -04:00
Adam Palay
35e4e9d81f resolve more merge conflicts 2015-03-19 17:22:29 -04:00
Adam Palay
b5c4b6388c Merge remote-tracking branch 'origin/release' into adam/merge-release-to-master 
Conflicts:
	common/djangoapps/cors_csrf/helpers.py
	common/djangoapps/enrollment/views.py
	lms/djangoapps/commerce/constants.py
	lms/djangoapps/commerce/tests.py
	lms/djangoapps/commerce/views.py
 2015-03-19 16:30:46 -04:00
Mark Sadecki
8a8e1d06e4 this actually drops the element selector from the CSS 2015-03-19 15:32:55 -04:00
Mark Sadecki
1cf7ccc334 dropped element selector in CSS and test file 2015-03-19 15:31:30 -04:00
Adam
7abcfddf51 Merge pull request #7421 from edx/hotfix/2015-03-19 
Hotfix/2015 03 19
 2015-03-19 14:54:00 -04:00
Martyn James
10ca5affcf Updating edx-search hash to include bugfixes for SOL-289 and SOL-217 2015-03-19 12:05:50 -04:00
Carol Tong
d182b8db99 Merge pull request #7411 from edx/carol/doc/ContentLibHelpLinks 
Content Libraries: Fix Help links in Import/Export templates
 2015-03-19 11:21:14 -04:00
Carol Tong
4e9e11e4c0 Add Help links and targets for import/export libraries 2015-03-19 10:11:16 -04:00
Martyn James
7c942dddb5 Merge pull request #7219 from edx/mjames/SOL-289 
Addresses problem with 'up' and 'down' errors within SOL-289
 2015-03-19 09:51:36 -04:00
Carol Tong
d413e71b88 Merge pull request #7419 from edx/carol/doc/ContentLibUserAccessHelpLinks 
DOC: ContentLib Help links for user access
 2015-03-19 09:02:05 -04:00
Clinton Blackburn
524840aa80 Merge pull request #7394 from edx/clintonb/fix-existing-enrollment 
Bypassing E-Commerce API if user is enrolled in course
 2015-03-19 08:53:46 -04:00
alawibaba
9b79797b28 Created performance logging endpoint, changed CDN experiment to point to it. 2015-03-19 07:53:01 -04:00
zubair-arbi
ae2480e038 update instructor grade task state and increase logging 2015-03-19 07:52:22 -04:00
Waqas Khalid
daadfeab66 View discussion of user profile return 404 
If you open a particular user profile page there
will be discussion where that user has collaborated.
If you click on view discussion link it would return
404 becuase of the missing discussion id in the link.
I fixed it by adding the thread commentable id to link
instead of getting the id from discussion object.

TNL-1717
 2015-03-19 15:33:45 +05:00
Clinton Blackburn
2e2fb47d59 Bypassing E-Commerce API if user is enrolled in course 
If a user is already enrolled in a course, the API is bypassed and a 409 status is returned.
 2015-03-18 23:21:18 -04:00
Ned Batchelder
a64d926845 Merge pull request #7399 from edx/ned/plat-462 
Make sure slashes in JSON content don't end script tags. PLAT-462
 2015-03-18 22:47:50 -04:00
Ned Batchelder
6928035cd1 Make sure slashes in JSON content don't end script tags. PLAT-462 
The string "</script>" in JSON data would end the script element we're
embedding the data in.  To make sure the data doesn't disrupt the
script, we escape the slash as \/ .
 2015-03-18 21:55:36 -04:00
brianhw
e03813dabb Merge pull request #7414 from edx/release-merge-20150317 
Merge release to master for 20150317 release.
 2015-03-18 21:39:42 -04:00
Brian Wilson
243e2660b0 Merge release to master for 20150317 release. 2015-03-18 18:48:56 -04:00
Will Daly
4860837eae Merge pull request #7418 from edx/sanchez/revert_201_status_for_enrollments 
Reverting the change to add a 201_CREATED status to the enrollment API.
 2015-03-18 18:30:29 -04:00
Carol Tong
e749f4500b Update template and config.ini files for library user help 2015-03-18 17:43:54 -04:00
Ned Batchelder
6ac1b82bb2 Merge pull request #7356 from edx/ned/fix-or-remove-teardown 
Fix or remove tearDown methods that don't use super.
 2015-03-18 17:36:17 -04:00
Nimisha Asthagiri
d0624b272f Merge pull request #7298 from edx/mobile/ab-test-support 
MA-7: A/B test and cohorted content support
 2015-03-18 16:33:01 -04:00
Stephen Sanchez
4acfbbdf21 Reverting the change to add a 201_CREATED status to the enrollment API. 2015-03-18 20:31:58 +00:00
Mark Sadecki
57d7973cb7 adds additional context for screen reader users and correct heading order to be more logical 2015-03-18 15:39:45 -04:00
Chris
551c382238 Merge pull request #7328 from edx/clrux/ux-1642-logistration-updates 
UX-1642 Making visual tweaks and enhancements to the logistration form
 2015-03-18 15:35:02 -04:00
David Ormsbee
ff77505f42 Add caching to partitions_service. 2015-03-18 14:55:16 -04:00
Nimisha Asthagiri
d7386ecc87 Use depth=0 for call to cache_for_descriptor_descendents. 2015-03-18 14:55:15 -04:00
Nimisha Asthagiri
eca523e01e Mobile API MA-7: Support A/B test and cohorted content 2015-03-18 14:55:15 -04:00
Nimisha Asthagiri
091d6aebe9 Mobile API: Modularize VideoOutline code 2015-03-18 14:55:15 -04:00
Max Rothman
40dd4f1fcb Merge pull request #7408 from edx/max/update-newrelic 
Update newrelic agent for monitoring celery tasks
 2015-03-18 14:52:32 -04:00
Stephen Sanchez
af4d288f95 Merge pull request #7377 from edx/sanchez/enrollment_api_course_modes 
XCOM-45 Enrollment API supports creating modes other than honor.
 2015-03-18 14:30:55 -04:00
Will Daly
f0b4492065 Merge pull request #7381 from edx/will/ecom-601 
Copy changes to the activation email
 2015-03-18 14:30:32 -04:00
Will Daly
4d2969b0a8 Merge pull request #7312 from edx/will/quiet-cors-middleware-logging 
Downgrade CORS middleware warning to info
 2015-03-18 14:30:05 -04:00
Chris Rodriguez
026501aec9 Fix 2015-03-18 14:21:21 -04:00
Will Daly
c37dc913a0 Copy changes to the activation email 2015-03-18 13:45:15 -04:00
Brian Talbot
6e3d5568bd Merge pull request #7345 from edx/talbs/certs-webview-uicleanup 
Certificates: Revising Web Templates + UI for Open edX Use
 2015-03-18 13:16:24 -04:00