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

20636 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
marco
68891e5a99 updated static pages tests to reflect html element change in component.html 2014-01-23 12:35:58 -05: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
marco
623de12d4b adjusted unit_spec.js to reflect new HTML structure, and corrected screenreader label for delete button 2014-01-23 12:07:09 -05:00