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

25382 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
clytwynec
118baafb1f Merge pull request #4943 from edx/mvo/bumping_bok_choy_version 
bumping bok choy version
 2014-08-29 10:08:51 -04:00
Waheed Ahmed
539dd0c46b Merge pull request #5010 from edx/waheed/refactor-verify-course-id-decorator 
Refactor verify course id decorator and fixed tests.
 2014-08-29 17:07:26 +05:00
Waheed Ahmed
2e88e33847 Refactor verify course id decorator and fixed tests. 2014-08-29 16:05:33 +05:00
zubair-arbi
dbe1ba095a Merge pull request #4805 from edx/zub/bugfix/std2007-jumptoid 
update get_parent_location method to select non-orphan parents from mult...
 2014-08-29 16:01:14 +05:00
Waheed Ahmed
cb826dd465 Merge pull request #4985 from edx/waheed/lms11132-fix-invalid-key-error-change-enrollment 
Fixed InvalidKeyError on change enrollment.
 2014-08-29 15:46:26 +05:00
zubair-arbi
89e03d5225 update get_parent_location method to select non-orphan parents from multiple parents 
STUD-2007
 2014-08-29 14:52:46 +05:00
Waheed Ahmed
048984ba1d Fixed InvalidKeyError on change enrollment. 
LMS-11132
 2014-08-29 14:45:54 +05:00
Daniel Friedman
8a7fef072d Merge pull request #4937 from edx/dan-f/improve-course-group-coverage 
Improve test coverage for course groups
 2014-08-28 19:08:56 -04:00
Jason Bau
87068c41ae Merge pull request #5012 from edx/jbau/fix-contained-in-order 
change PaidCourseRegistration.contained_in_order
 2014-08-28 15:05:42 -07:00
Sarina Canelake
64c94cf3cf Merge pull request #4686 from Stanford-Online/stv/i18n/gettext 
Monkey patch 'django.utils.translation'
 2014-08-28 17:39:51 -04:00
Daniel Friedman
a01e57ee71 Improve test coverage for course groups 2014-08-28 17:07:22 -04:00
Minh Tue Vo
688909eb76 bumping bok choy version 
check firefox version, raise exception with instructions for updating
 2014-08-28 16:58:55 -04:00
Sarina Canelake
d9c7a42e07 Merge pull request #4950 from edx/sarina/fix-18n 
Remove i18n from ux reference templates
 2014-08-28 16:31:14 -04:00
Brian Talbot
335298c8e3 Studio: adding in usage note to UX reference templates 2014-08-28 15:37:48 -04:00
Sarina Canelake
d233570c48 Remove i18n from ux reference templates 2014-08-28 15:37:48 -04:00
Will Daly
fe3472cb7c Merge pull request #5013 from edx/will/ecom-113 
ECOM-113: Already verified page sometimes displays the incorrect price
 2014-08-28 15:19:11 -04:00
Jason Bau
63cfcd3de4 change PaidCourseRegistration.contained_in_order 
now handles cases where the order has both a PaidCourseRegistration
and a CertificateItem
 2014-08-28 11:27:07 -07:00
Will Daly
83bfb17807 Use new-style course locators consistently when setting the donation amount in the session 
Update devstack settings to use new CyberSource API
 2014-08-28 13:55:31 -04:00
chrisndodge
173952481f Merge pull request #4984 from edx/cdodge/fix-white-label-footers 
be sure to just use the Open edX footer.html when we're running a white ...
 2014-08-28 13:38:38 -04:00
Will Daly
9a554ec39b Merge pull request #5008 from edx/will/style-fixups-in-student-tests 
Pep8 and Pylint fixes to the student tests
 2014-08-28 12:14:28 -04:00
Dave St.Germain
7d6c466c52 Merge pull request #4612 from edx/dcs/matlab-api-tweak 
A better check for the existence of matlabinput element.
 2014-08-28 12:07:12 -04:00
Stephen Sanchez
739ee04fad Merge pull request #4979 from edx/sanchez/update-login-button-styles 
Updating LMS Login button to line up SASS with Drupal Login button
 2014-08-28 10:50:54 -04:00
muhammad-ammar
2efee4eb88 Merge pull request #4939 from edx/ammar/bok-choy-transcript-tests-batch3 
Bok-Choy Video Transcript Tests Batch3
 2014-08-28 19:44:24 +05:00
Waheed Ahmed
50535ac8a8 Merge pull request #5004 from edx/waheed/lms11249-fix-typo-on-id-verfication 
Fixed typo on student id verification.
 2014-08-28 19:31:24 +05:00
Calen Pennington
d39da7fd27 Merge pull request #4780 from cpennington/split-bulk-operations 
Implement bulk operations on the split modulestore.
 2014-08-28 09:58:20 -04:00
Waheed Ahmed
bedb8830f6 Fixed typo on student id verification. 
LMS-11249
 2014-08-28 18:33:07 +05:00
Alison Hodges
ae240ae71c Merge pull request #5009 from edx/ahodges/doc/reldatechg 
Release date change & fixed two broken links
 2014-08-28 09:25:37 -04:00
Alison Hodges
9058d67673 Release date change & fixed two broken links 2014-08-28 08:26:04 -04:00
Will Daly
fcc27003dc Pep8 and Pylint fixes to the student tests 2014-08-28 08:05:36 -04:00
Muhammad Ammar
6b2874de2b Bok-Choy Video Transcript tests Batch3 2014-08-28 09:10:13 +00:00
stv
86633df3db Monkey patch 'django.utils.translation' 
Modify Django's translation library, such that the gettext family of
functions return an empty string when attempting to translate a
falsey value. This overrides the default behavior [0]:
> It is convention with GNU gettext to include meta-data as the
> translation for the empty string.

This patch provides a holistic solution to replace the current piecemeal
approach [1][2].

Affected Methods:
    - gettext
    - ugettext

[0] https://docs.python.org/2.7/library/gettext.html#the-gnutranslations-class
[1] bad803e451
[2] https://github.com/edx/edx-platform/pull/4653
 2014-08-27 15:27:34 -07: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
Calen Pennington
a205788c4d Work around for split not having a coherent way to work with/track updated versions of structures 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
7d8088d26b Add memcache as a requirement for running paver, because it's imported in pavelib/utils/envs.py 2014-08-27 16:29:47 -04:00
Calen Pennington
e00a8afc6b Remove qualifiers from get_courses 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
Calen Pennington
337b0b48aa Improve check_number_of_calls family of methods 2014-08-27 16:29:47 -04:00
Calen Pennington
db2abf4068 Make it so that versioning a structure that was read from the database works correctly 2014-08-27 16:29:46 -04:00
Calen Pennington
c292f3c609 Add tests to show that reading a structure before versioning it breaks versioning 2014-08-27 16:29:46 -04:00
Calen Pennington
4f4ef959e7 Extensive testing of bulk operations 2014-08-27 16:29:46 -04:00
Calen Pennington
562f0e3197 Add bulk operations to split modulestore 2014-08-27 16:29:46 -04:00
Calen Pennington
f731d5feda Clarify thread-safety of bulk_write context manager 2014-08-27 16:00:52 -04:00
Calen Pennington
d2ffca2cf7 Remove unneccesary checks for method existence 2014-08-27 16:00:52 -04:00
Nimisha Asthagiri
f3d76e69c1 Merge pull request #4989 from edx/split/revert-to-published 
LMS-11185 Split implementation of revert_to_published
 2014-08-27 15:41:40 -04:00
Nimisha Asthagiri
af9c9cd573 LMS-11185 Split implementation of revert_to_published 2014-08-27 15:41:14 -04:00
srpearce
10deae916c Merge pull request #2751 from edx/markhoeber/documentation/stud-1260 
WIP:  Content Experiments Documentation
 2014-08-27 14:29:54 -04:00
Mark Hoeber
fb1ed6ed80 Doc for nested components and content experiments 2014-08-27 14:28:48 -04:00