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

9184 Commits

Author SHA1 Message Date
Will Daly
e89afa93c0 WIP: add login and registration end-points to the user API. 2014-10-16 08:48:38 -04:00
Will Daly
8061336102 Move user_service into user_api/api 2014-10-14 07:38:10 -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
Sarina Canelake
02bfe039fd Merge pull request #5431 from open-craft/datadog-wrapper 
Consistently wrap the DataDog API to prevent logged errors & missing stats data
 2014-10-10 14:59:38 -04:00
Don Mitchell
f4b2789f54 Merge pull request #5288 from edx/split/info_perf 
Upgrade pymongo
 2014-10-10 12:55:38 -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
Don Mitchell
a63d58cff5 Remove unused credentials from mongo init 
was breaking pymongo 2.7
 2014-10-09 11:55:14 -04:00
David Baumgold
fc5148438d Merge pull request #4730 from edx-solutions/secure-cookies 
secure-cookies: Allow to use secure HTTPS cookies (Django setting)
 2014-10-09 10:24:34 -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
Stephen Sanchez
7802c1ed2c Merge pull request #5526 from edx/sanchez/style-donation-button 
Adding new styles to the new donation button.
 2014-10-09 08:53:01 -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
stephensanchez
12ffe18085 Pull Request comments addressed. Tests fixed. 2014-10-08 21:26:09 +00: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
stephensanchez
0c6b3ba0c1 Changing the default value from 25.00 to 25 2014-10-08 19:48:14 +00:00
stephensanchez
4d68738c38 Adding new styles to the new donation button. 2014-10-08 19:34:25 +00: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
Will Daly
d1b3e8e07a Merge pull request #5520 from edx/will/update-donation-text 
Update donation text in email and receipt page
 2014-10-08 13:45:55 -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
Calen Pennington
2690f7847d Fix typo in #5392 (encodeURICoponont) 2014-10-08 13:03:05 -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
900122b907 Use UglifyJS to minify JavaScript in the LMS 2014-10-08 09:16:04 -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
jmclaus
2196461d0d Changed default post type to discussion. 2014-10-07 14:16:22 +02: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
Calen Pennington
5eaac26c0b Fix typo in #5392 (encodeURICoponont) 2014-10-06 14:12:46 -04:00
Carlos Andrés Rocha
b9cfd7b6e0 Merge pull request #5486 from rocha/list-all-visible-courses 
Use all courses during OAut2/OpenID Connect
 2014-10-06 11:16:15 -04:00
Adam Palay
58cb716102 remove role="application" from problems (TNL-563) 
Committer: Adam Palay <adam@edx.org>
 2014-10-06 09:11:55 -04:00
Tim Babych
22e8e9da96 Merge pull request #5483 from edx/anton/fix-forum-edit-thread-rc 
TNL-549: Fix thread editing.
 2014-10-04 00:35:23 +03:00
polesye
f039341d21 TNL-549: Fix thread editing. 2014-10-03 23:27:15 +03:00
Greg Price
cff8e16de3 fixup! Make notifier API resilient to bad enrollments 
Add explicit course key to enrollment for non-existent course in test case
 2014-10-03 14:40:37 -04:00
Will Daly
26bcfe5869 Create Donation order item 
Add tax-deductible messaging to the confirmation email and receipt pages.
Update receipt page to make the course URL optional
 2014-10-03 14:35:21 -04:00
Greg Price
7e98434218 Make notifier API resilient to bad enrollments 
Previously, the user endpoint would would return 404 for any request
involving a user having an enrollment for a course that no longer
existed.
 2014-10-03 14:21:09 -04:00
Carlos Andrés Rocha
9cd26e551a List all courses during OAut2/OpenID Connect 
Previously, only courses respective to the branded instance were returned.

AN-3610
 2014-10-03 14:15:41 -04:00