Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
21,441 Commits 1 Branch 0 Tags
8ff3b4e58d1eb8f3ec472fddbc2ed737818cd3ee
Commit Graph

7578 Commits

Author SHA1 Message Date
Adam
c9a4de607d Merge pull request #2694 from edx/adam/announcement-text 
minor change to html in announcement unit (STUD-1334)
 2014-02-24 15:55:14 -05:00
Alexander Kryklia
25407ef3e7 BLD-642: Allow multiple transcripts with video. 2014-02-24 21:57:08 +02:00
Don Mitchell
0b262e7cea Merge pull request #2660 from edx/dbarch/parse_course_id 
Dbarch/parse course
 2014-02-24 13:24:00 -05:00
Don Mitchell
81a92e4bfc Consolidate course_id triple parsing 2014-02-24 11:45:59 -05:00
Jay Zoldak
e4b6fe2c68 Merge pull request #2695 from edx/will/revert-paver-again 
Revert "Fix sys.path manipulation in pavement.py, with detailed comment"
 2014-02-24 11:31:26 -05:00
Will Daly
812e71bbbb Revert "Fix sys.path manipulation in pavement.py, with detailed comment" 
This reverts commit 544616be4b.
 2014-02-24 11:30:40 -05:00
Adam Palay
2e58e80a68 minor change to html in announcement unit (STUD-1334) 2014-02-24 10:34:44 -05:00
Ned Batchelder
b21473f976 Make fake_ugettext et al more usable elsewhere. 2014-02-24 10:06:13 -05:00
Ned Batchelder
6bb0eee3c6 Make the i18n service available everywhere. 
To get all dates localized, we need all runtimes to have the i18n
service, and since runtimes are made by the modulestores, we need to
pass it to them.

Soon (fingers crossed), modulestores won't be involved in making
runtimes, and many of these changes will go away.
 2014-02-24 10:06:13 -05:00
Will Daly
38d403f6c9 Merge pull request #2615 from edx/will/paver-attempt-2 
Paver (Part 1) -- Attempt 2
 2014-02-24 07:51:05 -05:00
Jim Abramson
e3a71b1625 Merge pull request #2646 from edx/jsa/forum-delete-comments 
add ability to delete comments on responses in discussions.
 2014-02-22 19:14:59 -05:00
Valera Rozuvan
e0aa30f06f Merge pull request #2616 from edx/valera/convert_time_to_js 
Converting Time module to JS.
 2014-02-22 20:41:39 +02:00
Carson Gee
2da1e4ee26 Merge pull request #2674 from carsongee/cg/ssl_remove_password 
Remove SSL Certifcate auth reliance on internal password
 2014-02-21 17:04:55 -05:00
Calen Pennington
9b54e44be8 Merge pull request #2602 from cpennington/xblock-acid-child-tests 
Add tests of the frontend children api using the AcidXBlock
 2014-02-21 16:07:23 -05:00
Carson Gee
3303fb120b Review fixes 2014-02-21 16:01:01 -05:00
Calen Pennington
dbc99ef8ad Implement children for pure XBlocks in edx-platform 
This requires fixing the javascript api implementation, and adding
an implementation of get_block to the ModuleSystem api.

However, the implementation is incomplete, due to mismatches between
the expectations of XModule and XBlock.

Also adds tests using the Acid block to make sure that the javascript
and python apis for children are working correctly.
 2014-02-21 15:01:20 -05:00
Calen Pennington
3093efc889 Make bok-choy correctly publish units with children 2014-02-21 15:00:32 -05:00
Carson Gee
082f20db60 Remove SSL Certifcate auth reliance on internal password 2014-02-21 12:19:59 -05:00
Valera Rozuvan
1107aa2b7f Fix bug multiple choice with video. BLD-788. 
The Video element contains an input with type file. When the
Check button was clicked for the multiple choice problem, the
code was acting in different ways when there as a Video on the
page and when there wasn't. This is because in the check_fd()
method there was a selector that was looking for inputs of type
file on the whole page instead of just in the current problem.
When there was a Video pn the page, the page-wide selector
returned the Video's file input, and the check_fd() method
went on believing that the multiple choice has a file input.

The correct way is to look for file inputs only in the current
element.

Added a Jasmine JavaScript unit test.

BLD-788.
 2014-02-21 08:48:43 +00:00
Valera Rozuvan
2dbc5a4115 Converting Time module to JS. 2014-02-21 08:37:38 +00:00
Will Daly
92d4726b63 Merge pull request #2639 from edx/will/bok-choy-test-robustness 
Will/bok choy test robustness
 2014-02-20 16:59:30 -05:00
Will Daly
defbd87468 Protect Acid XBlock test from stale element or zero-length locator list 2014-02-20 16:19:43 -05:00
jsa
7d32a90ae2 add ability to delete comments on responses in discussions. 2014-02-20 13:14:11 -05:00
zubair-arbi
603f36959d Merge pull request #2423 from edx/zub/story/std1133-studioedgelogin 
try to get courses by django groups for non global users
 2014-02-20 21:18:05 +05:00
zubiar-arbi
6892bc73b2 get courses by reversing django groups for non global users (studio dashboard) 
STUD-1133
 2014-02-20 20:23:12 +05:00
Don Mitchell
2057f5185c Merge pull request #2631 from edx/dbarch/xml_ms_filter 
Have xml modulestore only load course in course_ids if provided
 2014-02-20 10:22:39 -05:00
Don Mitchell
24bc33a882 Have xml modulestore only load course in course_ids if provided 2014-02-19 12:05:38 -05:00
David Baumgold
549fbe4815 Rollback Django Debug Toolbar from 1.0.1 to 0.9.4 
Due to issues with require.js and the latest version of the toolbar.
Also included a note in the requirements file explaining the situation, and what
needs to happen before this can be upgrade properly.
 2014-02-19 11:41:12 -05:00
Ned Batchelder
3aff96c2e4 Add strftime to the i18n runtime service. 2014-02-18 17:35:56 -05:00
Ned Batchelder
be17006022 Use strftime_localized for dates. 2014-02-18 17:35:56 -05:00
Ned Batchelder
66e598b75d Add strftime_localized function, not called yet. 2014-02-18 17:35:56 -05:00
Ned Batchelder
229f3522fa Move date_utils to common/djangoapps/util 2014-02-18 17:35:56 -05:00
Julia Hansbrough
8fbeeeeb02 Disable flakey language change acceptance tests 2014-02-18 21:16:43 +00:00
Will Daly
544616be4b Fix sys.path manipulation in pavement.py, with detailed comment 
Restore reverted changes from paver part 1
 2014-02-18 15:09:07 -05:00
Will Daly
331fbcd585 Merge pull request #2612 from edx/will/fix-xqueue-stub-test 
Fixed intermittent failure in XQueue stub unit test
 2014-02-18 14:59:06 -05:00
Dave St.Germain
3d08bfd208 Fixes devstack settings to work with new version of debug toolbar 2014-02-18 14:50:36 -05:00
Adam
7b3376f944 Merge pull request #2575 from edx/adam/i18n-self-assessment-2 
Adam/i18n self assessment 2
 2014-02-18 09:07:24 -05:00
Alexander Kryklia
23a2177da3 Enable download_track for existing courses if self.track. 2014-02-18 12:31:06 +02:00
Julia Hansbrough
64f1cae64b Merge pull request #2419 from edx/talbs/lms-languagemenu 
LMS: Adds Language Selection Menu
 2014-02-14 18:32:12 -05:00
thedeadparrot
ff0a6fb778 Update cms urls for language preferences 2014-02-14 22:35:14 +00:00
Julia Hansbrough
05537540d1 Fix acceptance tests 
Fixed bok-choy acceptance tests
 2014-02-14 22:35:14 +00:00
thedeadparrot
b61649f9eb Refactor out new lang_pref djangoapp 2014-02-14 22:35:14 +00:00
Julia Hansbrough
efe7bdacfc Fixed broken acceptance tests 2014-02-14 22:35:13 +00:00
thedeadparrot
afdd8d68cb Better dashboard display behavior 
* Don't show sidebar if only one language is present
* only add in the default language code if it's not already present
 2014-02-14 22:35:13 +00:00
thedeadparrot
f6e14e62b5 Change setlang url 2014-02-14 22:35:12 +00:00
thedeadparrot
7e38c3ad6b Use a given default for getting a preference 2014-02-14 22:35:12 +00:00
thedeadparrot
48686793d7 Clean up tests. 2014-02-14 22:35:12 +00:00
Diana Huang
a07d243fdb Clean up the display and dialog to use user preferences 
instead of the current language.
 2014-02-14 22:35:11 +00:00
Diana Huang
e94b1a5cfa If we run into issues with languages, use default 2014-02-14 22:35:10 +00:00
Diana Huang
be189e607e Store user preferences for languages 
Also, refactor tests such that we're not deleting users or prefs
 2014-02-14 22:35:07 +00:00