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

20447 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Bau
dfacbbdd69 Notifier re-subcribe via link 
* fix assertPrefValid in tests to decrypt instead of compare
* rename unsubscribe -> set_subscribe
 2014-01-22 09:54:27 -08:00
Jason Bau
8abfdc6309 add undo (resub) to landing page of forum unsub link 2014-01-17 18:07:33 -08: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
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
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
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
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
0c63343f4a Merge pull request #2172 from edx/db/doc-build-url 
Reorganize doc for i18n
 2014-01-16 11:38:02 -08:00
Ned Batchelder
157f734b00 Merge pull request #2177 from ovnicraft/django-toolbar-update 
Django toolbar update
 2014-01-16 11:30:45 -08:00
Cristian Salamea
4b664627b3 Added myself in AUTHORS 2014-01-16 14:12:35 -05:00
Cristian Salamea
a465b082da Specific django-toolbar version (stable released) and update the panels in dev envs 2014-01-16 14:11:17 -05:00
David Baumgold
7928535b7b Add function to generate documentation links 
STUD-1090
 2014-01-16 14:11:15 -05:00
David Baumgold
8a370ea14b Reorganize documentation files for i18n 
STUD-1094
 2014-01-16 14:11:11 -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
Christina Roberts
a3d22097b9 Merge pull request #2182 from edx/christina/duplicate 
Support duplicating an existing xblock to a supplied parent location.
 2014-01-16 11:04:39 -08:00
Mark Hoeber
9de3b6ac1e Merge pull request #2200 from edx/markhoeber/documentation/STUD-1087 
Markhoeber/documentation/stud 1087
 2014-01-16 10:39:04 -08:00
Mark Hoeber
c625dedb69 Grading Due Date update 
Added details about student view of due dates
 2014-01-16 13:38:00 -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
Mark Hoeber
a8326f58dd Link and image cleanup 2014-01-16 13:09:15 -05: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
Mark Hoeber
a505fa951d Merge pull request #2173 from edx/markhoeber/documentation/STUD-1144 
Added notes about quotations to Advanced Settings page help
 2014-01-16 10:06:59 -08:00
Mark Hoeber
03d46dc672 Merge pull request #2198 from edx/markhoeber/documentation/release-notes-1-16-14 
Markhoeber/documentation/release notes 1 16 14
 2014-01-16 10:04:25 -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
Mark Hoeber
0fc5d88e4e Discussion Forums 
Fixed forum label to match UI
 2014-01-16 12:08:51 -05:00
Mark Hoeber
9b7f2d79f5 Fixed Course Start date 
change to 1/1/2030
 2014-01-16 11:55:26 -05:00