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

26378 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Will Daly
6ab8a8560d Merge pull request #5640 from edx/will/open-source-tos 
Support separate terms of service and honor code checkboxes.
 2014-10-20 11:57:52 -04:00
Will Daly
d774bcf36e Support separate terms of service and honor code checkboxes. 2014-10-20 11:26:17 -04:00
Will Daly
a35ce365d7 Merge pull request #5637 from edx/will/honor-code-and-tos 
Add honor code to registration dialog.
 2014-10-20 11:17:11 -04:00
Will Daly
97f3f09009 Add honor code to registration dialog. 2014-10-20 11:14:39 -04:00
Will Daly
458186f7d1 Merge remote-tracking branch 'origin/master' into will/combine-reg-login-form 
Conflicts:
	lms/djangoapps/student_account/test/test_views.py
	lms/djangoapps/student_account/urls.py
	lms/djangoapps/student_account/views.py
 2014-10-20 10:57:05 -04:00
Waqas Khalid
be19c1a9a5 Merge pull request #5610 from mlkwaqas/waqas/tnl607-forum-post-are-uneditable 
Post with the discussion id containing dots uneditable
 2014-10-20 19:39:29 +05:00
Renzo Lucioni
6013c529f4 Merge pull request #5615 from edx/renzo/account-password-reset 
Add password reset request handling to the account page
 2014-10-20 10:21:18 -04:00
Will Daly
9da81adaa4 Merge pull request #5626 from edx/will/more-unit-tests-failures 
Fix unit test failures due to duplicate url names
 2014-10-20 10:03:52 -04:00
Alison Hodges
3cfe586b41 Merge pull request #5614 from edx/ahodges/doc/DOC1116 
Open source rename child-id
 2014-10-20 09:48:19 -04:00
Mark Hoeber
5ee7f4eba5 Merge pull request #5491 from edx/markhoeber-doc989 
WIP: edX Mobile API Doc
 2014-10-20 09:26:27 -04:00
Will Daly
d558a36127 Fix unit test failures due to duplicate url names 
Reset the correct URLs module to fix test failures.

Fix third party auth to reconfigure the registry on test cleanup.
 2014-10-20 09:10:11 -04:00
zubair-arbi
6bb878afb2 Merge pull request #5468 from edx/zub/bugfix/tnl-256-protex-scroll-with-increased-font-size 
set overflow to scroll so that user can see full content with increased ...
 2014-10-20 12:23:24 +05:00
Renzo Lucioni
ff587c5cbb Add password reset request handling to the account page 
The next step in the password reset process (confirmation) continues to be handled by student.views.password_reset_confirm_wrapper, a custom wrapper around Django's password reset confirmation view.
 2014-10-18 00:54:38 -04:00
Brian Talbot
5a31005e96 Merge pull request #5563 from lpil/master 
Stop page extending out of viewport width by 40px
 2014-10-17 17:14:01 -04:00
Mark Hoeber
8b98c08d13 Merge pull request #5525 from edx/pmitros/olx-doc-fixups 
First pass at improving OLX docs
 2014-10-17 16:41:13 -04:00
Mark Hoeber
fba0b7b8a4 Merge pull request #5620 from edx/markhoeber-devdoc-fix 
Devdoc fix
 2014-10-17 16:38:45 -04:00
Mark Hoeber
3170e36c66 Removed highlight underscore, which was breaking on RTD 2014-10-17 16:24:38 -04:00
Waqas Khalid
9ba03c8aac Post with the discussion id containing dots uneditable 
When user try to edit the post under dicussion whose
id contains dots it doesn't allow user to edit taht
post.

TNL-607
 2014-10-18 01:07:27 +05:00
Will Daly
6250c95d2e Fix immutable querydict error 2014-10-17 16:07:06 -04:00
frances botsford
b9c37120b3 Merge pull request #2682 from edx/frances/experiments/rtl 
RTL platform support
 2014-10-17 15:22:36 -04:00
Will Daly
efec188b69 Fix unit tests 2014-10-17 15:01:21 -04:00
Will Daly
3c1aab8043 Merge pull request #5622 from edx/will/set-password-field-type 
Use password field type for the login form password
 2014-10-17 14:46:34 -04:00
Frances Botsford
c92f52e0bd cleanup and response to PR review 2014-10-17 13:51:43 -04:00
Omar Al-Ithawi
d8bf0ef5a5 Elegant rtl/ltr css switch, LMS RTL fixes, language aware @cache_if_anonymous 2014-10-17 13:51:42 -04:00
Frances Botsford
ce3cb27864 switching RTL on the fly - added bi-app for sass compiling 2014-10-17 13:51:42 -04:00
Omar Al-Ithawi
9b287960e7 LMS RTL fixes 2014-10-17 13:51:42 -04:00
Frances Botsford
e255ac1f29 Initial pass at LMS and Studio RTL 2014-10-17 13:51:42 -04:00
Will Daly
be0033eefe Use password field type for the login form password 2014-10-17 13:41:10 -04:00
Will Daly
c1e2674997 Merge pull request #5621 from edx/will/remember-me 
Add remember me checkbox to the login page
 2014-10-17 13:37:41 -04:00
Jesse Zoldak
03a42898c9 Merge pull request #5608 from edx/zoldak/lti-test-fixes 
Fix sychronization issues in LTI lettuce test
 2014-10-17 13:18:11 -04:00
Will Daly
e65fe4ed03 Add remember me checkbox to the login page 2014-10-17 13:17:13 -04:00
Mark Hoeber
cc702589f6 Merge pull request #5607 from edx/carol/docs/DOC-1054 
Clarify Max Attempts
 2014-10-17 12:50:54 -04:00
Carol Tong
11792fb955 Clarify Max Attempts 
Add text to clarify relationship between Max Attempts setting
course-wide vs individual problems
 2014-10-17 12:49:15 -04:00
Mark Hoeber
0ea2254062 Platform API doc 2014-10-17 12:27:45 -04:00
Jesse Zoldak
dd35005132 Fix sychronization issues in LTI test 
Better verification for troubleshooting LTI test failures
Dismiss any lingering alerts after lettuce scenarios
 2014-10-17 12:22:34 -04:00
Jesse Zoldak
f0b7850de3 Merge pull request #5609 from edx/zoldak/remove-tmp-references 
Remove references to /tmp in tests
 2014-10-17 12:12:53 -04:00
Waqas Khalid
3974e6d95f Merge pull request #5562 from mlkwaqas/waqas/tnl526-search-magnify-glass-not-working 
Clicking the magnifying glass should perform search
 2014-10-17 20:03:36 +05:00
Ben Patterson
9745b953bc Merge pull request #5597 from edx/benp/doc-paver-changes 
Doc for paver quality switches.
 2014-10-17 10:57:54 -04:00
Alison Hodges
a08e2ee232 Open source rename child-id 2014-10-17 10:52:03 -04:00
Christina Roberts
2ae3fd0a08 Merge pull request #5589 from edx/christina/tnl-399-remove-save 
Do not save an xblock after rendering the Studio view.
 2014-10-17 10:37:47 -04:00
Sarina Canelake
d1f256af29 Merge pull request #5566 from Kelketek/lazy_coursemode_translation 
Lazy loading of CourseMode model's internationalization.
 2014-10-17 10:26:05 -04:00
Jesse Zoldak
24f90307f7 Remove references to /tmp in tests 
Including:

* Change path for mongo_metadata_inheritance to use unique temp dir
* Update SASS_CACHE_PATH with thread-safe temp dir
* Remove hard coded directory reference for grades download tests
* Remove hard coded directory reference for direct mongo test
 2014-10-17 10:00:12 -04:00
Waqas Khalid
ff8b281f5b Clicking the magnifying glass should perform search 
In forum search is only working when user enter some
text in the search textfield and press the Enter
button. It should also work when we click on
magnifying glass.

TNL-526
 2014-10-17 18:34:57 +05:00
cahrens
d3012af733 Do not save an xblock after rendering the Studio view. 
TNL-399

Content and settings are no longer saved when Studio view is rendered.
 2014-10-17 09:29:32 -04:00
Adam
5511aba23e Merge pull request #5471 from edx/adam/thumbnail-extentions 
image files with different extensions should generate thumbnails with di...
 2014-10-17 09:18:06 -04:00
Adam
53c48024a8 Merge pull request #5599 from edx/adam/fix-matlab-invalid-char 
gracefully fail when parsing xml with non-compatible string (TNL-347)
 2014-10-17 09:14:21 -04:00
Waheed Ahmed
9d57599097 Merge pull request #5587 from edx/waheed/tnl617-fix-cc-button-in-ie 
Fixed CC button in internet explorer.
 2014-10-17 13:51:36 +05:00
Louis Pilfold
16ed497497 Use box-sizing SCSS mixin rather than property 2014-10-17 09:09:19 +01:00
Waheed Ahmed
16566684c9 Fixed CC button in internet explorer. 
TNL-617
 2014-10-17 12:23:27 +05:00
Ben Patterson
5703adb722 Merge branch 'release' 
Includes rc/2014-10-14
 2014-10-16 20:11:55 -04:00