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

1099 Commits

Author SHA1 Message Date
Alexander Kryklia
25407ef3e7 BLD-642: Allow multiple transcripts with video. 2014-02-24 21:57:08 +02: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
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
Jay Zoldak
a620cc0004 Merge branch 'release' 
Conflicts:
	lms/templates/courseware/accordion.html
 2014-02-21 16:17:02 -05:00
Jason Bau
183d9bbb93 Use new setting for LMS deadline display instead TIME_ZONE 2014-02-21 10:20:06 -08: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
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
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
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
thedeadparrot
b61649f9eb Refactor out new lang_pref djangoapp 2014-02-14 22:35:14 +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
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
cb6b52f890 wiring for language selector 2014-02-14 10:32:10 -05: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
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
Calen Pennington
3a7b265c8a Add trailing commas to multiline lists, to prevent string concatenation bugs 2014-02-13 13:12:42 -05:00
Calen Pennington
a2efb796b6 Fix LMS-2249 (https://github.com/edx/edx-platform/issues/2516) 2014-02-13 13:12:29 -05:00
ichuang
e6fde41f43 allow STUDENT_FILEUPLOAD_MAX_SIZE to be configured in aws.py 2014-02-13 12:21:50 -05:00
Usman Khalid
21d8b40576 Added feature setting 'DISPLAY_HISTOGRAMS_TO_STAFF' to configure display of histograms in Staff Debug Info panel. 
Generating histograms requires scanning the courseware_studentmodule table on
each view. This can make staff access to courseware very slow on large courses.

Default is False.

LMS-1199
 2014-02-13 17:15:20 +05:00
Usman Khalid
f6d7cb5065 Renamed feature setting 'DISPLAY_HISTOGRAMS_TO_STAFF' to 'DISPLAY_DEBUG_INFO_TO_STAFF' to better communicate its purpose. 
Default is True.

LMS-1199
 2014-02-13 17:15:19 +05:00
Calen Pennington
17fda08c8d Enable XBlocks in bok_choy tests 2014-02-12 13:41:14 -05:00
Sarina Canelake
75a7d69050 Add Catalan (Valencia) 2014-02-12 10:18:34 -05:00
chrisndodge
25b127ef45 Merge pull request #2482 from edx-solutions/splash-screen 
splash-screen: Add ability to redirect to a splash screen URL
 2014-02-11 23:40:33 -05:00
cahrens
09d90b16af Clean up of modulestore references (primarly LMS). 
STUD-1151
 2014-02-11 14:29:22 -05:00
Xavier Antoviaque
e6f4f4f4f8 splash-screen: Add ability to redirect to a splash screen URL 
Checks for the presence of a cookie with specific values when activated,
and redirect the user to a configurable URL when it is not found, or not
with an accepted value.

To be used to display a splash screen to users upon the first visit.
It's the responsability of the splash page at the redirected URL to set
the proper cookie value before sending users back to the LMS.
 2014-02-11 14:26:19 -05:00
Oleg Marshev
79ffcb7e94 Refactor stub implementation of LTI Provider. BLD-601. 2014-02-11 12:50:22 +02:00
Ned Batchelder
ce5fd88baa Merge pull request #2488 from edx/ned/i18n-for-wiki 
Finish wiki i18n
 2014-02-10 17:05:44 -05:00
Don Mitchell
16f0d12a1f Merge pull request #2356 from edx/dhm/mixed_ms_wrapper 
MixedModulestore wraps most getters, update_item, delete_item
 2014-02-10 16:01:50 -05:00
yarko
5c1ffd745a fix partial work done for changes in django-debug-toolbar-1.0.1 
add trailing comma, restore uncommented state of Mongo panel
 2014-02-10 15:38:25 -05:00
Ned Batchelder
6990b5ba41 Tests should explicitly ask for English. 2014-02-10 15:23:13 -05:00
Ned Batchelder
6635233b3c Merge pull request #2529 from edx/ned/second-dummy-language 
Add a second fake translation language
 2014-02-10 15:19:27 -05:00
Sarina Canelake
6f32324e28 Merge pull request #2537 from edx/sarina/add-greek 
Add Greek language translations
 2014-02-10 15:17:28 -05:00
Sarina Canelake
0ea941da69 Add Greek language translations 2014-02-10 14:40:11 -05:00
Ned Batchelder
1bd213beba Remove unused imports. 2014-02-10 14:07:50 -05:00
Ned Batchelder
ece123e90f More than one dummy language 2014-02-08 10:37:01 -05:00
Jason Bau
50f7c0ebed Merge pull request #2510 from edx/jbau/fix-timezone-test-breakage 
fix tests that were breaking on dev envs due to TIME_ZONE='UTC'
 2014-02-07 12:28:36 -08:00
Jason Bau
fc8efc3017 fix tests that were breaking on dev envs due to TIME_ZONE='UTC' 2014-02-06 23:07:26 -08:00
John Jarvis
6c5ad2b74a Merge pull request #2448 from edx/jarv/db-env-override 
Jarv/db env override
 2014-02-06 17:53:26 -05:00
Jason Bau
b525f40377 Start datetime localization in LMS 
Currently just coerces the time displayed for due dates
(accordion.html and progess.html) to settings.TIME_ZONE
 2014-02-06 07:57:56 -08:00
Don Mitchell
c601b75675 MixedModulestore wraps most getters, update_item, delete_item 
with code to translate between addressing schemes based on app
and persistence layer addressing scheme specification.

STUD-1206
 2014-02-05 09:34:30 -05:00
Calen Pennington
6d67d0c677 Merge pull request #1949 from cpennington/xblock-studio-js-and-css 
Enable XBlock js and css in Studio
 2014-02-05 08:19:45 -05:00
Calen Pennington
818ad15967 Merge pull request #2304 from cpennington/less-initialization 
Don't force modulestore initialization when running lms manage.py, only when running via the wsgi file
 2014-02-04 13:27:01 -08:00
Calen Pennington
13c894eb31 Remove extraneous configuration 2014-02-04 15:35:26 -05:00
Carson Gee
69097e7b4a Merge pull request #2032 from carsongee/cg/ssl-studio 
More fully integrate and test ssl external auth in CMS
 2014-02-04 09:54:17 -08:00
Carson Gee
8cbe263ca0 Rename of feature AUTH_USE_MIT_CERTIFICATES to AUTH_USE_CERTIFICATES across platform. 
Caution! This is backwards incompatible
 2014-02-04 10:50:48 -05:00