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

4241 Commits

Author SHA1 Message Date
Will Daly
fabd8a97ad Fix validation for checkboxes in forms. 
Remove hard-coded TOS checkbox in registration template.
Disable new dashboard in settings; expose password reset end-point in student account app.
Added empty JS tests for new JavaScript
 2014-10-21 07:29:46 -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
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
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
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
frances botsford
b9c37120b3 Merge pull request #2682 from edx/frances/experiments/rtl 
RTL platform support
 2014-10-17 15:22:36 -04:00
Frances Botsford
e255ac1f29 Initial pass at LMS and Studio RTL 2014-10-17 13:51:42 -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
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
Ben Patterson
5703adb722 Merge branch 'release' 
Includes rc/2014-10-14
 2014-10-16 20:11:55 -04:00
Christina Roberts
f7ef9eb511 Merge pull request #5510 from edx/christina/bug-tnl-543 
Pass group_id when getting user thread and comment counts.
 2014-10-16 16:03:22 -04:00
cahrens
7133cfc150 Pass group_id when getting user thread and comment counts. 
Depends on cs_comments_serivce commit ea218a2b038b59e63fd6593b5598db90223636e1.

TNL-543
 2014-10-16 14:32:10 -04:00
Will Daly
e89afa93c0 WIP: add login and registration end-points to the user API. 2014-10-16 08:48:38 -04:00
Daniel Friedman
64d2514f2c Merge pull request #5528 from edx/dan-f/data-download-tech-debt 
Student profile CSV background task tech debt
 2014-10-15 16:54:41 -04:00
Daniel Friedman
37158bab1f Create standard way of updating a task's progress 
TNL-566
 2014-10-15 15:58:08 -04:00
Nimisha Asthagiri
e0f9def061 Merge pull request #5584 from edx/nimisha/val/MA-81 
MA-81 Honor video download setting with VAL-enabled videos.
 2014-10-15 10:10:13 -04:00
Nimisha Asthagiri
5355b4b96e MA-81 Honor video download setting with VAL-enabled videos. 2014-10-14 22:32:16 -04:00
jsa
786fc806f5 Add topic selection to inline thread editing, fixing errors 
Co-Authored-By: Brian Talbot <btalbot@edx.org>

TNL-549
 2014-10-14 15:45:19 -04:00
Renzo Lucioni
257e8cf857 Merge pull request #5551 from edx/renzo/track-selection-test-cleanup 
Clean up after track selection experiment
 2014-10-14 15:06:19 -04:00
Daniel Friedman
1b03534b55 Rename upload_*_to_s3 to no longer reference s3 
TNL-534
 2014-10-14 14:31:11 -04:00
Renzo Lucioni
bd7715a393 Clean up after track selection experiment 2014-10-14 13:56:49 -04:00
Sarina Canelake
35f9fc595e Merge pull request #5423 from mitocw/bdero/fix-gitlog-focused-error 
Added handling in gitlog template for missing import logs
 2014-10-10 16:08:15 -04:00
Brandon DeRosier
c571a2a029 Added handling in gitlog for missing import logs 
Fixes a template error that occurs when viewing a course's detailed
git import log. The problem happens for courses imported using methods
other than the `git_add_course` command.
 2014-10-10 10:41:06 -04:00
Braden MacDonald
a8f622af7f Consistently ensure dog_stats_api tags are formatted correctly 2014-10-09 12:35:26 -07:00
Andy Armstrong
03b41032ae Merge pull request #5501 from edx/andya/disable-cohorts-ui-bug 
Don't show cohort information when disabled
 2014-10-09 12:55:07 -04:00
brianhw
b719c074bc Merge pull request #5517 from edx/brian/fix_export_course 
Make sure temporary course directory uses safe characters.
 2014-10-09 12:20:09 -04:00
Nimisha Asthagiri
b78bb976cc Merge pull request #5531 from edx/release 
Merge Release
 2014-10-09 09:58:51 -04:00
Renzo Lucioni
37625e8e29 Merge pull request #5515 from edx/renzo/language-backbone 
Use Backbone for student account and profile JS.
 2014-10-09 09:50:40 -04:00
Waqas Khalid
c2ecaa7e30 Forum shouldn't cuase error while searching unicode 
If we use unicode character in the search of forum
it will cuase the error which is not the desired
behavior it should check and return result.

TNL-336
 2014-10-09 14:40:06 +05:00
Renzo Lucioni
00d976b85d Use Backbone for student account and profile JS. 
Validate student account and profile form fields. Use RequireJS for Jasmine tests of account and profile JS.
 2014-10-08 15:50:13 -04:00
Andy Armstrong
3af9eb25b2 Minor cleanups 2014-10-08 15:14:17 -04:00
Andy Armstrong
fbeb57874c Address code review comments 2014-10-08 15:14:16 -04:00
Andy Armstrong
6114cf05f4 Don't show cohort information when disabled 
TNL-552
 2014-10-08 15:14:16 -04:00
Daniel Friedman
736ed94064 Fix unicode-related failures in CSV upload. 
TNL-586
 2014-10-08 13:21:00 -04:00
Chris Dodge
1809a28b89 Add the ability for Microsites to be able to send appropriately branded emails rather than the default system installed version 
fix tests. Update Admin views/forms.

enforce uniqueness constraint in the Admin ModelForm submissions

Update bok_choy cached DBs with new schema changes

PR feedback
 2014-10-08 13:04:41 -04:00
Brian Wilson
61c2b96a4a Only permit ascii characters in filenames generated from course_ids. 2014-10-08 11:43:07 -04:00
Will Daly
2d50cad0a1 Update donation text in email and receipt page 2014-10-08 06:15:11 -04:00
Will Daly
c4eee8ebc3 Merge pull request #5502 from edx/will/per-course-donation-button 
Add donation button to the enrollment success message
 2014-10-08 06:05:37 -04:00
Brian Wilson
e26b86de60 Make sure temporary course directory uses safe characters. 2014-10-07 22:28:00 -04:00
Nimisha Asthagiri
12f5d52b60 merge branch 'release' fix. 2014-10-07 16:32:16 -04:00
Nimisha Asthagiri
d7f850a764 Merge branch 'release' 
Conflicts:
	lms/djangoapps/instructor/features/data_download.py
 2014-10-07 16:23:28 -04:00
Calen Pennington
f47a5e1b68 Merge pull request #5498 from edx/jeskew/split_fix_auto_auth 
Optimize LMS views for Split courses.
 2014-10-07 16:02:31 -04:00
Will Daly
f8365a2d3b Add donation end-point 
Make donations configurable

Added donation button to dashboard

Generalize merchant defined data for payment processor
 2014-10-07 14:22:55 -04:00
stephensanchez
afaaca969a Adding new styles for dashboard notifications. 
Change the reverification failure message styling.

Changing templates so new styles do not appear in courseware.

Removing unused aria tag.

PR comments on cleaning up SASS

Fix signup LMS test.

Copy changes per review on PR

Updating based on PR comments

Style and HTML changes for notifications
 2014-10-07 15:44:47 +00:00
Will Daly
8d60a8b4ec Merge pull request #5482 from edx/will/cybersource-donations 
CyberSource donations (back-end)
 2014-10-07 07:57:58 -04:00
John Eskew
18822bdb4e Wrap course info and dashboard in bulk ops wrapper to reduce Mongo calls. 2014-10-06 16:53:11 -04:00
Don Mitchell
0ed4ee32eb Use bulk operations on get_course_by_id and courseware 2014-10-06 16:53:10 -04:00
John Eskew
c4dc7376ad Add bulk_operations() wrapper around course progress view. 2014-10-06 16:53:10 -04:00