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

7672 Commits

Author SHA1 Message Date
chrisndodge
663671ec4c Merge pull request #2534 from edx/jbau/fix-non-microsite-subdomain-branding-default 
fix non-microsite SUBDOMAIN_BRANDING defaults
 2014-02-25 19:30:45 -05:00
Calen Pennington
a2137cec35 Merge pull request #2603 from cpennington/xblock-acid-resources-test 
Add tests of local_resource_url
 2014-02-25 16:46:10 -05:00
Calen Pennington
9126777ed7 Add test of local_resource_url in AcidBlock 2014-02-25 14:01:37 -05:00
Giulio Gratta
35112e9e78 Variable-ize "Certificate of Achievement" text 2014-02-25 10:19:03 -08:00
Gabe Mulley
fe21f47573 Add module display name to module related server events 
This information will likely be used frequently for analytics purposes, so we would like to denormalize here to avoid having to join with the modulestore later.

Fixes: AN-594
 2014-02-25 11:53:36 -05:00
Adam Palay
8d2db05635 add i18n scraping to tabs.py (LMS-2166) 
add dummy strings
 2014-02-24 15:46:03 -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
Ned Batchelder
91c8df9bae Merge pull request #2659 from edx/ned/more-pervasive-date-l10n 
Make the i18n service available everywhere.
 2014-02-24 10:50:41 -05:00
Brian Talbot
0b2267df80 Merge pull request #2502 from ionis-education-group/tabindex-register 
Prevent from tabbing on tos and honor links in registration page
 2014-02-24 10:22:13 -05:00
Ned Batchelder
28e9ae0412 Tests of the localized start dates 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
Jay Zoldak
a620cc0004 Merge branch 'release' 
Conflicts:
	lms/templates/courseware/accordion.html
 2014-02-21 16:17:02 -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
Jason Bau
183d9bbb93 Use new setting for LMS deadline display instead TIME_ZONE 2014-02-21 10:20:06 -08:00
jsa
4c5336e809 django_comment_client: add unit test for (sub)comment deletion. 
JIRA: FOR-470
 2014-02-20 13:35:26 -05:00
jsa
7d32a90ae2 add ability to delete comments on responses in discussions. 2014-02-20 13:14:11 -05:00
Carson Gee
eecb7fab8b Merge pull request #2535 from edx/fix/ichuang/STUDENT_FILEUPLOAD_MAX_SIZE 
allow STUDENT_FILEUPLOAD_MAX_SIZE to be configured in aws.py
 2014-02-20 11:51:40 -05:00
Adam Palay
f1984e7a9f i18n open_ended_rubric (ORA-314) 
update strings
 2014-02-19 15:41:16 -05:00
David Baumgold
f375368caa 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.

Conflicts:
	lms/envs/dev.py
 2014-02-19 15:39:39 -05:00
David Baumgold
0deb47a4b1 Merge pull request #2640 from edx/db/rollback-djdt-again 
Rollback Django Debug Toolbar from 1.0.1 to 0.9.4
 2014-02-19 12:24:56 -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
Greg Price
e2d168d2fe Merge pull request #2624 from edx/gprice/test-edit-forum-comment 
Add unit test for updating forum comment
 2014-02-19 11:09:38 -05:00
Greg Price
c321ce50f6 Add unit test for updating forum comment 2014-02-18 17:37:03 -05:00
Ned Batchelder
3aff96c2e4 Add strftime to the i18n runtime service. 2014-02-18 17:35:56 -05:00
Ned Batchelder
64db0e78b5 Fix i18n errors found along the way. 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
Ned Batchelder
7fd9d44210 Remove unused import. 2014-02-18 17:35:56 -05:00
David Baumgold
4aca515a28 Forgot to update debug toolbar panels in two places 2014-02-18 16:13:07 -05: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
Dave St.Germain
3d08bfd208 Fixes devstack settings to work with new version of debug toolbar 2014-02-18 14:50:36 -05:00
David Baumgold
1e826996c7 Merge pull request #2391 from edx/yarko/debug-toolbar-v2 
fix partial work done for changes in django-debug-toolbar-1.0.1
 2014-02-18 12:56:28 -05:00
frances botsford
6b19d0d5f5 Merge pull request #2563 from edx/frances/fix/verified-ui-fixes 
Fixes for verification UI discrepancies
 2014-02-18 10:23:34 -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
b61649f9eb Refactor out new lang_pref djangoapp 2014-02-14 22:35:14 +00:00
thedeadparrot
c235ec3ed8 Open up translation docs in separate tab. 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
Brian Talbot
cb209fa0af LMS: revising color of language icon 2014-02-14 22:35:11 +00:00
Brian Talbot
d00a0f5b08 LMS: adding in supplemental 'volunteer to be a translator' action to language modal 2014-02-14 22:35:11 +00:00
Brian Talbot
a51ab4f1f4 LMS: adding iconography to language pref on dashboard UI 2014-02-14 22:35:11 +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
59aa06f096 Add back in the fake2 language 2014-02-14 22:35:10 +00:00