Commit Graph

20614 Commits

Author SHA1 Message Date
Ned Batchelder
2abd647375 Always add Plural metadata to dummy translations.
When this was conditional, we'd have plural info in some files, not in
others. Then we'd merge them, and msgcat would add wacky markers to
indicate the difference, and the metadata wouldn't parse.
2014-01-24 16:17:46 -05:00
srpearce
4c1df70434 Merge pull request #2293 from edx/markhoeber/documentation/stud-1130
Markhoeber/documentation/stud 1130
2014-01-24 06:26:25 -08:00
Usman Khalid
c296498806 Merge pull request #2291 from edx/usman/fix-openended-post-command-tests
Fixed flaky test for instructor command openended_post.
2014-01-24 06:12:09 -08:00
Mark Hoeber
598fb1a197 Merge pull request #2289 from edx/sylvia/documentation/BLD-671
Update tolerance information for Numerical Input problems
2014-01-24 06:05:51 -08:00
Mark Hoeber
4b2c3390fd Merge pull request #2282 from edx/sylvia/documentation/DOC-12
Correct three typos in video documentation
2014-01-24 06:05:18 -08:00
Oleg Marshev
80dbfb293b Merge pull request #2211 from edx/oleg/beta_user_for_lti
Allow user with BetaTester role correctly use LTI. BLD-641.
2014-01-24 05:57:30 -08:00
Usman Khalid
e0ecf011bd Fixed flaky test for instructor command openended_post.
The submission time is serialized into json and sent to xqueue. Previously the
whole json body argument to send_to_queue() was being matched. Sometimes the
time calculated in the test would differ slightly from the time calculated in
send_to_grader() and the test would fail. This fix tests individual fields of
the body argument to mock_send_to_queue() instead.
2014-01-24 18:35:25 +05:00
Oleg Marshev
ec6d9d585a Allow user with BetaTester role correctly use LTI. BLD-641. 2014-01-24 14:42:14 +02:00
Calen Pennington
58355f071f Merge pull request #2281 from cpennington/fix-i18n-execute
Use subprocess.STDOUT, rather than sys.STDOUT to rebind stderr
2014-01-24 03:48:23 -08:00
Sarina Canelake
623c985d38 Merge pull request #2286 from edx/sarina/i19-xmodules
i18n xmodule/course_module.py
2014-01-24 03:31:47 -08:00
Anton Stupak
dfc474178e Merge pull request #2230 from edx/anton/store-video-state
Persist speed preferences between videos.
2014-01-23 23:26:54 -08:00
Ned Batchelder
9491ca114c Merge pull request #2235 from edx/ned/i18n-tool-improvements
Added a .po segmenting tool
2014-01-23 14:39:56 -08:00
Ned Batchelder
9149d57be5 Ignore fr and ko_KR, so we can play around with them while getting our ducks in a row. 2014-01-23 17:39:36 -05:00
Ned Batchelder
9ea21dd9c7 i18n: extract and generate properly handle segments 2014-01-23 17:39:36 -05:00
Ned Batchelder
058569035f A few improvements to extract.
Use the configuration more, and we don't need to delete files we're
about to create.
2014-01-23 17:11:38 -05:00
Ned Batchelder
f76a5e174c I18n segmenting tool.
Messages can be segmented into different .po files based on the location
of their occurrences.  This is so Studio strings can go into different
.po files so we can direct Transifex workers to the LMS strings we
really need done.
2014-01-23 17:11:38 -05:00
Ned Batchelder
aa1ab5c792 Use yaml for a civilized config file. 2014-01-23 17:11:38 -05:00
Will Daly
8e707b28c2 Merge pull request #2255 from edx/will/bok-choy-xunit
Bok choy tests output XUnit reports
2014-01-23 12:59:26 -08:00
Sylvia Pearce
70f30b1054 Re-add .mpeg as possible video type 2014-01-23 15:54:19 -05:00
Sylvia Pearce
24232dbc8f Update tolerance information for Numerical Input problems 2014-01-23 15:51:44 -05:00
Mark Hoeber
f83e902100 Merge pull request #2287 from edx/markhoeber/documentation/release-notes-1-23-14
Markhoeber/documentation/release notes 1 23 14
2014-01-23 12:21:55 -08:00
Mark Hoeber
3f92f58f9f Revised, final release notes for 1-23-14 2014-01-23 15:15:48 -05:00
David Baumgold
5d06c8bcd3 Merge pull request #2279 from edx/db/remove-pil-comment
Remove comment for how to install PIL
2014-01-23 12:06:59 -08:00
Sarina Canelake
f88c108527 i18n xmodule/course_module.py
LMS-1747
2014-01-23 15:05:05 -05:00
David Baumgold
97b7ad82e4 Merge pull request #2280 from edx/db/remove-contributing.md
Remove CONTRIBUTING.md
2014-01-23 12:00:40 -08:00
Calen Pennington
c7d53b4219 Use subprocess.STDOUT, rather than sys.STDOUT to rebind stderr 2014-01-23 14:41:13 -05:00
David Ormsbee
5aff72048c Merge branch 'release' 2014-01-23 14:07:50 -05:00
polesye
1d74838698 BLD-237: Persist speed preferences between videos. 2014-01-23 20:54:40 +02:00
Jason Bau
d9f98b84b7 Merge pull request #2226 from edx/jbau/resubscribe-notifer
resubscribe feature for notifier
2014-01-23 10:29:00 -08:00
Anton Stupak
5bacfcc32b Merge pull request #2045 from edx/anton/video-merge-fields
Merge "video sources" and "download video" into the same field
2014-01-23 09:31:11 -08:00
Sylvia Pearce
d340cd0940 Correct three typos in video documentation 2014-01-23 12:22:40 -05:00
David Baumgold
5e1506e051 Remove CONTRIBUTING.md
Github includes a "Please review the guidelines for contributing
to this repository" link when creating a pull request, and it links
to the Markdown version of this file, which is annoying. Removing
the file should redirecto the link to the reStructuredText version
of this file.
2014-01-23 11:26:28 -05:00
David Baumgold
0b0ea51521 Remove comment for how to install PIL
We use Pillow now, which can be installed via PyPI
2014-01-23 11:23:12 -05:00
Jay Zoldak
636122c0b9 Merge pull request #2277 from edx/zoldak/move-microsite-test-assets
Enable microsite tests
2014-01-23 08:17:27 -08:00
Valera Rozuvan
f44489ea57 Merge pull request #2272 from edx/valera/make_video_debug_messages_consistent
Make video debug messages consistent.
2014-01-23 07:53:29 -08:00
Jay Zoldak
538ecf4852 Enable microsite tests
Move microsite test assets to common/test

Rename helper method to not have test in the name
Rename test css file
2014-01-23 10:42:51 -05:00
Calen Pennington
cb77826a4d Merge pull request #2257 from cpennington/test-compiled-translations
Add tests of compiled translated strings, so that we can check them into the repo safely.
2014-01-23 07:22:24 -08:00
Ned Batchelder
9069e413fe Merge pull request #2247 from jazkarta/pluggable-problem-types
Make problem types pluggable.
2014-01-23 07:10:48 -08:00
Valera Rozuvan
7a12d3b2fb Merge pull request #2273 from edx/valera/fix_video_progress_slider_method
Fix video progress slider method.
2014-01-23 05:36:33 -08:00
Valera Rozuvan
d2c9b52614 Merge pull request #2274 from edx/valera/fix_video_code_duplication
Fix video code duplication.
2014-01-23 04:33:37 -08:00
Valera Rozuvan
f0c3916b97 Fix video code duplication.
rangeParams returned from getRangeParams() function is already
an object that contains the left and width properties. It can
be passed directly to the jQuery css() function.
2014-01-23 12:11:50 +02:00
Valera Rozuvan
a673cbd9c6 Fix video progress slider method.
In each Video JavaScript module, methods are either private,
or public. When a method is public, it is made available via
the state variable. It seems that a while ago one method
was made public, but throughout the code it is used as a private
method. This has been corrected.
2014-01-23 12:06:43 +02:00
Valera Rozuvan
0dcd283e6e Make video debug messages consistent.
In the JavaScript console all messages from the Video
player should begin with "[Video info]: ". This way it
is easier to see which console.log() messages are from
the Video player, and which console.log() messages are
temporary, and should be removed before a merge/commit.
2014-01-23 11:56:19 +02:00
polesye
645007f910 BLD-364: Merge "video sources" and "download video" fields. 2014-01-23 11:27:28 +02:00
Chris Rossi
32a5fc0e54 Make problem types pluggable.
This patch adds the ability for arbitrary packages to register
themselves with xmodule.x_module.ResourceTemplates as being providers of
boiler plate templates used for defining the types of problems
instructors can add to a course.  This allows third party add-ons to
define new problem types that can then be available to instructors to
use.

This patch is the result of discussion with Ned Batchelder on the right
way to approach this problem.  The solution provided here is,
admittedly, a little bit of a hack.  But the focus was on making a least
invasive fix to make something work, in anticipation that when problems
get moved into the newere XBlock architecture something a little nicer
will be in place.
2014-01-22 21:33:24 -05:00
Don Mitchell
98eecf1369 Merge pull request #2244 from edx/dhm/role_package_id
Create mapping for previously unmapped locations in order to get
2014-01-22 14:01:42 -08:00
Andy Armstrong
de548fbf6c Merge pull request #2216 from edx/andya/move-service
Implement a course outline REST API
2014-01-22 13:10:10 -08:00
Jim Abramson
cdd54fc1b4 Merge pull request #2264 from edx/jsa/fix-forums-links-rc
fix 2 links that were broken during i18n changes.
2014-01-22 12:59:21 -08:00
Mark Hoeber
3183be4521 Release Notes 1-23-14
First Draft
2014-01-22 15:51:51 -05:00
Carson Gee
ef8671ad7e Merge pull request #2263 from carsongee/cg/gitlog_course_not_found_exception
Correct exception raising bug for non global staff accessing missing course git logs
2014-01-22 12:25:58 -08:00