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

20658 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diana Huang
373244b094 Fix a typo in the LinkedIn e-mail. 2014-01-27 14:06:27 -05:00
Giulio Gratta
78c85ea3b2 Merge pull request #2308 from edx/giulio/fix-error-msg-typo 
Fixed all instances of "occured" typo
 2014-01-27 10:46:13 -08:00
Will Daly
bf6aa01421 Merge pull request #2319 from edx/will/enable-i18n-tests 
Enable i18n tests in `rake test` command
 2014-01-27 10:23:09 -08:00
Adam
dba1e4ddc8 Merge pull request #2300 from edx/adam/fix/stringresponse-no-type-specified 
Adam/fix/stringresponse no type specified
 2014-01-27 10:11:30 -08:00
Mark Hoeber
babd2e226f Merge pull request #2321 from edx/sylvia/documentation/BLD-618 
Sylvia/documentation/bld 618
 2014-01-27 10:06:56 -08:00
David Baumgold
05b8665842 Merge pull request #2318 from edx/db/brewfile 
Create Brewfile
 2014-01-27 09:10:23 -08:00
David Baumgold
62c1bbf5e6 Added comment indicating that running directly on OSX is unsupported 2014-01-27 12:05:25 -05:00
Sylvia Pearce
6f989ac1b1 Update .sjson information and add new Video component image 2014-01-27 12:00:23 -05:00
Adam Palay
c305fc386c fix regression for stringresponse problems with unspecified case sensitivity (BLD-710) 
write failing tests
 2014-01-27 11:40:38 -05:00
Sarina Canelake
614da8ee3b Enable i18n tests in rake test command 
LMS-1963
 2014-01-27 10:59:37 -05:00
David Baumgold
78963565b8 Moved brew-formulas.txt to Brewfile 
http://robots.thoughtbot.com/brewfile-a-gemfile-but-for-homebrew
 2014-01-27 10:51:31 -05:00
Anton Stupak
ac3cd92b32 Merge pull request #2315 from edx/anton/fix-imageresponse-offset-in-ff 
Imageresponse: fix offset in FF.
 2014-01-27 07:38:18 -08:00
Ned Batchelder
9d950436d6 Merge pull request #2303 from edx/ned/i18n-tool-fixes 
Ned/i18n tool fixes
 2014-01-27 07:22:36 -08:00
polesye
2cee94ea14 BLD-711: Fix offest in FF. 2014-01-27 16:22:12 +02:00
Alexander Kryklia
42933739af Merge pull request #2231 from edx/alex/numtolerance_range 
Alex/numtolerance range
 2014-01-27 04:59:03 -08:00
Alexander Kryklia
688d47fb62 Give numerical response tolerance as a range (for example [5,7)) (BLD-25) 2014-01-27 14:58:19 +02:00
Anton Stupak
4b6de31cbb Merge pull request #2243 from edx/anton/video-i18n 
Internationalize the video player.
 2014-01-27 01:29:09 -08:00
polesye
b8eba4192c BLD-699: Fix i18n. 2014-01-27 07:49:22 +02:00
Will Daly
4b56fc2968 Merge pull request #2301 from edx/will/bok-choy-coverage 
Collect coverage for bok-choy tests
 2014-01-25 08:39:14 -08:00
Sarina Canelake
48a5c76066 Merge pull request #2295 from edx/sarina/i19-xmodules 
i18n Sequence XModule
 2014-01-24 17:15:08 -08:00
Giulio Gratta
0429ba7da3 Fixed all instances of "occured" typo 2014-01-24 16:13:26 -08:00
Joe Blaylock
e263b33f17 Merge pull request #2227 from edx/jrbl/fix_cert_whitelist_report 
Certs - bugfix cert_whitelist output
 2014-01-24 15:11:37 -08:00
Joe Blaylock
6a2fbf7175 Merge pull request #2290 from edx/jrbl/mdx_stop_printing 
Eliminate unused import and gratuitous prints
 2014-01-24 14:24:24 -08:00
Will Daly
23a1947a62 Collect coverage for bok-choy tests 2014-01-24 16:58:24 -05:00
Ned Batchelder
1e8a0cb7e0 Tighten up the extraction I/O 
We were writing the main file twice.  No need.
 2014-01-24 16:18:43 -05:00
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
Sylvia Pearce
59434f7b97 Update video component documentation 2014-01-24 15:44:47 -05:00
Will Daly
7110500e79 Merge pull request #2298 from edx/will/remove-other-locales 
Removed French and Korean locales until we add the translation strings
 2014-01-24 12:28:20 -08:00
Mark Hoeber
656ff0a196 Merge pull request #2297 from edx/ahodges-documentation-discussions 
Ahodges documentation discussions
 2014-01-24 12:18:42 -08:00
Alison Hodges
59fb29dc99 New Discussion forum documentation 2014-01-24 15:17:12 -05:00
Will Daly
d09540e34d Removed French and Korean locales until we add the translation strings 2014-01-24 14:52:37 -05:00
Jay Zoldak
cd8394a609 Merge pull request #2296 from edx/cdodge/pep8-fix 
pep8 cleanup
 2014-01-24 09:43:13 -08:00
Chris Dodge
8262b6564e pep8 cleanup 2014-01-24 11:59:56 -05:00
chrisndodge
88391c7ec6 Merge pull request #2278 from edx/cdodge/session-inactivity-timeout 
add middleware to be able to expire inactive sessions after N seconds
 2014-01-24 08:25:24 -08:00
Sarina Canelake
b8b1f6a576 i18n Sequence XModule 
LMS-1758
 2014-01-24 11:06:57 -05:00
Chris Dodge
fcefada2d7 add middleware to be able to expire inactive sessions after N seconds 
configure middleware

add test for session inactive timeouts

add Studio inactive session timeout test

change login method used

add create_test_account to test

make sure the expected redirect URL is right

fix indenting problem

fix doc string since we moved from minutes to seconds

use utility methods rather than calling another test to set up and activate an account

clean up code violations

respond to PR feedback

use optional params to make code cleaner

pylint fix on test files
 2014-01-24 10:36:21 -05:00
marcotuts
d8eaa881c3 Merge pull request #2276 from edx/studio/duplicate/visuals 
Updates Studio's visual styling of action buttons on components and static pages
 2014-01-24 07:34:03 -08:00
marco
cf67c132c2 fixed typo in comment for assets.scss 2014-01-24 10:33:08 -05:00
Greg Price
7e8d700bde Merge pull request #2267 from edx/gprice/timeago-better-i18n 
Modify jquery.timeago to better support i18n
 2014-01-24 07:32:39 -08: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
Joe Blaylock
9c803825ff Eliminate unused import and gratuitous prints 2014-01-23 16:12:18 -08:00