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

26228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Sanchez
fb31932bb6 Merge pull request #5546 from edx/sanchez/update_default_donation_amount 
Changing default donation amount
 2014-10-10 12:18:04 -04:00
Stephen Sanchez
c578302f73 Changing default donation amount 2014-10-10 09:51:40 -04:00
Gabe Mulley
e2fbc09d9d Merge pull request #5527 from mulby/tweak-segment-io-endpoint 
Small changes to the segment.io event handler
 2014-10-09 14:11:34 -04:00
srpearce
bcde4ee574 Merge pull request #5537 from edx/sylvia/docs/relnotes10-7 
Updates 10-7 release notes
 2014-10-09 13:48:32 -04:00
Sylvia Pearce
76499563dd Updates 10-7 release notes 2014-10-09 13:47:45 -04:00
Gabe Mulley
5643101ad1 Small changes to the segment.io event handler 2014-10-09 13:25:20 -04: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
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
5f73c178b8 Merge pull request #5418 from mlkwaqas/waqas/tnl336-forum-search-unicode-error 
Forum shouldn't cuase error while searching unicode
 2014-10-09 15:55:48 +05: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
Oleg Marshev
d2c3e1ebca Merge pull request #5496 from edx/oleg/lms-har-generate 
Generate HAR Files for LMS
 2014-10-09 12:09:21 +03:00
Nimisha Asthagiri
4b122f31ca Merge pull request #5523 from edx/hotfix/2014-10-08 
Hotfix for 2014-10-08
 2014-10-08 21:27:43 -04: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
Diana Huang
4fc34dddaf Merge pull request #5503 from edx/diana/reorder-dashboard-courses 
Sort course and enrollment pairs on dashboard
 2014-10-08 15:05:40 -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
Adam
7f66901508 Merge pull request #5524 from edx/dan-f/fix-student-profile-csv-unicode-2 
Fix unicode-related failures in CSV upload.
 2014-10-08 13:36:52 -04:00
Diana Huang
fbc896af8c Sort course and enrollment pairs on dashboard 2014-10-08 13:26:19 -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
Will Daly
85a31bc325 Merge pull request #5521 from edx/will/minify-js 
Use UglifyJS to minify JavaScript in the LMS
 2014-10-08 12:24:17 -04:00
Brian Wilson
61c2b96a4a Only permit ascii characters in filenames generated from course_ids. 2014-10-08 11:43:07 -04:00
Mark Hoeber
56d51c4f75 Merge pull request #5513 from edx/markhoeber-remove-xml-tutorial 
Removed XML information from Researchers Guide
 2014-10-08 10:30:15 -04:00
Mark Hoeber
a00c0f9971 Removed XML information from Researchers Guide and added files to OLX 
removed old comment
 2014-10-08 10:29:40 -04:00
Oleg Marshev
031b3581df Add LMS Performance tests (TNL-484). 2014-10-08 17:08:12 +03: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
Don Mitchell
2ebed452ff Merge pull request #5505 from edx/dhm/import_bug 
Video module must handle xml attrs
 2014-10-07 17:44:15 -04:00
Don Mitchell
2180cb6572 Unit test for video xml parsing 
handling unknown xml attrs.
 2014-10-07 17:03:53 -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
John Eskew
13a7365bb8 Merge pull request #5509 from edx/jeskew/remove_unused_jquery 
Remove unused jQuery code. - LMS-11481
 2014-10-07 15:47:48 -04:00
srpearce
ff7ab24bfe Merge pull request #5512 from edx/sylvia/docs/relnotes_10-7 
Edits to release notes
 2014-10-07 15:16:24 -04:00
Sylvia Pearce
c8894c41a2 Edits to release notes 2014-10-07 15:15:49 -04:00
srpearce
2c1a93255b Merge pull request #5511 from edx/revert-5500-sylvia/docs/relnotes_10-7 
Revert "Draft of release notes for 10-7"
 2014-10-07 15:10:57 -04:00
John Eskew
5e3e366147 Remove unused jQuery code. - LMS-11481 2014-10-07 15:02:18 -04:00
Jesse Zoldak
401e72ae19 Merge pull request #5504 from edx/zoldak/lower-pep8-threshold 
Lower the pep8 threshold for failing builds
 2014-10-07 14:47:35 -04:00