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

22819 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mark Hoeber
771ec3ebf6 Doc Update for Component label in editable unit page 
for STUD-1242
 2014-02-04 14:50:33 -05:00
Dave St.Germain
0e5f3e4f08 The default course CSS class should be empty string rather than None. 2014-02-04 14:37:38 -05:00
Will Daly
079f3aa5f4 Updated bok choy page objects setup.py 
Fix bug in url method of register page object
Add dist directories to gitignore
 2014-02-04 14:32:42 -05:00
Usman Khalid
0eb9c34341 Merge pull request #2396 from edx/usman/lms2090-instructor-task-transactions 
instructor_task: Distribute extra items among subtasks of last query.
 2014-02-04 11:17:20 -08:00
Dave St.Germain
b0af0b18b9 Converted <ol> to <div> to prevent a11y confusion. 2014-02-04 14:00:17 -05:00
Mark Hoeber
19674a6f98 Merge pull request #2458 from edx/ahodges-documentation-LMSdash 
Ahodges documentation lm sdash
 2014-02-04 10:51:22 -08:00
Mark Hoeber
48dd00cc7c Merge pull request #2460 from edx/sylvia/documentation/BLD-787 
Added warning about complex numbers to math expression input
 2014-02-04 10:43:56 -08:00
Usman Khalid
95a112a3dd instructor_task: Distribute extra items among subtasks of last query. 
When creating an instructor task total_num_items may change between the
time it and the number of subtasks is calculated and the time the
subtasks are actually queued (all of this cannot happen in one transaction).
In such a case the extra items are distributed among the subtasks of the
last query.

LMS-2090
 2014-02-04 23:30:02 +05:00
jsa
10364887d2 don't show the add response button if responses are not allowed. 
JIRA: FOR-452
 2014-02-04 13:29:15 -05:00
Alison Hodges
53c45a6216 Adding instructor dashboard documentation for student and grade download data. 2014-02-04 13:21:27 -05:00
Sylvia Pearce
4cda88ff60 Added warning about complex numbers to math expression input 2014-02-04 13:12:48 -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
Will Daly
194c906c19 List which test suites failed 
Add section headings to test console output

i18n tests generate XUnit reports

Move i18n and docs test commands out of tests.rake
 2014-02-04 12:36:19 -05:00
Greg Price
88d3998c8a Make assets:coffee a dependency of i18n:extract 
Extraction is done on the compiled .js files, so coffee compilation
should be done before extracting strings.
 2014-02-04 12:09:00 -05:00
Julia Hansbrough
891465d1b0 Fixed 500ing CSV reports 2014-02-04 16:38:08 +00:00
David Baumgold
4dd2c42a1f Merge pull request #2451 from edx/db/i18n-dummy-path-py 
Use path.py instead of os.path
 2014-02-04 08:28:07 -08:00
David Baumgold
b1be29ffbc Use path.py instead of os.path 2014-02-04 11:02:13 -05:00
Mark Hoeber
7e1e8fdce5 Merge pull request #2453 from edx/sylvia/documentation/BLD-759 
Add "Protein Builder" to "Additional Tools"
 2014-02-04 08:00:03 -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
Will Daly
54dbadb320 Merge pull request #2450 from edx/will/fix-dummy-i18n-import 
i18n/dummy.py cleanup
 2014-02-04 07:38:12 -08:00
Sylvia Pearce
bd4e5e409f Add ProteinBuilder.gif 2014-02-04 10:28:48 -05:00
srpearce
93133f38e3 Merge pull request #2444 from edx/markhoeber/documentation/LMS-2140 
Add info to external graders chapter
 2014-02-04 07:26:34 -08:00
Bertrand Marron
b758c89e4a Prepend theme template paths 
Allow templates override.
 2014-02-04 16:18:04 +01:00
Sylvia Pearce
07e4871d97 Add "Protein Builder" to "Additional Tools" 2014-02-04 10:18:03 -05:00
John Jarvis
d279dff9c9 fixing syntax 2014-02-04 09:26:25 -05:00
John Jarvis
442abde030 adding DB_MIGRATION_ENGINE and fixing defaults 2014-02-04 09:24:49 -05:00
John Jarvis
3fe701c037 check for None so an empty string is valid for a password 2014-02-04 09:11:48 -05:00
Calen Pennington
49217ebe8b Allow multiple client-side runtimes on a single page 
Make XBlock client-side runtimes proper classes, so that handlerUrl can
be defined in a per-runtime way, and we can have multiple runtimes on a
single page.

[LMS-1630][LMS-1421][LMS-1517]
 2014-02-04 08:55:36 -05:00
Will Daly
b03a6096f4 Added missing import of sys to i18n/dummy.py 
Removed unused make_dummy.py
Made dummy.py executable
 2014-02-04 08:39:54 -05:00
Szczork
08ce047fe2 add unit test for speed_change_video event 2014-02-04 14:35:11 +01:00
Jason Bau
7ac13bf81e Don't show course start date if it hasn't been set. 
If neither start nor advertised_start has been changed from default
don't show the course start date.

This allows us to accept course registrations for courses whose start
date is yet TBD.
 2014-02-03 16:20:39 -08:00
Dave St.Germain
0f8919a6ba Merge pull request #2441 from edx/dcs/info-remove-title 
Removed extraneous title block that was replacing the breadcrumbs
 2014-02-03 14:28:56 -08:00
Julia Hansbrough
5f325a4b89 Merge pull request #2447 from edx/flowerhack/fix/update-language-settings 
Removed LANGUAGE from devstack settings
 2014-02-03 14:22:25 -08:00
John Jarvis
d28f2f5905 adding check back in 2014-02-03 16:54:54 -05:00
Giulio Gratta
a76e5bd6e2 Merge pull request #2442 from edx/giulio/fix-disabled-about-page-button 
fixing layout/style of disabled register button
 2014-02-03 13:45:44 -08:00
Julia Hansbrough
cd95469b18 Removed LANGUAGE from devstack settings 2014-02-03 21:44:04 +00:00
Mark Hoeber
eb36fc90a4 Merge pull request #2445 from edx/sylvia/documentation/STUD-1145 
Add documentation for "multiple choice and numerical input" problems
 2014-02-03 13:43:46 -08:00
John Jarvis
693497673a remove check for PASS 2014-02-03 16:42:22 -05:00
Feanil Patel
5e5c59cab2 Merge remote-tracking branch 'origin/release' 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml.py

Took the changes that were on the release branch.
 2014-02-03 16:39:40 -05:00
Feanil Patel
e0dd42cc95 Merge pull request #2435 from edx/hotfix/2014-02-03 
Allow new response pagination parameters to pass through thread model.
 2014-02-03 13:35:55 -08:00
Sylvia Pearce
b2f7e5bd00 Add documentation for "multiple choice and numerical input" problems 2014-02-03 16:35:23 -05:00
Giulio Gratta
1e1826af18 fixing layout/style of disabled register button 2014-02-03 13:17:15 -08:00
ichuang
239985ef68 add message output to formulaequationinput.html (capa) 2014-02-03 16:12:20 -05:00
Giulio Gratta
5a722b9048 Merge pull request #2436 from edx/giulio/add-og-info-about-pages 
Add OG title and description to course about pages
 2014-02-03 13:02:21 -08:00
Diana Huang
0ee9a72465 Merge pull request #2432 from edx/diana/error-module-i18n 
Clean up strings in the ErrorModule
 2014-02-03 12:57:14 -08:00
Giulio Gratta
879a849eea Add OG title and description to course about pages 2014-02-03 12:36:43 -08:00
Dave St.Germain
ac8eeac798 Removed extraneous title block that was replacing the breadcrumbs 2014-02-03 15:22:25 -05:00
David Baumgold
27b2ff7e99 Merge pull request #2401 from edx/db/component-label-display-name 
Pass component display name to Mako template
 2014-02-03 12:04:00 -08:00
Calen Pennington
a3146cd7aa Merge pull request #2388 from cpennington/initial-languages 
Add initial languages, ready for dark-launch
 2014-02-03 11:52:32 -08:00
John Jarvis
ff7810d777 adding db overrides to aws_migrate.py 2014-02-03 14:49:41 -05:00