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

1845 Commits

Author SHA1 Message Date
Nimisha Asthagiri
041d72ccc6 Update mongo counts. 2014-09-04 18:14:13 -04:00
Don Mitchell
b28af4fdaa Temporarily disable bulk operations b/c old mongo 
does too much work on exit and doesn't handle nesting
 2014-09-04 17:28:17 -04:00
chrisndodge
c5fc9b2fc8 Merge pull request #4771 from edx/cdodge/ecommerce-invoicing 
Cdodge/ecommerce invoicing
 2014-09-02 15:32:41 -04:00
Calen Pennington
1e2d5ffe03 Merge pull request #5031 from edx/andya/merge-hotfix-2014-08-29 
Merge hotfix-2014-08-29 to master
 2014-09-02 15:32:05 -04:00
Muhammad Shoaib
2cc0433833 Implement mediated bulk purchase epic 
Updating EX-60 logic
 2014-09-02 13:03:24 -04:00
Stephen Sanchez
8eeb091de8 Merge pull request #5036 from edx/sanchez/fix_django_header_tests 
Sanchez/fix django header tests
 2014-09-02 10:44:16 -04:00
Calen Pennington
fb56588090 Tweak mongo count numbers 2014-09-02 10:29:23 -04:00
Stephen Sanchez
2f4fb30592 Cleaning up ddt syntax for new footer test. 2014-09-02 13:14:28 +00:00
htareque
3f159ea52b username and email request for lti module 
added username and email functionality, so that username and email can be passed to the lti third party app

rev2: added customizable text box

rev3: added revisions from auraz
 2014-09-02 08:12:36 -04:00
Andy Armstrong
4fcc59b318 Merge branch 'release' into andya/merge-hotfix-2014-08-29 
Conflicts:
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	lms/djangoapps/courseware/tests/test_module_render.py
 2014-08-29 16:50:40 -04:00
Andy Armstrong
7b26e85478 Merge branch 'release' into andya/merge-hotfix-2014-08-29 
Conflicts:
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/__init__.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mixed_modulestore.py
	lms/djangoapps/courseware/tests/test_module_render.py
 2014-08-29 16:50:10 -04:00
Calen Pennington
8dc7f34295 Improve debuggability when call-count numbers don't match up 2014-08-29 14:09:35 -04:00
Waheed Ahmed
2e88e33847 Refactor verify course id decorator and fixed tests. 2014-08-29 16:05:33 +05:00
Calen Pennington
0e7e266a5b Push bulk_write_operations up into ModuleStoreRead, and rename to remove reference to writes 2014-08-27 16:29:48 -04:00
Don Mitchell
e624ff3b04 Make path_to_location use bulk_write_operation for performance. 2014-08-27 16:29:47 -04:00
Calen Pennington
3672c9a292 Make find_matching_* work during split bulk operations 2014-08-27 16:29:47 -04:00
Calen Pennington
e7ce41061e Improve debuggability when call-count numbers don't match up 2014-08-27 16:29:47 -04:00
Piotr Mitros
b166503749 Merge pull request #4889 from edx/danielli/pyfs 
Adds pyfilesystem service from XBlocks to edx-platform
 2014-08-25 16:37:46 -04:00
swdanielli
504a7a21ba add pyfs service 2014-08-25 12:25:03 -04:00
Stephen Sanchez
9ee15bf007 Updating the footer for edx.org and open edx. 
Move the open edx logo inside the div

Adding a bunch of placeholder views.

indenting.

Making some styles work against LMS sass.

Adding back the old edx footer and associated icons, with a feature flag.
 2014-08-25 15:33:43 +00:00
Don Mitchell
24cdd7a481 Assume any non-xml modulestore is r/w 
LMS-11235
 2014-08-21 12:11:27 -04:00
Don Mitchell
78879ebc18 Asset urls must start w/ slash 
LMS-11233
 2014-08-21 12:11:27 -04:00
Minh Tue Vo
4e1c4c46e6 adding tests for country list in different languages 
updating the version for django_countries
 2014-08-20 15:30:17 -04:00
Waheed Ahmed
e26efea26f Fixed 500 error on views with incomplete course id in url. 
LMS-11217
 2014-08-20 18:30:58 +05:00
Calen Pennington
50082387eb Add a request-token to identify which xblock html was rendered as part of the current request 
[STUD-2903]
 2014-08-15 11:04:52 -04:00
Will Daly
88ebac4faf Use English for the marketing site buttons in an edx-controlled domain 2014-08-14 16:00:44 -04:00
Julia Hansbrough
b9a285f1e7 Merge pull request #4756 from edx/flowerhack/prof-ed-reg-button 
Redirect to show_reqs for prof ed
 2014-08-08 17:03:29 -04:00
Julia Hansbrough
91e90b3673 Update redirect and wording for prof ed 
- Changes registraiton button text for professional ed courses
- Professional ed courses do not see "choose your track" page; go straight to verification flow
 2014-08-08 21:02:16 +00:00
Nimisha Asthagiri
9efe5d92c5 Merge pull request #4720 from edx/split/add-and-fixes 
Split/add and fixes
 2014-08-08 14:12:02 -04:00
Nimisha Asthagiri
d2b59cb6e0 get_items API: have qualifiers be a separate parameter instead of assuming kwargs. 2014-08-08 12:38:42 -04:00
Usman Khalid
f9ee21f434 Incomplete course ids should return a 404. 2014-08-08 20:34:44 +05:00
jsa
d96de4249d Merge branch 'release' 2014-08-07 16:22:39 -04:00
David Baumgold
e99a14eb3f Merge pull request #4654 from edx/db/kill-check-for-code 
Replace `check_for_get_code` with `assert_request_status_code`
 2014-08-07 08:28:50 -04:00
Usman Khalid
9599c31aa0 Catch InvalidKeyError in static_tab view. 
LMS-11189
 2014-08-07 15:41:07 +05:00
Waheed Ahmed
05b87fd99b Implemented process_response method to clear requestcontext global variable in mako middleware. 
LMS-6622
 2014-08-06 19:58:20 +05:00
David Baumgold
5457775cfe Replace check_for_get_code with assert_request_status_code 
More flexible, uses the word "assert", method instead of function
 2014-08-05 13:36:49 -04:00
Carson Gee
87fa6cc753 Check if user is anonymous before calling PSYCHOMETRICS 
LTI grade callbacks for example, come in with an anonymous user.  This causes a
stack trace in the psychometrics app that leads to the LTI service
getting a 404.  This adds a check before that callback gets registered.
 2014-08-01 12:34:12 -04:00
Don Mitchell
437a3bf93e Merge pull request #4542 from edx/split/perf_test 
Split/perf test
 2014-07-31 09:14:15 -04:00
Oleg Marshev
36d47dd05e Merge pull request #4527 from edx/oleg/xml-course-transcripts-fix 
Fix transcripts in XML course when no static_asset_path is set.
 2014-07-31 10:35:44 +03:00
Don Mitchell
d4776a151b Test both split and old mongo 2014-07-30 17:44:45 -04:00
Don Mitchell
0f0d75fce8 Convert toc test to use mongo not xml ms 
Included adding a general create_toy_course and create_sample_course method for tests
 2014-07-30 17:44:44 -04:00
Oleg Marshev
46fe356182 Use data dir from course. 2014-07-28 13:11:12 +03:00
Ned Batchelder
dea5c7d3db Add a test of login with params on the next URL 2014-07-24 16:11:33 -07:00
Jason Bau
fb927dd790 Merge pull request #4450 from Stanford-Online/jbau/edx/fix-shib-student-register 
fix shib reg from course about page
 2014-07-17 13:53:51 -04:00
Jason Bau
be80e0058e Merge pull request #4464 from edx/jbau/remove-branch-setting-cache 
removing thread-local cache for branch_setting
 2014-07-17 13:03:08 -04:00
Jason Bau
f12fa05ae1 removing thread-local cache for branch_setting 2014-07-17 11:05:47 -04:00
Jason Bau
e1fcac93c5 fix shib reg from course about page 2014-07-17 10:51:32 -04:00
Calen Pennington
1bc0b323b1 Explicitly create the AssetKey for all assets coming out of a ContentStore 2014-07-17 10:35:36 -04:00
Sarina Canelake
666f563ee6 Merge pull request #4418 from Stanford-Online/dcadams/make_registration_button_conditional 
Make text on register button on About page conditional.
 2014-07-15 16:37:00 -04:00
David Adams
aa1b623904 Make text on register button on About page conditional. 
Added a new advanced setting; invitation_only

 If invitation_only display "Enrollment in this course is by invitation only"
 Otherwise, if outside of enrollment period display "Enrollment is Closed"

 This issue is logged at LMS-2670

 Also fixed in this PR is issue LMS-2717; even though the Register button was greyed out,
 clicking it sent one to the registration page.
 2014-07-15 12:51:12 -07:00