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

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
cahrens
77702fae09 Getting draft split_test_module instances to import/export. 
STUD-327
 2014-07-23 11:27:23 -04:00
Chris Terman
d3149f66aa add initial_state attribute to jsinput tag 2014-07-23 09:21:42 -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
Matjaz Gregoric
2b2dd942c7 Update xblock-mentoring. 
Update reference to the xblock-mentoring repository.

A bug where answers containing the string "??" would get mangled by jQuery has been fixed in xblock-mentoring.
 2014-07-22 08:14:29 +02: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
Stephen Sanchez
0d5c6ba3ce Merge pull request #4495 from edx/ora2/release-2014-07-21T12.20 
Updating the ORA2 hash for July 21st, 2014
 2014-07-21 13:30:01 -04:00
srpearce
4dac56e6ce Merge pull request #4433 from edx/sylvia/docs/rel_notes_7_16 
Add course author notes for 7/16 release
 2014-07-21 11:20:03 -04:00
Brian Talbot
70da89900e Merge pull request #4484 from edx/talbs/fix-new-course-copy 
Studio: New Course Field Tip Copy Correction
 2014-07-21 11:08:23 -04:00
Sylvia Pearce
0f3403680d Add course author notes for 7/16 release 2014-07-21 10:55:47 -04:00
Bertrand Marron
602988c39a Fix unicode issue 2014-07-21 16:43:51 +02:00
Nimisha Asthagiri
a03134b371 Merge remote-tracking branch 'origin/release' into rc/2014-07-16 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mixed.py
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
 2014-07-21 10:35:55 -04:00
Muhammad Shoaib
2d41ebe48f removed the discount value bug 
check error handling if the discount value is not an integer
 2014-07-21 09:12:57 -04:00
Stephen Sanchez
77d3c3fdb8 Updating the ORA2 hash for July 21st, 2014 2014-07-21 08:24:33 -04:00
Nimisha Asthagiri
c139c2a516 Merge pull request #4493 from edx/studio/bulk-edit-dont-update-ancestors 
Don't update ancestors while bulk editing.
 2014-07-21 08:12:24 -04:00
zubair-arbi
ce3d6f84ee Merge pull request #4025 from edx/zub/bugfix/std1725-duplicatefilesonimport 
ignore MAC meta files on import and also remove any such files from the ...
 2014-07-21 14:22:43 +05:00
zubair-arbi
cfa873cc1d ignore MAC meta files on import and also remove any such files from the course 
STUD-1725
 2014-07-21 13:16:00 +05:00
Nimisha Asthagiri
80f078cf61 Don't update ancestors while bulk editing. 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py

Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
 2014-07-20 23:38:33 -04:00
Brian Talbot
9c9e4a90b2 Studio: corrects new course field tip copy to reflect what provided course values cannot be changed later 
STUD-2001
 2014-07-20 18:17:49 -04:00
Nimisha Asthagiri
d53a666949 Merge pull request #4381 from edx/nimisha/split-converge-api 
Nimisha/split converge api
 2014-07-19 07:04:23 -04:00
Christina Roberts
40625c45fa Merge pull request #4488 from edx/christina/ispublic 
ispublic is in active use by Stanford.
 2014-07-18 22:28:54 -04:00
Calen Pennington
483e2a6a5d split create_item and create_child out as separate methods 2014-07-18 21:11:37 -04:00
cahrens
77a8660243 ispublic is in active use by Stanford. 2014-07-18 20:28:06 -04:00
Mark Hoeber
19fbabeeaa Merge pull request #4482 from edx/markhoeber/documentation/doc-666 
Corrected diff between 0K and 0 C
 2014-07-18 16:45:55 -04:00
Mark Hoeber
26e303c1b8 Corrected diff between 0K and 0 C 2014-07-18 10:00:22 -04:00
Nimisha Asthagiri
23cb549925 Merge pull request #4477 from edx/studio/minimal-fix-import-performance 
Studio/minimal fix import performance
 2014-07-18 09:51:28 -04:00
Anton Stupak
39f1f00977 Merge pull request #4424 from edx/anton/edit-group-configurations 
Edit group configurations.
 2014-07-18 13:12:18 +03:00
polesye
2a6a874a8f BLD-1099: Edit group configurations. 2014-07-18 10:03:08 +03:00
Mathew Peterson
06ef306f7f more split_draft methods 2014-07-17 22:48:11 -04:00
Nimisha Asthagiri
7efd0cb49e converge Split APIs with Mixed and Draft 2014-07-17 22:48:11 -04:00
Nimisha Asthagiri
a501aa9400 don't update ancestors while bulk editing. 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/base.py
 2014-07-17 21:58:11 -04:00
Nimisha Asthagiri
682c9fffd1 fix bulk_write context manager. 2014-07-17 21:57:43 -04:00
chrisndodge
1c5959988f Merge pull request #4466 from edx/cdodge/change-course-access-role-admin 
make sure the CourseAccessRole Django ORM Admin page uses a raw_id so th...
 2014-07-17 18:34:09 -04:00
Jason Bau
6e5f9fdb70 Merge pull request #4469 from edx/jbau/dev-environments-disable-ANALYTICS_ACTIVE_COUNT 
Default ENABLE_ANALYTICS_ACTIVE_COUNT to False for dev envs
 2014-07-17 17:49:21 -04:00