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

21309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Calen Pennington
3d2b1df637 Merge pull request #2628 from cpennington/fix-stud-1316 
Fix STUD-1316
 2014-02-19 15:31:42 -05:00
Calen Pennington
1eec47a604 Fix STUD-1316 
This bug affected unpublishing content (and would trigger an error
message in studio). The fix was to uncouple the rendering of the studio_view
of an xblock with the student_view, so that content that wasn't in
draft mode already wouldn't be modified by early rendering of the
studio_view.

[STUD-1316]
 2014-02-19 14:58:41 -05:00
David Baumgold
ab938c094b Merge pull request #2619 from avinassh/patch-1 
fixed the webchat Freenode URL
 2014-02-18 13:18:09 -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
Ned Batchelder
059681d497 Merge pull request #2623 from edx/ned/latest-transifex 
Update translations for 2014-02-18 release prep.
 2014-02-18 11:51:26 -05:00
Ned Batchelder
5faca9c46e Update translations for 2014-02-18 release prep. 2014-02-18 13:34:58 -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
2cea81b005 Merge pull request #2620 from edx/alex/fix_enable_download_track 
Enable download_track for existing courses if self.track.
 2014-02-18 14:15:40 +02:00
Alexander Kryklia
23a2177da3 Enable download_track for existing courses if self.track. 2014-02-18 12:31:06 +02:00
avinassh
6b5c5190e9 Added myself in AUTHORS 2014-02-17 19:22:43 +05:30
avinassh
0ae8cd1fca fixed the webchat Freenode URL 
Currently the URL points to a wrong URL, fixed it by adding 'http' to the URL.
 2014-02-17 19:15:37 +05:30
Mark Hoeber
acad35bbe8 Merge pull request #2614 from edx/sylvia/documentation/BLD-815 
Sylvia/documentation/bld 815
 2014-02-15 14:14:40 -05:00
Sylvia Pearce
324762191b Update Appendix E; add chemical equation to Additional Tools 2014-02-15 14:13:48 -05: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
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
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
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
Diana Huang
e94b1a5cfa If we run into issues with languages, use default 2014-02-14 22:35:10 +00:00
Brian Talbot
a6f147afa5 LMS: revising modal UI to support translators 2014-02-14 22:35:08 +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
Julia Hansbrough
77cce3aa1a Added acceptance test for language persistence 
Will pass once the language persistence stuff gets merged in
 2014-02-14 22:34:46 +00:00
Julia Hansbrough
552572694f Added middleware for handling language changes 2014-02-14 22:34:29 +00:00
Adam Palay
97f5b25e2c i18n for self-assessment (ORA-314) 
make openendedchild and open_ended_module_v1 act enough like xblocks to get xblock 18n
 2014-02-14 17:27:32 -05:00
Mark Hoeber
d6f1ddd84d Merge pull request #2611 from edx/ahodges-documentation-LMS 
Ahodges documentation lms
 2014-02-14 16:39:46 -05:00
Alison Hodges
77b9d2aaf8 New instructor dashboard enrollment, data and staffing documentation 2014-02-14 16:37:08 -05:00
Alison Hodges
d3a21f21f8 Merge pull request #2610 from edx/sylvia/documentation/change_log 
Update change log three new lines look correct cautiously merging even though some tests failed
 2014-02-14 16:28:35 -05:00
Sylvia Pearce
b3c46b53a9 Update change log 2014-02-14 15:42:38 -05:00
Mark Hoeber
53ea2cf00b Merge pull request #2605 from edx/sylvia/documentation/BLD-837 
Sylvia/documentation/bld 837
 2014-02-14 14:51:03 -05:00
Will Daly
6f2ee0dc5c Merge pull request #2609 from edx/will/revert-paver 
Revert "Replace rake functions with python paver functions"
 2014-02-14 14:29:28 -05:00
Will Daly
c85c4b22ed Revert "Replace rake functions with python paver functions" 
This reverts commit df2e410f2a.
 2014-02-14 14:25:28 -05:00
Julia Hansbrough
48383de870 Merge pull request #2606 from edx/release 
Hotfix for Feb 14 2012
 2014-02-14 14:18:38 -05:00
Mark Hoeber
87fd257692 Merge pull request #2604 from edx/sylvia/documentation/BLD-841 
Fixed broken image in LTI Component topic
 2014-02-14 14:15:46 -05:00
Sylvia Pearce
73d7675339 Clarify one advanced setting for video components 2014-02-14 14:12:24 -05:00
Sylvia Pearce
67b9b93dd1 Fixed broken image in LTI Component topic 2014-02-14 13:41:38 -05:00
marcotuts
6fcd35cfe6 Merge pull request #2507 from edx/marco/studio/container-view 
styling for a generic container view in Studio built on top of base styles for xblocks rendered in Studio. Also includes UX reference template area for unit and container pages.
 2014-02-14 13:37:18 -05:00
Sylvia Pearce
453b9992eb Add "Additional Transcripts" section to Video topic 2014-02-14 13:23:47 -05:00
marco
a8417df7ba styling for recursive xblock rendering structure to be used in the container page, pulling from general xblock styles in a separate file. 2014-02-14 12:57:06 -05:00