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

20514 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Bau
4e413e4ecb Merge pull request #2190 from edx/jbau/fix-preview-config 
move HOSTNAME_MODULESTORE_DEFAULT_MAPPING to lms.envs.aws (not lms.envs....
 2014-01-21 13:26:10 -08:00
David Ormsbee
42e0ec403e Merge pull request #2251 from edx/release 
Merging Release 2014-01-21
 2014-01-21 12:41:05 -08:00
Will Daly
8aa208e80d Disabled latex acceptance test 2014-01-21 15:01:36 -05:00
Ned Batchelder
9c9de01603 Merge pull request #2248 from edx/ned/fix-readthedocs-dev-doc 
Really fix readthedocs.
 2014-01-21 11:04:13 -08:00
Ned Batchelder
c48ac5922d Really fix readthedocs. 2014-01-21 14:03:18 -05:00
Ned Batchelder
55a6cbb960 Merge pull request #2246 from edx/ned/fix-readthedocs-dev-doc 
Make the dev docs work on readthedocs.org
 2014-01-21 10:57:22 -08:00
Ned Batchelder
62ff82c5eb Make the dev docs work on readthedocs.org 2014-01-21 13:56:53 -05:00
Mark Hoeber
2071f0e7ea Merge pull request #2242 from edx/sylvia/documentation/BLD-630 
Sylvia/documentation/bld 630
 2014-01-21 09:09:57 -08:00
Sylvia Pearce
f73f02e8f5 Update zooming image tool info and add image 2014-01-21 11:10:01 -05:00
zubair-arbi
7bdcc84857 Merge pull request #2214 from zubair-arbi/zub/story/std1183-staticpagestest 
enable tests depending on assert is_css_present(css_selector)
 2014-01-21 06:50:27 -08:00
Diana Huang
d220aaca66 Minor copy change requested by linkedin. 2014-01-21 09:14:00 -05:00
Sarina Canelake
911351dfad Merge pull request #2240 from edx/sarina/fix-bug 
Change i18n contact address
 2014-01-21 05:39:29 -08:00
Sarina Canelake
2b45ebc82f Change i18n contact address 2014-01-21 08:38:41 -05:00
Sarina Canelake
7fa5ae9c64 Merge pull request #2233 from edx/sarina/change-contact-email 
Change i18n contact address
 2014-01-20 14:01:46 -08:00
Sarina Canelake
fffa4f36da Change i18n contact address 2014-01-20 16:01:45 -05:00
Ned Batchelder
8594faf43f Merge pull request #2232 from edx/ned/i18n-tool-improvements 
Make i18n a real package.
 2014-01-20 10:06:16 -08:00
Ned Batchelder
cab1c04e5e Make i18n a real package. 2014-01-20 11:34:54 -05:00
Don Mitchell
003ad76c64 Merge pull request #2209 from edx/db/lms_date_agnostic 
Detached categories don't access control on date
 2014-01-19 08:46:28 -08:00
Don Mitchell
d999d0af1b Detached categories don't access control on date 2014-01-17 17:53:14 -05:00
Sarina Canelake
7f74297810 Merge pull request #2219 from edx/sarina/i19-capa-new 
i19 base capa strings
 2014-01-17 14:41:05 -08:00
Sylvia Pearce
5f07fc9df9 Update Zooming Image tool documentation 2014-01-17 17:18:34 -05:00
Sarina Canelake
0efa75d6f5 i18n of common/lib/capa/capa files 
Also pep8, pylint, and style fixes
Covers:
{capa_problem, correctmap, customerender,
inputtypes, responsetypes, util, xqueue_interface}.py
LMS-1744
 2014-01-17 16:39:50 -05:00
Carson Gee
207f3c585c Merge pull request #2196 from carsongee/cg/forum_roles_on_import_command 
Adding missing forum permissions seeding routine to xml_import
 2014-01-17 13:27:19 -08:00
Diana Huang
f051e33064 New copy and styling. 2014-01-17 16:23:13 -05:00
Ned Batchelder
9620e341a2 Merge pull request #2210 from edx/ned/i18n-docs-in-repo 
Ned/i18n docs in repo
 2014-01-17 12:27:40 -08:00
Ned Batchelder
b8a8575d17 Further edits 2014-01-17 15:27:22 -05:00
Ned Batchelder
8c79f13d17 Added more coding details to i18n doc. 2014-01-17 15:27:22 -05:00
Ned Batchelder
53de11d4b5 Conversion of page from wiki to .rst 2014-01-17 15:27:22 -05:00
Ned Batchelder
66794749fb Minor tweaks to home page. 2014-01-17 15:27:22 -05:00
Adam
439037d827 Merge pull request #2084 from edx/adam/remove_unsure_button 
removes unsure button (ORA-254)
 2014-01-17 12:24:43 -08:00
Carson Gee
1e809a4210 Adding missing forum permissions seeding routine to xml_import 
Currently if a course is only imported from the command line the
forum permissions are not seeded, this adds that functionality
Switched to doing seeding outside of xmodule library
Switched to using course_items
Switching to simpler test class
 2014-01-17 15:17:48 -05:00
Sarina Canelake
3584b246dd Translate strings in xmodule/capa_*.py 
LMS-1744
 2014-01-17 15:01:59 -05:00
Adam
20fdb1ff6a Merge pull request #2218 from edx/adam/revert-ddt 
Revert django-debug-toolbar related updates on master, set version to 0....
 2014-01-17 12:00:03 -08:00
Jim Abramson
264bba94ea Merge pull request #2217 from edx/bug/jsa/for-203 
expand forums' search text input whenever the field receives focus.
 2014-01-17 11:48:45 -08:00
Adam Palay
013549a39e removes unsure button (ORA-254) 2014-01-17 14:41:54 -05:00
Adam Palay
981a7f9479 Revert django-debug-toolbar related updates on master, set version to 0.9.4 
(STUD-1201)

Revert "Specific django-toolbar version (stable released) and update the panels in dev envs"

This reverts commit a465b082da.

Revert "Updated settings for devstack django debug toolbar"

This reverts commit 30199e8a61.
 2014-01-17 14:17:38 -05:00
jsa
22d6c6806b expand forums' search text input whenever the field receives focus. 
JIRA: FOR-203
 2014-01-17 14:13:40 -05:00
Ned Batchelder
42c543b7ab Merge pull request #2183 from edx/ned/add-i18n-for-inputtypes 
Ned/add i18n for inputtypes
 2014-01-17 09:57:32 -08:00
Don Mitchell
e74ddf8131 Merge branch 'release' 2014-01-17 12:49:15 -05:00
Ned Batchelder
fe5d2c74f8 Use self.runtime instead of self.system 
[LMS-1597]
 2014-01-17 11:33:23 -05:00
Ned Batchelder
4aa4c514ee Add i18n attribute to LoncapaSystem 
[LMS-1597]
 2014-01-17 11:33:09 -05:00
Ned Batchelder
d2146978ea Give LoncapaProblem its own LoncapaSystem instead of ModuleSystem 
LoncapaProblem was using ModuleSystem directly, but we're about to need
i18n passed in, so this gives LoncapaProblem its own LoncapaSystem
object to better module its dependencies.  This commit simply passes
through the attributes of ModuleSystem that Loncapa needs.

[LMS-1597]
 2014-01-17 11:32:54 -05:00
zubiar-arbi
dc570859da enable tests depending on assert is_css_present(css_selector) 
STUD-1183
 2014-01-17 21:11:17 +05:00
Sarina Canelake
6c0ac477bd Merge pull request #2184 from edx/sarina/translator-documentation 
First pass at Translators guide
 2014-01-17 07:08:19 -08:00
Sarina Canelake
8395dabdf9 Add in a guide for edX Translators 
LMS-1972
 2014-01-17 09:46:35 -05:00
Will Daly
0cba92afd1 Merge pull request #2208 from edx/will/fix-devstack-django-toolbar 
Updated settings for devstack django debug toolbar
 2014-01-17 06:06:18 -08:00
Will Daly
30199e8a61 Updated settings for devstack django debug toolbar 2014-01-16 18:53:11 -05:00
Chris Dodge
c9718380ea catch additional FEATURE['ENABLE_MKTG_SITE'] checks and make sure MicrositeConfigurations will override the global setting 
one more faulty login regarding ENABLE_MKTG_SITE=true situations
 2014-01-16 17:04:17 -05:00
David Ormsbee
77a315c6a3 Minor data collection tweaks after examining prod course data. 
Add in unicode handling for names.
 2014-01-16 17:03:15 -05:00
Diana Huang
2b6651529a Add in test to test the transactions when we hit an unexpected error. 
Add tests for various error mail sending scenarios
 2014-01-16 17:03:15 -05:00