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

28095 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Waheed Ahmed
5958ffb33d Merge pull request #6582 from edx/waheed/tnl935-fix-transcript-skip-first-line 
Fixed transcript skip first line if it contains BOM(Byte Order Mark).
 2015-01-16 15:00:21 +05:00
Waheed Ahmed
47a372282a Fixed transcript skip first line if it contains BOM(Byte Order Mark). 
TNL-935
 2015-01-16 12:21:43 +05:00
Renzo Lucioni
2db00c5723 Merge pull request #6647 from edx/renzo/split-payment-verification-acceptance-tests 
Bok Choy tests for the split payment and verification flow
 2015-01-16 01:47:04 -05:00
Nimisha Asthagiri
dea6b764de Mobile enrollments API: sort order by recent enrollment date. 2015-01-15 21:53:42 -05:00
Matt Drayer
b59566a382 Merge pull request #6455 from edx/mattdrayer/entrance-exams 
(WIP) Course Entrance Exams
 2015-01-15 21:43:08 -05:00
Matt Drayer
3c669e3838 New feature contribution: Entrance Exams 2015-01-15 20:35:24 -05:00
Chris Dodge
5880401d9d add a missing check for an undefined object 2015-01-15 18:58:11 -05:00
Renzo Lucioni
c6777a5b25 Bok Choy tests for the split payment and verification flow 
Adds mode creation endpoint to course_modes app and ability to bypass media device access prompt when proceeding through verification flow in a testing environment.
 2015-01-15 17:25:25 -05:00
Matt Drayer
27fee62039 Merge pull request #6126 from edx/ziafazal/add-pre-requisite-course-via-milestones-app 
Ziafazal/add pre requisite course via milestones app
 2015-01-15 14:20:44 -08:00
Nimisha Asthagiri
a07f607281 Updated strategy per review feedback. 2015-01-15 17:15:46 -05:00
Will Daly
572f155aad Merge pull request #6541 from edx/will/update-diff-cover 
Install diff-cover from pypi, update version to 0.7.3
 2015-01-15 17:09:43 -05:00
David Baumgold
ca1ba20556 Merge pull request #6656 from edx/update-readme-link 
Update README link for full stack installation
 2015-01-15 16:58:43 -05:00
David Baumgold
591c0f63bb Update README link for full stack installation 2015-01-15 16:31:24 -05:00
Sarina Canelake
68b18a20b2 Merge pull request #6624 from mitocw/bdero/sysadmin-dashboard-link 
Add link to sysadmin dashboard on core theme
 2015-01-15 16:08:25 -05:00
Adam
b9bd659861 Merge pull request #6654 from edx/merge-release-into-master 
Merge release into master
 2015-01-15 16:00:38 -05:00
Zia Fazal
ca3d84a5d4 New pre-requisite course feature via milestones app 2015-01-15 15:17:38 -05:00
chrisndodge
c4cd94d756 Merge pull request #6583 from edx/muhhshoaib/shoppingcart-redemption-page-cross-browser-compatibility-fix 
fix the redemption page cross browser issue on safari
 2015-01-15 14:57:05 -05:00
Adam Palay
4381ccd463 Merge remote-tracking branch 'origin/release' into merge-release-into-master 2015-01-15 14:51:34 -05:00
Adam
c281096f68 Merge pull request #6648 from edx/hotfix/2015-01-15 
Fixed unicode error in CSV grade report generation.
 2015-01-15 14:28:48 -05:00
Jesse Zoldak
adc64122ae Merge pull request #6649 from jzoldak/zoldak/fix-yt-stub 
Request the iframe API from youtube in tests every time it is needed
 2015-01-15 13:25:52 -05:00
Awais Qureshi
5959edb493 Merge pull request #6645 from edx/aamir-khan/ECOM-887-post-payment-message 
ECOM-887 Removed the "We have successfully verified your identity" line.
 2015-01-15 23:12:58 +05:00
Jesse Zoldak
3bdee98f4c Request the iframe API from youtube in tests every time it is needed 
TNL-454
 2015-01-15 12:04:57 -05:00
Mark Hoeber
c95d90a328 Merge pull request #6604 from edx/markhoeber-developer-guide-move 
Notice on Developer's Guide move
 2015-01-15 11:58:29 -05:00