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

26189 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Don Mitchell
2959186704 Video module must handle xml attrs 
LMS-11491
 2014-10-07 14:29:18 -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
srpearce
263f47b2ef Revert "Draft of release notes for 10-7" 2014-10-07 14:17:14 -04:00
srpearce
5711980580 Merge pull request #5500 from edx/sylvia/docs/relnotes_10-7 
Draft of release notes for 10-7
 2014-10-07 14:16:07 -04:00
Sylvia Pearce
7ee4ac5a36 Release notes for 10-7 2014-10-07 14:15:44 -04:00
Don Mitchell
eb33f0e0eb Cons up new dict to not hurt cached value 2014-10-07 13:48:27 -04:00
John Eskew
41d4b1286f Add tests for Split course keys and CourseLocators 2014-10-07 13:48:27 -04:00
Don Mitchell
c58e68813c Cache modules in split bulk ops 2014-10-07 13:48:27 -04:00
Mark Hoeber
c6e16c921c Merge pull request #5506 from edx/revert-5440-markhoeber-doc1060 
Revert "Update to use UTC time in course dates"
 2014-10-07 13:37:49 -04:00
Mark Hoeber
3aba8d4656 Revert "Update to use UTC time in course dates" 2014-10-07 13:34:23 -04:00
Stephen Sanchez
743326d26b Merge pull request #5497 from edx/sanchez/update-message-styles 
Adding new styles for dashboard notifications.
 2014-10-07 13:29:39 -04:00
Jesse Zoldak
d93fa17563 Lower the pep8 threshold for failing builds 2014-10-07 12:10:47 -04:00
Mark Hoeber
1c2913dc8f Merge pull request #5440 from edx/markhoeber-doc1060 
Update to use UTC time in course dates
 2014-10-07 11:49:14 -04:00
Mark Hoeber
8680d6ce44 Update to use UTC time in course dates 2014-10-07 11:48:24 -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
Jesse Zoldak
f34b57ad45 Merge pull request #5485 from edx/zoldak/disable-flaky-js-tests 
Disable flaky JS FileUploader SystemFeedback and NotificationView tests
 2014-10-07 10:29:23 -04:00
Alison Hodges
3ec1309ccc Merge pull request #5493 from edx/ahodges/doc/nochanges 
Consequences of changing configuration
 2014-10-07 10:11:20 -04:00
Alison Hodges
7b3510c52d Consequences of changing configuration 2014-10-07 10:11:02 -04:00
Alison Hodges
f4873e8f6c Merge pull request #5492 from edx/ahodges/doc/cohort_discuss 
Info for moderators
 2014-10-07 09:54:10 -04:00
Alison Hodges
faeb7378c0 Info for moderators 2014-10-07 09:53:49 -04:00
jmclaus
31d26e7b88 Merge pull request #5480 from edx/jmclaus/change-default-post-to-discussion 
Changed default post type to discussion.
 2014-10-07 15:32:01 +02: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
Don Mitchell
0c795934c3 Don't fetch python libs if there's no python code 
in the capa problem.
 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
John Eskew
c8898b0afc Use: 
CourseLocator.from_string()
instead of:
	SlashSeparatedCourseKey.from_deprecated_string()
to construct the course_key for which the auto-created user is registered.
 2014-10-06 16:53:10 -04:00
Nimisha Asthagiri
07d0d74f26 Merge pull request #5499 from cpennington/cale/fix-js-typo 
Fix typo in #5392 (encodeURICoponont)
 2014-10-06 15:44:38 -04:00
Calen Pennington
5eaac26c0b Fix typo in #5392 (encodeURICoponont) 2014-10-06 14:12:46 -04:00
David Baumgold
324a1da60c Merge pull request #5474 from edx/openedx-jira-reference 
Reformat seq_module.py
 2014-10-06 13:01:12 -04:00
David Baumgold
6f47e5d4e9 Reformat seq_module.py 2014-10-06 12:55:35 -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
Nimisha Asthagiri
b513d07e98 Merge pull request #5495 from edx/patch/remove-application-role 
remove role="application" from problems (TNL-563)
 2014-10-06 10:15:31 -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
Alison Hodges
5c82d6eabc Merge pull request #5327 from edx/ahodges/doc/cohorts 
Ahodges/doc/cohorts
 2014-10-03 17:39:28 -04:00
Alison Hodges
e0f3004f8d Overview and configuration for cohorts feature 2014-10-03 17:39:05 -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