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

9533 Commits

Author SHA1 Message Date
Calen Pennington
4d653d5359 Set xmodule_runtime on all XModule-like things (including pure XBlocks using the XModuleMixin) 
Expose xmodule_runtime as .runtime if it's set (otherwise, fall back to
the supplied runtime). This causes all blocks to act like XModules when
they have a ModuleSystem, and like XModuleDescriptors if they only have
a DescriptorSystem.
 2014-10-16 09:09:20 -04:00
Calen Pennington
41f3c040c8 Add block type to the available attributes in the xblock javascript frontend 2014-10-16 09:08:57 -04:00
Calen Pennington
4a43427c6d Add block.name to xblock javascript frontend 2014-10-16 09:08:57 -04:00
Calen Pennington
47a3172bf1 Enable parent/child tests using the acid XBlock. 
Also fix those tests to correctly wait until the ajax portions have
finished before evaluating the page contents.
 2014-10-16 09:08:54 -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
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
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
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
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
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
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
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
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
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
Adam Palay
58cb716102 remove role="application" from problems (TNL-563) 
Committer: Adam Palay <adam@edx.org>
 2014-10-06 09:11:55 -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
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
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
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
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
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
3bfe09b821 Fixed incorrect relative time value in time.js. 
TNL-157
 2014-10-03 15:37:46 +05:00
Oleg Marshev
f020d1c584 Show date and time on Schedules and Details in UTC (TNL-85). 2014-10-03 11:17:00 +03:00
Waqas Khalid
89e89d2a3b Merge pull request #5467 from mlkwaqas/waqas/forum-typo-thread-show 
Additional dollar sign in template
 2014-10-03 13:03:52 +05:00
Christina Roberts
5d7b5228f7 Merge pull request #5464 from edx/christina/js-coverage 
Don't put all of xmodule_js as src (changes coverage metrics).
 2014-10-02 17:14:18 -04:00
Piotr Mitros
54731383be Merge pull request #4003 from edx/pmitros/fix-sequential-none 
Fix case where DB gets populated with string None
 2014-10-02 15:09:26 -04:00
cahrens
2286366c90 Remove unused files, add missing spec file. 2014-10-02 15:05:17 -04:00
Waqas Khalid
46abd26e20 Remove extraneous dollar sign in template 2014-10-02 23:28:17 +05:00
Don Mitchell
d723425a83 Fix cached definition change detection 
LMS-11485
 2014-10-02 14:22:07 -04:00
Andy Armstrong
7be11b47da Address PR review comments 2014-10-02 13:07:58 -04:00
David Baumgold
9c81004fc7 Remove test cleanups 
Since `ddt` should make them unnecessary
 2014-10-02 12:18:16 -04:00
David Baumgold
62fcc6f23a Use ddt for shib tests 2014-10-02 12:18:15 -04:00
Andy Armstrong
ba491195e6 Update final text strings & readthedoc URL 
TNL-401
 2014-10-02 11:54:23 -04:00
Usman Khalid
4e796c575a Merge pull request #5366 from edx/usman/tnl367-transaction-level-decorator 
MySQL transaction isolation level decorator.
 2014-10-02 19:16:46 +05:00
Stephen Sanchez
aba57382ab Merge pull request #5420 from edx/sanchez/enrollment-success-message 
Add new enrollment message to the dashboard
 2014-10-02 09:59:39 -04:00
Jesse Zoldak
8b95cb4840 Merge pull request #5459 from edx/zoldak/quiet-stevedore 
Quiet stevedore.extension logging in bok-choy tests
 2014-10-02 09:24:21 -04:00
Adam
ca13e9aa50 Merge pull request #5424 from edx/adam/change-discussion-blackout-wording 
update discussion blackout setting warning (TNL-442)
 2014-10-02 09:12:09 -04:00
Stephen Sanchez
bf112f7ef0 Add new enrollment message to the dashboard 
The body of the enrollment message template

Tokenize platform name in message.

Changing to a datetime enrollment approach

Adding sorting. A little refactoring.

Adding confguration model for time delta

Adding admin registration and basic form for new config model.

Fixing docstring typo

Updating default time delta to 0, adding test to show it disabled functionality.

Removing the form from configuration and tweaking the enrollment message html
 2014-10-02 12:32:35 +00:00
David Baumgold
b6ed821978 Merge pull request #5457 from edx/kill-DISABLE_RESET_EMAIL_TEST-flag 
Kill DISABLE_RESET_EMAIL_TEST flag
 2014-10-01 14:16:04 -04:00
Adam
db82d45681 Merge pull request #5461 from edx/release 
Release
 2014-10-01 13:14:20 -04:00