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

7247 Commits

Author SHA1 Message Date
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
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
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
Sarina Canelake
3584b246dd Translate strings in xmodule/capa_*.py 
LMS-1744
 2014-01-17 15:01:59 -05: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
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
Greg Price
27d2c8e9f0 Merge pull request #2201 from edx/gprice/markdown-editor-i18n 
Internationalize the forums post Markdown editor
 2014-01-16 12:48:55 -08:00
David Baumgold
9d0e9f6762 Add dummy start dates to static_tab and course_info xmodules 2014-01-16 15:34:55 -05:00
jorr-at-google
6a1cc15d8e Merge pull request #2124 from edx/jorr/feature/factor-shared-capa-features-into-mixin 
Factor the core Capa problem logic into a mixin.
 2014-01-16 12:00:39 -08:00
John Orr
b6ea3f4e69 Factor the core Capa problem logic into a mixin. 
This mixin can be used by either the current XModule, or by an XBlock. Leave
the XModule-specific code in capa_module and move the shared code to capa_base.
Plan to move caba_base into the capa package in the future.
 2014-01-16 11:59:18 -08:00
David Baumgold
7928535b7b Add function to generate documentation links 
STUD-1090
 2014-01-16 14:11:15 -05:00
Greg Price
f8732a8b3d Internationalize the forums post Markdown editor 
This includes removing the "PREVIEW" label for the preview pane from CSS
and adding it to the generated DOM.
 2014-01-16 14:10:51 -05:00
Giulio Gratta
9280f89f86 Merge pull request #2157 from edx/giulio/remove-ice 
Removed ice.min.js completely as ORA is changing anyway
 2014-01-16 10:37:58 -08:00
Ned Batchelder
9dbd4c5b15 Merge pull request #2197 from edx/ned/add-responsetypes-registry 
Make a ResponseType registry.
 2014-01-16 10:09:03 -08:00
Don Mitchell
3885e6cf78 Merge branch 'release' 
Conflicts:
	lms/templates/help_modal.html
	lms/templates/index.html
 2014-01-16 12:51:22 -05:00
Ned Batchelder
3942876e0c Make a ResponseType registry. 
And while I was in there, I made it a decorator, so it's nicer to use.
 2014-01-16 12:25:28 -05:00
zubair-arbi
f58903a50f Merge pull request #2097 from zubair-arbi/zub/bugfix/std893-optionresponse 
escape single quotes in optioninput (optionresponse) tags
 2014-01-16 00:54:51 -08:00
Greg Price
9075dcefb6 Merge pull request #2186 from edx/gprice/timeago-i18n 
Internationalize our use of jquery.timeago
 2014-01-15 14:23:52 -08:00
Don Mitchell
41f8834453 Merge pull request #2167 from edx/dhm/split_block_id 
Encode periods and $ in block_id map
 2014-01-15 14:17:41 -08:00
Giulio Gratta
31caba3a2a Removed ice.min.js and removed piping code 2014-01-15 14:06:19 -08:00
Greg Price
0f09a3093e Internationalize our use of jquery.timeago 
Also get rid of an unused template and extra copies of jquery.timeago.
 2014-01-15 16:46:38 -05:00
Will Daly
ca180834dc Merge pull request #2128 from edx/will/bok-choy-fixtures-rebase 
Bok-choy fixtures, Studio tests, and (some) ORA tests
 2014-01-15 12:18:47 -08:00
jsa
dfa4a03daa i18n: externalize strings in discussion forums templates and python code. 
JIRA: FOR-398, FOR-399
 2014-01-15 14:26:22 -05:00
David Baumgold
c24820ae87 Change default start date for About pages 
So that About pages will display in the LMS if the user is not logged in
 2014-01-15 14:10:55 -05:00
Waheed Ahmed
a41ca43f4e Merge pull request #2058 from edx/waheed/ora195-json-serialization-error-fix 
JSON serialization error fixed.
 2014-01-15 08:18:27 -08:00
Don Mitchell
7e02951571 Merge pull request #2064 from edx/dhm/auth_consolidate 
Replace authz with roles.py and reconcile their behaviors
 2014-01-15 07:21:03 -08:00
Andy Armstrong
9db8b4979c Merge pull request #2175 from edx/andya/typo 
Fix typo in the announcement template
 2014-01-15 06:59:12 -08:00
Waheed Ahmed
b98f4e0229 JSON serialization error fixed and added test for it. 
ORA-195
 2014-01-15 19:47:45 +05:00
Will Daly
4afd5ea49f Refactored bok-choy directory structure 
Added fixtures for course and xblock creation
Added bok-choy Studio tests
Added bok-choy tests for ora self- and ai- assessment
Refactored auto-auth; added staff and course-enrollment options
Removed extra javascript properties from page objects
 2014-01-15 09:37:32 -05:00
Julia Hansbrough
f3f0e8a514 Merge pull request #1888 from edx/flowerhack/feature/certificate-revenue-reporting 
Verified Certificate Reports
 2014-01-15 06:18:17 -08:00
polesye
1347645ef0 BLD-434: Add fix for negative exponents. 
Set default tolerance to 1e-3% for all responsetypes.
 2014-01-15 13:17:05 +02:00
Alexander Kryklia
cbe97d6fe6 Merge pull request #1948 from edx/anton/allow-arbitrary-regex-in-stringresponse 
Anton/allow arbitrary regex in stringresponse
 2014-01-15 03:15:43 -08:00
polesye
ee1953b37a BLD-474: Allow multiple answers for string response. 2014-01-15 12:51:24 +02:00
Julia Hansbrough
ea0ae11171 Response to CR 1-14 2014-01-15 00:27:14 +00:00
Andy Armstrong
4436ad9aca Fix typo in the announcement template 2014-01-14 18:33:56 -05:00
Don Mitchell
ad3140a6e6 Cleaned up modules to reflect centralizing auth 2014-01-14 17:04:44 -05:00
Don Mitchell
3ebac80778 Replace authz fns with roles.py ones 
STUD-1006
 2014-01-14 17:04:44 -05:00
Don Mitchell
858e354a6d Moved roles.py to common student 2014-01-14 17:04:43 -05:00
Don Mitchell
13a04927f8 Encode periods and $ in block_id map 
STUD-872
 2014-01-14 14:43:31 -05:00
Chris Dodge
a3211a7405 Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org 
fix errorenous logic when running a microsite that could reside in a hosting environment with a marketing site in front of it

pep8/pylint fixes

address PR feedback, remove underscore from test hostname

more pep8/pylint cleanup. Skip test_microsites test, it works on localdev, not on Jenkins. Need to talk with QA team

manually add Ned's single-to-double quote fix

change aws.py runtimes so that the microsite_dir that is read from configuration is changed to a python path

Conflicts:
	lms/templates/help_modal.html
 2014-01-14 14:36:01 -05:00
Calen Pennington
d2a0df4118 Merge pull request #2129 from cpennington/xblocks-xml-import-export 
XBlock Xml Serialization/Deserialization
 2014-01-14 10:56:09 -08:00
Greg Price
3c3ef50e13 Merge pull request #2168 from edx/gprice/forum-coffee-i18n 
Internationalize forums CoffeeScript code
 2014-01-14 10:55:08 -08:00
Calen Pennington
a55724d117 Prevent unicode data from being injected into a Location using the _replace function 2014-01-14 13:28:49 -05:00
Calen Pennington
46109bb3e8 Use XBlock xml serialization and deserialization 
XModules continue to use their own interface for xml, but provide an
adaptor that makes the the XBlock interface available.

[LMS-179]
 2014-01-14 13:28:47 -05:00