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

20585 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sylvia Pearce
24232dbc8f Update tolerance information for Numerical Input problems 2014-01-23 15:51:44 -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
David Baumgold
97b7ad82e4 Merge pull request #2280 from edx/db/remove-contributing.md 
Remove CONTRIBUTING.md
 2014-01-23 12:00:40 -08:00
David Ormsbee
5aff72048c Merge branch 'release' 2014-01-23 14:07:50 -05: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
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
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
Christina Roberts
4544d277e3 Merge pull request #2205 from edx/christina/duplicate 
Front-end work for duplicating components on the unit page.
 2014-01-22 12:25:18 -08:00
Carson Gee
f688fd319c Merge pull request #2262 from carsongee/cg/improved_git_import_debug_logging 
Add additional logging for importing course from git
 2014-01-22 12:12:50 -08:00
Anton Stupak
2ef095d9b5 Merge pull request #2149 from edx/anton/video-download-transcript 
Allows students to download the transcript of the video without timecodes
 2014-01-22 12:03:41 -08:00
jsa
e033df9c24 fix 2 links that were broken during i18n changes. 2014-01-22 14:57:52 -05:00
Calen Pennington
d70eb3aa6a Add a test that validates that the .po and .mo files match for all active languages 2014-01-22 14:51:35 -05:00
Calen Pennington
efa2cafa07 Upgrade the transifex client 2014-01-22 14:51:35 -05:00
Calen Pennington
65a895e98e Run an extract before running generate, so that you have all the necessary files 2014-01-22 14:51:34 -05:00
Calen Pennington
c7bf282111 Don't capture the output of i18n command execution 2014-01-22 14:51:34 -05:00
cahrens
5da8de018e Don't pass variables to gettext. 2014-01-22 14:39:27 -05:00
Ned Batchelder
4a436a77ae Merge pull request #2260 from edx/ned/edx-setup-py 
Add a setup.py so we can import top-level directories.
 2014-01-22 11:37:33 -08:00
Sarina Canelake
c3dc373280 Merge pull request #2250 from edx/sarina/i18n_from_commandline 
Make test_validate into separate command-line script (i18n)
 2014-01-22 11:36:51 -08:00
Carson Gee
7d86124586 Add additional logging for importing course from git 2014-01-22 14:22:06 -05:00
cahrens
3eb0018629 Make ordinal in duplication statement friendlier. 2014-01-22 14:11:23 -05:00
Carson Gee
3aecac7adb Correct exception raising bug for non global staff accessing missing course git logs 2014-01-22 14:03:06 -05:00
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
Ned Batchelder
a2145c059e Add a setup.py so we can import top-level directories. 2014-01-22 12:33:45 -05:00
Sarina Canelake
8f3ba3271d Make test_validate into separate command-line script (i18n) 
LMS-1963
 2014-01-22 12:30:12 -05:00
Andy Armstrong
89c2f4dd28 Implement a course outline REST API 
STUD-1192
 2014-01-22 12:00:26 -05:00
Don Mitchell
9d6ed66e24 Add loc mapper fn from locn to CourseLocator 2014-01-22 11:49:03 -05:00
Jim Abramson
d35a56bc40 Merge pull request #2189 from edx/feature/jsa/forums-i18n-underscore 
i18n: extract strings from underscore templates
 2014-01-22 08:35:24 -08:00
polesye
4a36fa892b BLD-368: Turn "download transcript" into a dropdown. 2014-01-22 18:25:03 +02:00
jsa
168445f7c8 i18n: extract strings from underscore templates 
JIRA: FOR-400
 2014-01-22 11:07:35 -05:00
Greg Price
e634586882 Merge pull request #2222 from edx/gprice/forum-new-post-buttons 
Fix forum buttons
 2014-01-22 08:04:35 -08:00
cahrens
a1cb0a128b Define fixtures outside of the beforeEach. 2014-01-22 11:01:19 -05:00
Calen Pennington
4d4288f418 Merge pull request #2249 from cpennington/non-ascii-course-images 
Fix non-ascii course image names
 2014-01-22 07:50:13 -08:00
cahrens
b5726a6889 Front-end work for duplicating components on the unit page. 
STUD-1186
 2014-01-22 10:43:51 -05:00