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

10296 Commits

Author SHA1 Message Date
Calen Pennington
6cb55e1a36 Stringify ObjectIds before attempting to make a filename out of them 2015-01-28 18:23:22 -05:00
Calen Pennington
1160306438 Replace SplitMongo thread_cache usage with use of request_cache 2015-01-28 18:23:22 -05:00
Matt Drayer
9d2a0a4e9d Merge pull request #6705 from edx/mattdrayer/update-milestones-hash 
Bok Choy test now passes
 2015-01-28 17:38:18 -05:00
Matt Drayer
e5f00e626a Bok Choy test now passes 2015-01-28 17:37:49 -05:00
Matt Drayer
dc0816669d Merge pull request #6792 from edx/ziafazal/make-course-requirements-links 
make course requirement as link
 2015-01-28 16:56:35 -05:00
Matt Drayer
ce5c7948fa Added field to FILTERED_LIST plus a new bokchoy test 2015-01-28 13:11:36 -05:00
Chris Rodriguez
9e2494b21d Video player branding addition for XuetangX 2015-01-28 06:39:21 -05:00
Zia Fazal
ba5fd98aaf make course requirement as link 2015-01-28 14:26:27 +05:00
Waheed Ahmed
4ac7b55757 Fixed transcript skip first line if it contains BOM(Byte Order Mark). 
TNL-935
 2015-01-28 12:26:16 +05:00
Andy Armstrong
6201af652b Merge pull request #6765 from edx/andya/requirejs-in-lms 
Add RequireJS to the LMS
 2015-01-27 17:57:33 -05:00
Will Daly
b8184d188f Add RequireJS and RequireJS Optimizer configuration to the LMS 
[second attempt which addresses bug building Studio]
 2015-01-27 17:56:29 -05:00
Renzo Lucioni
bcf6461e0b Merge pull request #6769 from edx/renzo/fix-flaky-bok-choy-tests 
Fix intermittent failures in bok-choy tests of payment and verification
 2015-01-27 13:32:10 -05:00
Shrhawk
61e9519b53 Merge pull request #6709 from edx/shr/bug/TNL-1229-Burst-errors 
Invalid youtube_id raise NotFoundError for transcripts
 2015-01-27 20:29:13 +05:00
polesye
a2a28880c5 TNL-1116: Fix clicking bug. 2015-01-27 11:22:46 +02:00
Syed Hassan Raza
e2ecb0db46 Invalid youtube_id raise NotFoundError for transcripts 
TNL-1229
 2015-01-27 11:48:08 +05:00
Renzo Lucioni
4f23c31d8b Fix intermittent failures in bok-choy tests of payment and verification 2015-01-26 17:22:21 -05:00
Will Daly
305f0c3338 Can disable rate limiting for enrollment API end-points using model-based configuration. 2015-01-26 15:28:04 -05:00
Stephen Sanchez
6616b7b5c9 Merge pull request #6731 from edx/sanchez/cache_course_enrollment_details 
Adding caching to the course details endpoint for the Enrollment API.
 2015-01-23 08:55:02 -05:00
Stephen Sanchez
267ec24f0a Merge pull request #6735 from edx/sanchez/allow_enrollment_without_username 
Enrollment API to be used without knowing the current user name.
 2015-01-22 16:37:45 -05:00
David Baumgold
ccc2dd8327 Merge pull request #6722 from Stanford-Online/giulio/shorten-course-module-py-line-lengths 
Shortened line length of studio help strings
 2015-01-22 16:16:33 -05:00
stephensanchez
896bc1c859 Adding caching to the course details endpoint for the Enrollment API. 2015-01-22 20:58:22 +00:00
stephensanchez
2d1d58225a Allow the enrollment API to be used without knowing the authenticted user name. 2015-01-22 19:50:02 +00:00
Giulio Gratta
47a0e3441e Shortened line length of studio help strings 2015-01-22 09:48:41 -08:00
Usman Khalid
3d4a853e00 Merge pull request #5926 from Stanford-Online/kluo/lti-grades-past-due 
Make LTI grade submissions respect deadlines
 2015-01-22 19:55:21 +05:00
Kevin Luo
af9dce82a3 Make LTI grade submissions respect deadlines 2015-01-21 17:05:46 -08:00
Will Daly
fcd7736d29 Merge pull request #6721 from edx/will/revert-requirejs-changes 
Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS"
 2015-01-21 19:07:34 -05:00
Braden MacDonald
4198da1ae1 Merge pull request #6657 from open-craft/fix-library-old-mongo-default 
Fix errors with libraries when old mongo is default (first) modulestore (SOL-234)
 2015-01-21 15:05:12 -08:00
Will Daly
1f2b155746 Revert "Add RequireJS and RequireJS Optimizer configuration to the LMS" 
This reverts commit 1d6fceda50.
 2015-01-21 17:13:27 -05:00
Will Daly
1eaf84a443 Merge pull request #6544 from edx/will/requirejs-optimizer-lms 
Add RequireJS and RequireJS Optimizer configuration to the LMS
 2015-01-21 15:23:35 -05:00
Braden MacDonald
025f046b04 Fix errors with libraries when old mongo is default (first) modulestore 2015-01-21 11:01:52 -08:00
Renzo Lucioni
d6a823c033 Disable flaky bok-choy tests of payment and verification flow 2015-01-20 15:30:23 -05:00
Will Daly
1d6fceda50 Add RequireJS and RequireJS Optimizer configuration to the LMS 
Respond to review comments:

- Rename build and config files for consistency between lms/studio.
- Fix merge conflicts with lms require config.
- Devstack uses optimized pipeline to skip require JS optimizer step
- Add tests for render_require_js_path_overrides
 2015-01-20 14:27:23 -05:00
John Eskew
6249584767 Merge pull request #6659 from edx/jeskew/asset_md_size_of_mongo_docs 
Performance test to find asset metadata size.
 2015-01-20 13:31:51 -05:00
John Eskew
a4bbed3bc1 Add performance test which finds the BSON size of varying amounts 
of asset metadata in both the old Mongo and Split modulestores.
 2015-01-20 11:18:24 -05:00
Matjaz Gregoric
e255f4b021 Upgrade MathJax to 2.4. 
Several IE bugs have been fixed in 2.4.
 2015-01-19 08:10:45 +01:00
John Eskew
b14eaa038c Merge pull request #6627 from edx/jeskew/perf_test_asset_metadata_find_mongo 
Add performance test when finding asset metadata.
 2015-01-16 17:03:02 -05:00
John Eskew
01f2e1fd0b Add performance test when finding asset metadata. 
Re-factor report generation and add report for "find" performance test.
 2015-01-16 16:05:29 -05:00
Ned Batchelder
e64d45b705 Merge pull request #6563 from edx/ned/fix-6013 
Fixes for #6013: Implement user service to return currently-logged-in user
 2015-01-16 15:12:31 -05:00
Martyn James
9ac7176b8f Merge pull request #6223 from edx/feature/SOL-20 
Merge feature SOL-20
 2015-01-16 12:54:45 -05:00
Martyn James
dcc8e95648 Implements SOL-20. Filtering for assets table by asset type 2015-01-16 12:53:24 -05:00
Ned Batchelder
0c9d687fc9 One place in the new library code that used the old user service 2015-01-16 11:40:07 -05:00
Ned Batchelder
df0e3e64ad Pylint fixes to make diff-quality happy 2015-01-16 11:40:06 -05:00
Jason Bau
7f1b60b286 Implement user service to return currently-logged-in user 
returns XBlockuser with 2 data layers
 2015-01-16 11:40:06 -05:00
Will Daly
314ad95797 Merge pull request #6658 from edx/will/ECOM-894 
ECOM-894: Allow inactive users to request a password reset
 2015-01-16 11:27:00 -05:00
Christine Lytwynec
0ed43e1472 Merge pull request #6671 from edx/clytwynec/disable_flaky_tests 
disable DragAndDropTest
 2015-01-16 11:23:45 -05:00
Sarina Canelake
94b313fd72 Merge pull request #6625 from Stanford-Online/jbau/small-shib-bugfix 
Fix shib code to handle course.enrollment_domain=None
 2015-01-16 11:07:29 -05:00
Christine Lytwynec
625eae27d6 disable DragAndDropTest 2015-01-16 10:51:43 -05:00
Christine Lytwynec
c2f3e7a1e8 disable test_settings_overrides 2015-01-16 09:43:59 -05:00
Christine Lytwynec
85650da212 disable test_prerequisite_course_save_successfully 2015-01-16 09:42:08 -05:00
Will Daly
8228337063 Allow inactive users to request a password reset 
Internationalize error messages for password reset on the new login page.
 2015-01-16 08:24:27 -05:00