ichuang
79650f5538
add infinity symbol to calc preview
2014-02-20 21:06:54 -05: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
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
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
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
Will Daly
b8187fb173
Fixed intermittent failure in XQueue stub unit test
2014-02-14 16:43:13 -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
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
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
David Glance
df2e410f2a
Replace rake functions with python paver functions
...
Deprecated rake functions issue a warning and then call paver
replacements
Bring Paver commands up to date with master for servers, assets, and docs.
Revert deprecation of quality, tests, and i18n for a future pull request.
Deprecate workspace migration
2014-02-14 11:25:55 -05:00
Ned Batchelder
b23e9fb62f
Merge pull request #2405 from edx/ned/remove-massemail
...
Remove unused massemail commands.
2014-02-14 10:50:57 -05:00
Julia Hansbrough
7d81a510bc
Moved UserPreferences to common
2014-02-14 10:32:11 -05:00
Julia Hansbrough
d867e87b72
Acceptance test for language selector
...
Tests language selection feature for student dashboard
2014-02-14 10:32:11 -05:00
Will Daly
a5207708f8
Added dark lang database fixture to bok choy tests
2014-02-14 10:32:11 -05:00
Julia Hansbrough
cb6b52f890
wiring for language selector
2014-02-14 10:32:10 -05:00
polesye
d9ec9cecf4
BLD-837: Fix download transcript behavior.
2014-02-14 09:03:54 -05:00
polesye
faab4caeef
BLD-837: Fix download transcript behavior.
2014-02-14 11:51:51 +02:00
Christina Roberts
0c74d6ac54
Merge pull request #2562 from edx/christina/lms-mixed
...
Clean up of modulestore references (primarily LMS).
2014-02-13 20:05:31 -05:00
Adam Palay
227197ec18
fixes css to render properly poll module (BLD-839)
2014-02-13 16:53:59 -05:00
Julia Hansbrough
5131818153
Merge pull request #2597 from edx/release
...
Release
2014-02-13 15:17:38 -05:00
Calen Pennington
d58358a484
Merge pull request #2555 from cpennington/xblock-acid-acceptance-tests
...
Add acceptance tests of the Acid block in both LMS and Studio
2014-02-13 14:23:31 -05:00
