Sylvia Pearce
22aadbfe23
Add info for polls
2014-02-25 16:29:26 -05:00
srpearce
89b0c30fa9
Merge pull request #2722 from edx/sylvia/documentation/BLD-847
...
Update Zooming Image doc to reference file on files.edx.org
2014-02-25 16:01:05 -05:00
Sylvia Pearce
6c9972fa5d
Typo corrections
2014-02-25 16:00:20 -05:00
Sarina Canelake
65db6ad66a
Merge pull request #2720 from edx/sarina/ignore-probs
...
Ignore all my probs
2014-02-25 15:05:24 -05:00
Sarina Canelake
66b6d23a64
Ignore all my probs
2014-02-25 14:53:32 -05:00
Sylvia Pearce
bfc6dd7469
Update Zooming Image doc to reference file on files.edx.org
2014-02-25 14:51:36 -05:00
Mark Hoeber
3553fa7c50
removed dup'd paragraph
2014-02-25 14:42:21 -05:00
Ned Batchelder
a33cb2cd3d
Merge pull request #2707 from edx/ned/clean-up-i18n-tools
...
Ned/clean up i18n tools
2014-02-25 14:39:29 -05:00
Mark Hoeber
46bda852d6
Assets Page Template Update
...
For embed vs. external URLs
STUD-1338
2014-02-25 14:26:50 -05:00
Ned Batchelder
d3c75654d6
Updated po/mo files without format flags.
2014-02-25 14:03:18 -05:00
Calen Pennington
c72d410083
Remove doc-ready tests, which were flaky
2014-02-25 14:01:37 -05:00
Calen Pennington
ae34c3fe9f
Mark xblock initialization status using css class (in part to make testing easier)
2014-02-25 14:01:37 -05:00
Calen Pennington
35fbc15edb
Add tests of more scopes in student_view
2014-02-25 14:01:37 -05:00
Calen Pennington
9126777ed7
Add test of local_resource_url in AcidBlock
2014-02-25 14:01:37 -05:00
Ned Batchelder
830bbb15f3
Generate now removes format flags.
2014-02-25 14:00:52 -05:00
Ned Batchelder
eb4d5f1cbd
Also clean up the 3rd-party po files.
2014-02-25 13:58:47 -05:00
Giulio Gratta
a8c60259fb
Merge pull request #2551 from edx/giulio/custom_cert_names
...
Variable-ize "Certificate of Achievement" text
2014-02-25 10:20:08 -08:00
Giulio Gratta
35112e9e78
Variable-ize "Certificate of Achievement" text
2014-02-25 10:19:03 -08:00
Gabe Mulley
8ff3b4e58d
Merge pull request #2696 from mulby/gabe/add-problem-name-to-events
...
Add module display name to module related server events
2014-02-25 13:05:18 -05:00
Gabe Mulley
fe21f47573
Add module display name to module related server events
...
This information will likely be used frequently for analytics purposes, so we would like to denormalize here to avoid having to join with the modulestore later.
Fixes: AN-594
2014-02-25 11:53:36 -05:00
Sarina Canelake
b0ae3a536d
Merge pull request #2714 from edx/sarina/tfex-022514
...
Update translations (autogenerated message)
2014-02-25 10:26:39 -05:00
Sarina Canelake
c46028bf25
Update translations (autogenerated message)
2014-02-25 10:18:30 -05:00
Chris Dodge
fe3ebca1c5
add new feature to make sure we aren't writing PII into the application logs. So far we're aware of doing so regarding Auth use-cases
2014-02-25 00:14:19 -05:00
pdehaye
d51e18f6d2
The correct LTI keyword is "roles", not "role"
...
This is only a correction in the documentation
2014-02-25 00:57:48 +01:00
Mark Hoeber
a3e80504d1
Merge pull request #2705 from edx/markhoeber/documentation/stud-1214
...
Updated course introduction video section
2014-02-24 17:17:54 -05:00
Adam
5ab22ca412
Merge pull request #2700 from edx/adam/i18n-instructor-tab
...
add i18n scraping to tabs.py (LMS-2166)
2014-02-24 17:05:45 -05:00
Mark Hoeber
27b64313ef
Updated course introduction video section
...
updates for stud-1214
2014-02-24 16:49:22 -05:00
Adam
c9a4de607d
Merge pull request #2694 from edx/adam/announcement-text
...
minor change to html in announcement unit (STUD-1334)
2014-02-24 15:55:14 -05:00
Jay Zoldak
f3578eeca0
Merge pull request #2703 from edx/zoldak/verbose-bok-choy-logging
...
Bump up the verbosity on bok-choy logging
2014-02-24 15:53:05 -05:00
Adam Palay
8d2db05635
add i18n scraping to tabs.py (LMS-2166)
...
add dummy strings
2014-02-24 15:46:03 -05:00
Alexander Kryklia
59e4c6bfc4
Merge pull request #2422 from edx/anton/allow-multiple-transcripts
...
Video: allow multiple transcripts
2014-02-24 22:31:16 +02:00
Jay Zoldak
074a57e837
Bump up the verbosity on bok-choy logging
2014-02-24 15:26:29 -05:00
Alexander Kryklia
25407ef3e7
BLD-642: Allow multiple transcripts with video.
2014-02-24 21:57:08 +02:00
Giulio Gratta
3ffb6715e5
Internal/External Studio file URLs
...
- Changed link URL of file name to use public/LMS url
- Added toggle link to display all public URLs for instructor convenience
2014-02-24 11:54:09 -08:00
Mark Hoeber
2aac72934b
Merge pull request #2697 from edx/markhoeber/documentation/stud-1303
...
New Images
2014-02-24 14:49:12 -05:00
Greg Price
3f48e22448
Fix strings to avoid dangling commas
2014-02-24 14:46:41 -05:00
John Jarvis
7e035313af
Merge pull request #2698 from edx/jarv/add-edx-jsdraw
...
adding edx-private requirements file to add jsdraw
2014-02-24 14:37:11 -05:00
Mark Hoeber
d336721ef5
Merge pull request #2693 from edx/markhoeber/documentation/IMF_issues
...
Markhoeber/documentation/imf issues
2014-02-24 14:32:44 -05:00
Mark Hoeber
b7d0d200bc
Getting Starte chapter, for IMF changes
...
DOC-60
2014-02-24 14:31:58 -05:00
John Jarvis
dfb47ddf4c
adding edx-private requirements file to add jsdraw
2014-02-24 14:06:08 -05:00
Mark Hoeber
7b587dadf0
New Images
...
For STUD-1303
UI for Draft components changes
2014-02-24 14:04:36 -05:00
Don Mitchell
0b262e7cea
Merge pull request #2660 from edx/dbarch/parse_course_id
...
Dbarch/parse course
2014-02-24 13:24:00 -05:00
Ned Batchelder
5c07efa1a8
Update translations with latest from Transifex as of 20140224.
2014-02-24 11:55:52 -05:00
Don Mitchell
81a92e4bfc
Consolidate course_id triple parsing
2014-02-24 11:45:59 -05:00
David Baumgold
2c1eb47f43
Merge pull request #2665 from edx/db/update-readme-for-contributing
...
Update and linkify our README file
2014-02-24 11:45:09 -05:00
Jay Zoldak
e4b6fe2c68
Merge pull request #2695 from edx/will/revert-paver-again
...
Revert "Fix sys.path manipulation in pavement.py, with detailed comment"
2014-02-24 11:31:26 -05:00
Will Daly
812e71bbbb
Revert "Fix sys.path manipulation in pavement.py, with detailed comment"
...
This reverts commit 544616be4b .
2014-02-24 11:30:40 -05:00
Alison Hodges
9d92b2ed64
Merge pull request #2692 from edx/ahodges/documentation/wikidata
...
Ahodges/documentation/wikidata
2014-02-24 11:27:39 -05:00
Ned Batchelder
91c8df9bae
Merge pull request #2659 from edx/ned/more-pervasive-date-l10n
...
Make the i18n service available everywhere.
2014-02-24 10:50:41 -05:00
Adam Palay
2e58e80a68
minor change to html in announcement unit (STUD-1334)
2014-02-24 10:34:44 -05:00