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

20623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
marco
187955ae55 visual styling changes to components and static pages in order to use updated icon button styling for duplicate and delete actions 2014-01-23 09:04:40 -05: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