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

24533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anurag Ramdasan
f77c06ff1f check if next is not defined 2014-07-24 16:10:44 -07:00
Anurag Ramdasan
c4fa475c7a add var declaration for next 2014-07-24 16:10:36 -07:00
Anurag Ramdasan
4df0efa250 decode uri component before redirect for safe redirect 2014-07-24 16:10:01 -07:00
Calen Pennington
f6b278e7f8 Merge pull request #4537 from cpennington/new-locator-key-prefixes 
Use a version of opaque keys that identifies version numbers in the key prefixes
 2014-07-24 15:55:33 -04:00
Tim Babych
b2139ece80 Merge pull request #4543 from edx/tim/test_export_all_courses-was-flaky 
Make test_export_all_courses not flaky
 2014-07-24 22:14:30 +03:00
Christina Roberts
fa1f4f2be7 Merge pull request #4474 from Stanford-Online/sjang92/null_tabname_bugfix 
Bugfix: New Tab name being initialized as null
 2014-07-24 14:50:00 -04:00
Jay Zoldak
c015e7d4b6 Merge pull request #4546 from edx/zoldak/disable-test 
Disable failing test STUD-2003
 2014-07-24 14:13:31 -04:00
Jay Zoldak
a536c344f2 Disable failing test STUD-2003 2014-07-24 13:58:05 -04:00
Tim Babych
51a8dc2326 Make test_export_all_courses do not rely on the order in which files are returned by os.walk(). 2014-07-24 19:22:26 +03:00
Jay Zoldak
bff7c58930 Merge pull request #4465 from edx/zoldak/fix-studio-clicks 
Improve clicking and synchronization in Studio bok-choy tests
 2014-07-24 10:04:07 -04:00
Calen Pennington
3f47fe4a61 Use a version of opaque keys that identifies version numbers in the key prefixes 2014-07-24 09:32:06 -04:00
Sarina Canelake
0d33203526 Merge pull request #4533 from Stanford-Online/kluo/i18n-support-theme 
Add support for theme translations and LANGUAGE_DICT override
 2014-07-24 08:59:26 -04:00
Sarina Canelake
8b3d9da40d Merge pull request #4209 from msegado/showanswer-correct-or-past-due 
Add "Correct or Past Due" option for showanswer
 2014-07-24 08:57:54 -04:00
Jay Zoldak
c21dbe4cd2 Improvements to clicking and synchronization in Studio bok-choy tests. 2014-07-24 08:55:34 -04:00
Kevin Luo
9b3b2e72a2 Add support for theme translations and LANGUAGE_DICT override 2014-07-24 04:39:38 -07:00
Anton Stupak
4bd3093ea7 Merge pull request #4480 from edx/anton/create-edit-delete-groups 
Group Configuration: create, edit, delete groups
 2014-07-24 10:37:24 +03:00
Martin Segado
42ae57208b Add Martin Segado to authors file 2014-07-24 02:44:03 -04:00
Martin Segado
bbeb79cbe7 Add correct_or_past_due option for showanswer and update relevant documentation 2014-07-24 02:44:03 -04:00
polesye
fda3f5ac04 BLD-1110: Create, edit, delete groups. 2014-07-24 08:30:21 +03:00
Nimisha Asthagiri
602be5e97f Merge pull request #4532 from edx/split/branch-settings 
Split/branch settings LMS-11056
 2014-07-23 23:18:57 -04:00
Diana Huang
167e2b675b Split branch settings code review fixes LMS-11056 2014-07-23 21:59:33 -04:00
Se Won Jang
2c3aebf91f Bugfix: Initialize new tabname to "Empty" 
In Studio, when the course administrator creates a new tab, its name was being
initialized as null in the mongo database. This caused students in LMS to get a
server error when trying to access the course page, since LMS was trying to
process the null tabname for translation, etc. Now tabname is initialized as
'Empty', which is how it was being done in the frontend.

STUD-2000
 2014-07-23 18:32:59 -07:00
Nimisha Asthagiri
1dc6ea39f3 Split branch settings LMS-11056 2014-07-23 20:36:15 -04:00
Nimisha Asthagiri
2c01984b05 Merge pull request #4494 from edx/nimisha/request-cache-for-branch-settings 
Make overriding branch settings thread-safe LMS-11125
 2014-07-23 20:05:46 -04:00
Nimisha Asthagiri
3eecc9639a Make overriding branch settings thread-safe LMS-11125 2014-07-23 17:41:08 -04:00
srpearce
9b8c47ab4e Merge pull request #4531 from edx/sylvia/docs/relnotes_7_23 
Release notes for 7-23-2014
 2014-07-23 14:46:29 -04:00
Sylvia Pearce
79fb5c61f7 Release notes for 7-23-2014 2014-07-23 12:56:55 -04:00
Christina Roberts
aab561b269 Merge pull request #4491 from edx/christina/export-split 
Getting draft split_test_module instances to import/export.
 2014-07-23 12:20:57 -04:00
Mark Hoeber
e6f3ba6b9b Merge pull request #4529 from edx/markhoeber-documentation-doc420 
Added text about grade ranges and certificates
 2014-07-23 11:40:43 -04:00
Mark Hoeber
cecbbff64d Added text about grade ranges and certificates 2014-07-23 11:40:11 -04:00
cahrens
77702fae09 Getting draft split_test_module instances to import/export. 
STUD-327
 2014-07-23 11:27:23 -04:00
doctoryes
8f4ce392f3 Merge pull request #4521 from edx/jeskew/update_authors 
Jeskew/update authors
 2014-07-22 15:43:21 -04:00
doctoryes
1b77459aa3 Add myself to AUTHORS. 2014-07-22 15:39:08 -04:00
Alison Hodges
44eb9bb447 Merge pull request #4400 from edx/ahodges/documentation/DOC591 
Adds sample student communications (email msgs)
 2014-07-22 12:39:59 -04:00
Alison Hodges
7a02f16fe1 Adds sample student communications (email msgs) 2014-07-22 12:38:38 -04:00
Sarina Canelake
644e18e200 Merge pull request #4511 from edx/sarina/fix-i18n 
Fix small i18n typos
 2014-07-22 09:40:36 -04:00
Sarina Canelake
91196573e6 Fix small i18n typos 2014-07-22 09:38:32 -04:00
Tim Babych
f20df3a8bb Update link to Jasmine documentation 2014-07-22 13:53:16 +03:00
chrisndodge
e9f2801cef Merge pull request #4479 from edx/muhhshoaib/Ex-40-Coupon-discount-value-add-validation 
Fixed the  discount value bug
 2014-07-21 21:48:56 -04:00
Jason Bau
bd03741c79 Merge pull request #4212 from Stanford-Online/ndupoux/fixing-registration-page 
Ndupoux/fixing registration page
 2014-07-21 18:07:10 -04:00
Sarina Canelake
6be3384481 Merge pull request #4431 from edx/split/get_wiki_courses 
Split get_courses_for_wiki impl
 2014-07-21 17:59:19 -04:00
marcotuts
c7d88deb47 Merge pull request #4453 from edx/marco/dashboard-styling-tweaks 
Visual styling adjustments to profile area on Course Dashboard
 2014-07-21 17:50:04 -04:00
Sarina Canelake
d0449cdff2 get_courses_for_wiki return course_keys across all modulestores [LMS-2914] 2014-07-21 17:17:48 -04:00
Don Mitchell
6074e0b117 Split get_courses_for_wiki implementation [LMS-2914] 
- Move Mongo tests to mixed ddt tests
- Check if `fields` is None before updating search targets
- Fix for double course version
 2014-07-21 17:17:48 -04:00
njdup
770e7aac49 User registration prevents using password as username. 
Some users erroneously set their password as their username with the original layout, because the username field directly followed the password field. Users may be accustomed to the common occurrence of a password confirmation field directly following the password field.
To fix the issue, I did the following:
   - Moved the existing username and real name form fields above the password field.
   - Added a validation in the create_account handler in common/djangoapps/student/views.py, which confirms that the password field does not match the username field.

New tests created to check the added functionality.
 2014-07-21 14:04:48 -07:00
Ned Batchelder
feac1e0b60 Merge pull request #4498 from IONISx/tusbar/fix-dump-grades-unicode 
Fix unicode issue
 2014-07-21 16:10:46 -04:00
Mark Hoeber
b54dd4d83b Merge pull request #4503 from edx/markhoeber-release-notes-studio-urls 
Added item for Studio URL changes to Release Notes
 2014-07-21 15:37:04 -04:00
Mark Hoeber
520108f9cc Added item for Studio URL changes 2014-07-21 14:00:50 -04:00
Ned Batchelder
00377652e4 Merge pull request #4179 from IONISx/tusbar/remove-course-id-from-title 
Remove course ID from title in course about page
 2014-07-21 13:57:34 -04:00
John Jarvis
7023eb4c19 resolving merge conflicts 2014-07-21 13:42:06 -04:00