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

28121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AlasdairSwan
2ea094e5bc Merge pull request #6700 from edx/alasdair/old-verification-flow-fontawesome-fix 
ECOM-958 fixed font awesome issues with old verification flow
 2015-01-20 16:22:42 -05:00
AlasdairSwan
04fc722e1c ECOM-958 fixed font awesome issues with old verification flow 2015-01-20 16:05:55 -05:00
Christopher Lee
e592eef09b Merge pull request #6675 from edx/clee-MA-234-hotfix 
Named_path variable now populates complete path
 2015-01-20 14:02:46 -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
christopher lee
b6c08ad213 Named_path variable now populates complete path 2015-01-20 12:53:37 -05:00
Adam
11428fa632 Merge pull request #5237 from mtyaka/mathjax-upgrade 
Upgrade MathJax to 2.4
 2015-01-20 12:26:38 -05:00
Sarina Canelake
c1df980077 Merge pull request #6695 from edx/sarina/20150120-update-translations 
Update translations (autogenerated message)
 2015-01-20 11:28:23 -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
Will Daly
284e78c27e Merge pull request #6690 from edx/will/inline-user-api-forms 
Inline the user api form description calls
 2015-01-20 11:09:01 -05:00
Ben Patterson
349a02e405 Merge pull request #6693 from benpatterson/benp/fix-pylint-error 
Resolve run_pylint error.
 2015-01-20 10:42:32 -05:00
Awais Qureshi
9783630dc0 Merge pull request #6666 from edx/awais786/ECOM-924-unique-code-url 
Awais786/ecom 924 unique code url
 2015-01-20 20:36:32 +05:00
Sarina Canelake
503f4d95bb Update translations (autogenerated message) 2015-01-20 10:04:06 -05:00
Xavier Antoviaque
0c7620a544 Merge pull request #6637 from open-craft/mtyaka/validate-chars 
Improve JS course key validation to not allow special chars.
 2015-01-20 16:02:32 +01:00
Awais
b12d007138 ECOM-924 Adding redeem code url in attached email file 2015-01-20 19:20:51 +05:00
Ben Patterson
11613bd26a Resolve run_pylint error. 2015-01-20 06:28:11 -05:00
Tim Babych
957e0e28cc Merge pull request #6685 from edx/tim/get_parent 
make use of xblock.get_parent() in LMS Student Notes
 2015-01-19 23:36:29 +02:00
Will Daly
0a9f9130b0 Inline the user api form description calls 2015-01-19 16:01:11 -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
Tim Babych
b0c2bc2181 make use of xblock.get_parent() 2015-01-19 08:32:40 +02:00
Ben Patterson
f8a048d6e2 Merge pull request #6651 from benpatterson/benp/remove-tddium-scripts 
Remove tddium-only scripts.
 2015-01-18 12:33:46 -05:00
David Baumgold
809d09af07 Merge pull request #6191 from marcore/fix-TNL-726 
CMS fail to collectstatic when USE_CUSTOM_THEME
 2015-01-17 17:08:21 -05:00
Marco Re
d65902ed3c Add themes files to staticfiles_dir in Studio 2015-01-17 13:24:54 +01:00
Anton Stupak
95cc2bb8ab Merge pull request #6667 from edx/anton/edxnotes-fix-ui-hat 
TNL-1220: Fix Harvard Text Annotation UI.
 2015-01-17 13:04:02 +02: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
polesye
1d9b5a9736 TNL-1220: Fix Harvard Text Annotation UI. 2015-01-16 22:45:07 +02: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
Sarina Canelake
b2e2048bf6 Merge pull request #6680 from edx/sarina/add-authors 
Add Siem Kok and Steffan Sluis to AUTHORS
 2015-01-16 15:01:55 -05:00
Sarina Canelake
8f377c06c2 Add Siem Kok and Steffan Sluis to AUTHORS 2015-01-16 15:00:31 -05:00
Brian Talbot
a8cc338711 Merge pull request #6672 from edx/talbs/fix-edxnotes-links+highlights 
LMS: Student Notes - Styling links to appear in highlighted text
 2015-01-16 14:49:08 -05:00
chrisndodge
dde097c926 Merge pull request #6676 from edx/release 
Release
 2015-01-16 14:07:44 -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
Nimisha Asthagiri
8ed247b362 Merge pull request #6662 from edx/mobile/MA-227 
MA-227 Mobile announcements sort order correction.
 2015-01-16 12:45:08 -05:00
Nimisha Asthagiri
8394fb71ac Merge pull request #6608 from edx/mobile/MA-216 
MA-216 Mobile API: display unreleased courses in enrollment list.
 2015-01-16 12:41:21 -05:00
chrisndodge
8c45e62bf4 Merge pull request #6661 from edx/hotfix/2015-01-16 
add a missing check for an undefined object
 2015-01-16 12:24:22 -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
Jason Bau
dd18a8e618 User service PR: fix unrelated courseware test 
Makes lms/djangoapps/courseware/tests/test_views.py:test_index_invalid_position
actually do what it intends to do, but fixing the URL the
test client visits
 2015-01-16 11:40:05 -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
Brian Talbot
26fb3fc557 LMS: student notes - styling links to appear in highlighted text 2015-01-16 11:07:55 -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
17d593ae0a Merge pull request #6669 from edx/clytwynec/disable_flaky_tests 
Clytwynec/disable flaky tests
 2015-01-16 10:48:18 -05:00
Ned Batchelder
94ce3c0a8c Merge pull request #6514 from johnjlee/schoolyourself-xblock 
Minor fixes to the schoolyourself xblock
 2015-01-16 10:35:50 -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
Nimisha Asthagiri
caee333142 MA-227 Mobile announcements sort order correction. 2015-01-16 08:58:08 -05:00