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
Ali Mohammad
54f62a85f6 Merge pull request #8224 from Stanford-Online/kluo/course-creation-after-deletion 
Allow course creation after deletion at same URL
 2015-06-16 11:24:50 -04:00
chrisndodge
fcc97a3f76 Merge pull request #8478 from edx/afzaledx/MAYN-78 
MAYN-78 Extend Coupon/Discount Reports
 2015-06-16 10:43:16 -04:00
Matt Drayer
5d2ef56b68 Merge pull request #8520 from edx/ziafazal/SOL-978 
remove in-memory files
 2015-06-16 10:29:26 -04:00
Afzal Wali
ac72e26256 Fixed the empty list price issue. 
Added columns to the CC purchases report. (added Qty and Total Discount. Moved the Total Amount to the last index).
Coupon code report.
 2015-06-16 17:46:05 +05:00
Ahsan Ulhaq
0d961d5cb8 Merge pull request #8362 from edx/ahsan/ECOM-1523-Credit-Eligibility-Progress-page-display 
Credit Eligibility Progress page display
 2015-06-16 17:02:28 +05:00
Ahsan Ulhaq
d35b652843 Display Eligibility table on progress page 
1-Adding basic html for displaying eligibility table
2-Updated Eligibility Requirements Dynamically

ECOM-1523
 2015-06-16 16:19:33 +05:00
Zia Fazal
ed434c55d1 remove in-memory files 
no need to create zero by in memory images

added contents to test upload files
 2015-06-16 14:14:15 +05:00
Ahsan Ulhaq
cc007d6537 Merge pull request #8497 from edx/ahsan/ECOM-1719-LMS-Modification-enrollment-API 
LMS: Modification in enrollment API
 2015-06-16 12:02:15 +05:00
Ahsan Ulhaq
20e6c7625c LMS: Modification in enrollment API 
Added CourseEnrollmentAttribute model

ECOM-1719
 2015-06-16 10:39:04 +05:00
Greg Price
5318f21e77 Merge pull request #8485 from edx/gprice/discussion-api-endorse 
Add comment endorsement to discussion API
 2015-06-15 17:10:05 -04:00
Matt Drayer
c3b78ea90a Merge pull request #8448 from edx/ziafazal/SOL-886 
certificates event tracking SOL-886
 2015-06-15 15:09:35 -04:00
Andy Armstrong
c28003b50d Merge pull request #8416 from edx/andya/common-list-component 
Create a common paginated list view
 2015-06-15 14:55:20 -04:00
Greg Price
439f72f918 Merge pull request #8524 from edx/gprice/discussion-api-parent-id-fix 
Fix bug in discussion API comment update
 2015-06-15 14:49:53 -04:00
cahrens
5fbad148c9 Jasmine test runner for files in common using RequireJS. 2015-06-15 13:51:16 -04:00
cahrens
4c39132f70 Correct issue for RequireJS optimizer. 2015-06-15 13:51:15 -04:00
Andy Armstrong
41208c928b Convert to RequireJS text for templates 2015-06-15 13:51:15 -04:00
Andy Armstrong
1689004189 Create a common paginated list view 
TNL-2384

Refactored Studio's PagingView to use RequireJS Text and moved it
to common so that it can also be used by LMS.
 2015-06-15 13:51:09 -04:00
Will Daly
2175b5baa4 Merge pull request #8509 from edx/will/deprecate-course-about-v0 
Deprecate course details API v0
 2015-06-15 13:14:32 -04:00
Greg Price
3c48585c8e Fix bug in discussion API comment update 
This bug caused any attempt to update a comment with a non-null
parent_id to result in a 500 error without applying the update. The bug
was introduced in commit 2c7590d197.
 2015-06-15 12:20:47 -04:00
Calen Pennington
9821323946 Merge pull request #8504 from cpennington/bdero/ccx-query-tests 
A version of #8260 that is consistent on jenkins and locally
 2015-06-15 11:51:33 -04:00
Sarina Canelake
09425c3d8f Merge pull request #8402 from edx/sarina/annotate-middleware 
Fix dark lang and django.middleware.locale behaviors LOC-72 LOC-85
 2015-06-15 11:29:15 -04:00
Calen Pennington
b06d256f99 Clear all caches before measure FieldOverride performance 2015-06-15 11:10:27 -04:00
Calen Pennington
e4bc328c3a Reduce the number of queries when walking parents in MongoModuleStore by avoiding cache misses on the data due to missing runs 2015-06-15 11:09:43 -04:00
Calen Pennington
67bde5e2e9 Measure XBlock instantiations in FieldOverride performance tests 2015-06-15 11:08:57 -04:00
Calen Pennington
1422db5cb4 Allow check_sum_of_calls to measure methods as well as pure functions 2015-06-15 11:07:53 -04:00
Calen Pennington
5962c4eb8f Better simulate a request happening in the LMS in FieldOverride performance tests 2015-06-15 11:06:45 -04:00
Zia Fazal
6afaa3cce3 certificates event tracking 
some optimisations

refactored code and added created event

added test to make sure generate event is emitted

changes based on feedback on 6/11

added certificate web page and tests

fixed quality violations
 2015-06-15 19:53:47 +05:00
Calen Pennington
7da8eb1fdb Delay constructing the set of mongo calls until they're needed 2015-06-15 09:50:45 -04:00
Calen Pennington
984eb0a436 Use the more abstract api for parsing UsageKeys in mongo/base.py 2015-06-15 09:50:44 -04:00
Calen Pennington
1e0163a27a Make RequestCache.clear_request_cache a classmethod 2015-06-15 09:50:44 -04:00
Brandon DeRosier
5c6ccc8f0b Add CCX SQL query/mongo read tests 2015-06-15 09:50:44 -04:00
Marko Jevtić
410b9282af Merge pull request #8330 from edx/mjevtic/SOL-835 
(SOL-835) Addressing flakiness of the reindexing bokchoy acceptance test
 2015-06-15 15:34:25 +02:00
Sven Marnach
710c211033 Merge pull request #8474 from open-craft/smarnach/hide-discussion-tab 
Add feature flag to allow hiding the discussion tab for individual courses.
 2015-06-14 22:56:19 +02:00
Sven Marnach
0e80f62c63 Add Sven Marnach to the AUTHORS file. 2015-06-14 20:39:32 +02:00
Sven Marnach
52f56ddd37 Add feature flag to allow hiding the discussion tab for individual courses. 2015-06-14 20:36:45 +02:00
Sarina Canelake
ed2f73e6d2 Add i18n regression tests (LOC-72, LOC-85) 2015-06-12 18:14:26 -04:00
Sarina Canelake
7b09ab5e00 dark_lang: only allow released langs in accept header LOC-72, LOC-85 
Only return languages we've actually released LOC-85
Perform fuzzy matching to greedily serve the best released language LOC-72
 2015-06-12 18:14:26 -04:00
Sarina Canelake
e4cd2982d4 Store released dark_lang codes as all lower-case 2015-06-12 18:14:25 -04:00
Sarina Canelake
182beed2b6 Port django.utils.translation.trans_real.parse_accept_lang_header from Django 1.8 
Add to dark_lang middleware
 2015-06-12 18:14:25 -04:00
Sarina Canelake
d312d0e152 Port django.middleware.locale.LocaleMiddleware from Django 1.8 2015-06-12 18:14:24 -04:00
Adam
5ceea7a0a9 Merge pull request #8512 from edx/merge-release-into-master 
Merge release into master
 2015-06-12 17:13:02 -04:00
Adam Palay
b199a72c62 Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	cms/djangoapps/contentstore/views/course.py
 2015-06-12 16:22:06 -04:00
Calen Pennington
83fce4d61f Merge pull request #8395 from jazkarta/ccx-custom-ids 
MIT CCX: Use CCX Keys
 2015-06-12 16:19:12 -04:00
Adam
21e338f743 Merge pull request #8506 from edx/diana/fix-tab-duplication 
Prevent duplication of tabs with different names.
 2015-06-12 16:16:35 -04:00
Will Daly
c31a510607 Deprecate course details API v0 2015-06-12 15:59:20 -04:00
Ben Patterson
b4c4e818d7 Merge pull request #8493 from edx/benp/allow-for-flaky-jun2015 
Make addCleanup idempotent.
 2015-06-12 15:03:59 -04:00
Sarina Canelake
8af8d257c9 Merge pull request #8508 from edx/sarina/20150612-update-translations 
Update translations (autogenerated message)
 2015-06-12 15:03:30 -04:00
Sarina Canelake
e0dbb0758c Update translations (autogenerated message) 2015-06-12 14:56:59 -04:00
cewing
cb431ccb24 MIT CCX: Use CCX Keys: further revisions in response to code review 
only require ccx-keys once

get_current_ccx will now expect a CourseKey instance as its argument, and will raise a value error if this expectation is not met.

document reason for local import

add special methods to pass attribute setting and deletion through to the wrapped modulestore

add __setattr__ and __delattr__ per code review, update __init__ to work with new methods

style change per code review

clean up context manager usage as recommended by code review

remove unused code and imports

convert modulestore type tests to use the `get_modulestore_type` api, remove unused imports

code quality: add docstrings

increase coverage for utils tests

fix bug found in testing.

increase test coverage on modulestore wrapper

code quality fixes

code-quality: ignore import error, but mark site for future consideration
 2015-06-12 11:20:30 -07:00
Diana Huang
a41d9a5491 Prevent duplication of tabs with different names. 2015-06-12 13:39:51 -04:00