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

26516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sylvia Pearce
e29818b102 Add MIT and Delft courses to available course list 2014-10-06 11:16:36 -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
polesye
f039341d21 TNL-549: Fix thread editing. 2014-10-03 23:27:15 +03:00
Greg Price
5041335a7a Merge pull request #5488 from edx/gprice/cohort-events-doc 
Add documentation for cohort events
 2014-10-03 16:22:31 -04:00
Greg Price
5ab2a90d79 Merge pull request #5489 from edx/gprice/notifier-api-bogus-enrollment 
Make notifier API resilient to bad enrollments
 2014-10-03 15:32:49 -04: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
brianhw
0e46eebf73 Merge pull request #5478 from edx/brian/fix-user-track 
Add _get_request_value to safely access request.REQUEST for browser events.
 2014-10-03 14:28:12 -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
David Baumgold
376c111169 Merge pull request #5111 from edx/shib-tests-ddt 
Use ddt for shib tests
 2014-10-03 14:18:46 -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
jmclaus
588979d5e5 Merge pull request #5308 from edx/jmclaus/forum-thread-type 
Change the thread type of a previously posted post. [TNL-172]
 2014-10-03 19:53:37 +02:00
Greg Price
690a6c0d1e fixup! Add documentation for cohort events 
Reword description of auto vs. manual creation of cohorts and user
addition to cohorts.
 2014-10-03 13:32:35 -04:00
Don Mitchell
e270196f51 Merge pull request #5419 from edx/split/acceptance_split 
Get acceptance tests to run on split
 2014-10-03 13:24:16 -04:00
Greg Price
745218f31e Add documentation for cohort events 2014-10-03 13:07:37 -04:00
Greg Price
62b840c5a5 Merge pull request #5463 from edx/gprice/cohort-events-take2 
Cohort events
 2014-10-03 13:06:52 -04:00
jmclaus
c2716d470c TNL-172: Change type of a previously posted post. IMPORTANT: this commit depends on commit 774887b in cs_comments_service. 2014-10-03 18:29:25 +02:00
Brian Wilson
0eb190fc61 Add _get_request_value to safely access request.REQUEST for browser events. 2014-10-03 11:45:08 -04:00
Greg Price
183d688129 Add events for cohort modifications 
This includes cohort creation/deletion and membership changes.
 2014-10-03 11:32:43 -04:00
Greg Price
606ad7ab26 Remove dead code 2014-10-03 11:32:42 -04:00
Greg Price
c51e504e81 Add cohort information to forum search events 2014-10-03 11:32:41 -04:00
Greg Price
71bb506850 Fix error when doing non-ASCII forum search 
Fixes TNL-160
 2014-10-03 11:32:41 -04:00
Mark Hoeber
76a52acfea Merge pull request #5230 from edx/markhoeber-doc913 
WIP: edXML Doc Draft
 2014-10-03 11:19:44 -04:00
Mark Hoeber
f39a41ba40 Alpha OLX guide 2014-10-03 11:18:41 -04:00
Don Mitchell
4f795f8270 Fix hardcoded course urls 2014-10-03 10:56:00 -04:00
John Eskew
2a8529d37a Change email address detection in TinyMCE link plugin. 
- If link has a "@" and a ":", do not consider it an email address.
Add un-minified version of plugin.js file for link plugin.
Update build instructions to include media plugin.
Commit re-built minified JS.
Add all plugins to Jakefile.js in zip file.
Reason for this commit:
Split acceptance test was failing when TinyMCE detected a Split asset
key as an email address. Fix was to modify email address detection.
 2014-10-03 10:56:00 -04:00
Calen Pennington
139e10d9b8 Teach mongo_connection to retry read operations in the face of AutoReconnect errors 2014-10-03 10:55:59 -04:00
John Eskew
d4927de0f7 Remove unneeded import 2014-10-03 10:55:59 -04:00
Don Mitchell
8e67549484 Fix cms hardcoded keys 2014-10-03 10:55:59 -04:00
John Eskew
fd6c9bed28 Fix course export/updates and upload CMS acceptance tests. 2014-10-03 10:55:59 -04:00
Don Mitchell
edffa73512 Convert acceptance to opaque keys 2014-10-03 10:55:58 -04:00
Jesse Zoldak
9a8753d41e Disable flaky JS FileUploader SystemFeedback and NotificationView tests 
TNL-559
 2014-10-03 10:50:20 -04:00
Don Mitchell
785a3c823d Merge pull request #5469 from edx/split/content_update 
Fix cached definition change detection
 2014-10-03 09:16:01 -04:00
Waheed Ahmed
84e12bdfdf Merge pull request #5479 from edx/waheed/tnl157-fix-incorrect-relative-time 
Fixed incorrect relative time value.
 2014-10-03 16:32:00 +05:00
Waheed Ahmed
3bfe09b821 Fixed incorrect relative time value in time.js. 
TNL-157
 2014-10-03 15:37:46 +05:00
Oleg Marshev
536a815a28 Merge pull request #5433 from edx/oleg/fix-utc-time-studio-details 
Show date and time on Schedules and Details in UTC (TNL-85).
 2014-10-03 12:32:52 +03:00