Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,938 Commits 1 Branch 0 Tags
48dd00cc7c1926df270243a7a0417727f88773f5
Commit Graph

20938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Sylvia Pearce
07e4871d97 Add "Protein Builder" to "Additional Tools" 2014-02-04 10:18:03 -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
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
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
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
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
Will Daly
26455fe35b Added sphinx_rtd_theme to requirements 2014-02-03 14:29:28 -05:00
Will Daly
2600032842 Pinned version of sure library 2014-02-03 14:29:20 -05:00
Calen Pennington
d7d1d4bef2 Update translations (autogenerated message) 2014-02-03 14:27:49 -05:00
Calen Pennington
b06cf9cfbb Make i18n tests work with a clean checkout 2014-02-03 14:27:48 -05:00
Carson Gee
f33c308979 Switched from symlink to rename of template 2014-02-03 14:12:30 -05:00
Will Daly
9fd0fbc783 Merge pull request #2430 from edx/will/fix-bok-choy-register-test 
Fix find courses page title in bok choy test suite
 2014-02-03 11:07:19 -08:00
Carson Gee
2bf6df23c8 More fully integrate and test ssl external auth in CMS 2014-02-03 14:00:40 -05:00
David Baumgold
46248c7006 add lettuce test for displaying category if display_name is empty 2014-02-03 13:45:07 -05:00
jsa
95b87f0683 Allow new response pagination parameters to pass through thread model. 
JIRA: FOR-374
 2014-02-03 13:41:48 -05:00
Calen Pennington
f5ffc94d16 Prep for initial language release 2014-02-03 13:35:56 -05:00
Calen Pennington
788ed13b76 Rename djangojs.po to djangojs-partial.po in transifex, to prevent header creep 2014-02-03 13:35:56 -05:00
Calen Pennington
4e879a4c81 Add first pass at i18n automation tasks 2014-02-03 13:35:56 -05:00
Jay Zoldak
7e075eece1 Merge pull request #2433 from edx/zoldak/fix-tests-unicode 
Mark strings that were causing test failures as unicode
 2014-02-03 10:23:00 -08:00
Mark Hoeber
822a960e65 Add info to external graders chapter 
Links to example pull/push repositories
Note about graders not accessing student IDs
 2014-02-03 13:10:11 -05:00
Adam
f48a456b8c Merge pull request #2429 from edx/adam/fix/login-i18n 
i18n input field on login page (LMS-2159)
 2014-02-03 10:01:22 -08:00
Jay Zoldak
5ab0c9adb5 Mark strings that were causing test failures as unicode 2014-02-03 12:52:45 -05:00
Dave St.Germain
9c7f84a5f9 Merge pull request #2404 from edx/sarina/fix-unicode-in-subsection 
Fix unicode error in subsection
 2014-02-03 09:20:19 -08:00
David Baumgold
7cab3869c4 Fall back on category is display_name is empty or unset 2014-02-03 12:10:55 -05:00
Dave St.Germain
cb7882e0c8 Added test for template tag and breadcrumb function. 2014-02-03 12:01:28 -05:00
Sarina Canelake
7718608741 Fix unicode error in subsection 2014-02-03 12:01:28 -05:00
Diana Huang
40deaa509e Clean up strings in the ErrorModule 2014-02-03 11:56:10 -05:00
Greg Price
4e1c595472 Merge pull request #2377 from edx/gprice/forum-thread-pagination 
Add pagination of responses to forum threads
 2014-02-03 08:55:20 -08:00
Will Daly
8b3538150b Fix find courses page title in bok choy test suite 2014-02-03 11:42:23 -05:00