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

4186 Commits

Author SHA1 Message Date
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
Alexander Kryklia
688d47fb62 Give numerical response tolerance as a range (for example [5,7)) (BLD-25) 2014-01-27 14:58:19 +02:00
polesye
b8eba4192c BLD-699: Fix i18n. 2014-01-27 07:49:22 +02:00
Giulio Gratta
0429ba7da3 Fixed all instances of "occured" typo 2014-01-24 16:13:26 -08: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
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
Sarina Canelake
f88c108527 i18n xmodule/course_module.py 
LMS-1747
 2014-01-23 15:05:05 -05:00
marco
68891e5a99 updated static pages tests to reflect html element change in component.html 2014-01-23 12:35:58 -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
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
polesye
645007f910 BLD-364: Merge "video sources" and "download video" fields. 2014-01-23 11:27:28 +02: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
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
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
cahrens
5da8de018e Don't pass variables to gettext. 2014-01-22 14:39:27 -05:00
cahrens
3eb0018629 Make ordinal in duplication statement friendlier. 2014-01-22 14:11:23 -05:00
Andy Armstrong
89c2f4dd28 Implement a course outline REST API 
STUD-1192
 2014-01-22 12:00:26 -05:00
polesye
4a36fa892b BLD-368: Turn "download transcript" into a dropdown. 2014-01-22 18:25:03 +02: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
Valera Rozuvan
33031b76f4 Enable correct total time display in VCR for YouTube videos. 
Before this, the VCR showed total time as 00:00:00 for YouTube
videos just after page loaded. The correct total time is shown only
after the user clicks Play button.

BLD-529.
 2014-01-22 16:38:24 +02:00
Calen Pennington
a6035698d5 Correctly compute course image location when using mongo modulestore 
[LMS-2073]
[STUD-1197]
 2014-01-22 07:17:40 -05:00
Calen Pennington
923c2ff46e Add failing tests for course image names 
Tests LMS-2073 (non-ascii course image names) and STUD-1197 (spaces in
course image names)
 2014-01-22 07:16:30 -05:00
Will Daly
8aa208e80d Disabled latex acceptance test 2014-01-21 15:01:36 -05:00
zubair-arbi
7bdcc84857 Merge pull request #2214 from zubair-arbi/zub/story/std1183-staticpagestest 
enable tests depending on assert is_css_present(css_selector)
 2014-01-21 06:50:27 -08:00
Don Mitchell
003ad76c64 Merge pull request #2209 from edx/db/lms_date_agnostic 
Detached categories don't access control on date
 2014-01-19 08:46:28 -08:00
Don Mitchell
d999d0af1b Detached categories don't access control on date 2014-01-17 17:53:14 -05:00
Carson Gee
207f3c585c Merge pull request #2196 from carsongee/cg/forum_roles_on_import_command 
Adding missing forum permissions seeding routine to xml_import
 2014-01-17 13:27:19 -08:00
Carson Gee
1e809a4210 Adding missing forum permissions seeding routine to xml_import 
Currently if a course is only imported from the command line the
forum permissions are not seeded, this adds that functionality
Switched to doing seeding outside of xmodule library
Switched to using course_items
Switching to simpler test class
 2014-01-17 15:17:48 -05:00
Adam Palay
981a7f9479 Revert django-debug-toolbar related updates on master, set version to 0.9.4 
(STUD-1201)

Revert "Specific django-toolbar version (stable released) and update the panels in dev envs"

This reverts commit a465b082da.

Revert "Updated settings for devstack django debug toolbar"

This reverts commit 30199e8a61.
 2014-01-17 14:17:38 -05:00
zubiar-arbi
dc570859da enable tests depending on assert is_css_present(css_selector) 
STUD-1183
 2014-01-17 21:11:17 +05:00
Will Daly
30199e8a61 Updated settings for devstack django debug toolbar 2014-01-16 18:53:11 -05:00
Cristian Salamea
a465b082da Specific django-toolbar version (stable released) and update the panels in dev envs 2014-01-16 14:11:17 -05:00
Christina Roberts
a3d22097b9 Merge pull request #2182 from edx/christina/duplicate 
Support duplicating an existing xblock to a supplied parent location.
 2014-01-16 11:04:39 -08:00
Mark Hoeber
a505fa951d Merge pull request #2173 from edx/markhoeber/documentation/STUD-1144 
Added notes about quotations to Advanced Settings page help
 2014-01-16 10:06:59 -08:00
Don Mitchell
3885e6cf78 Merge branch 'release' 
Conflicts:
	lms/templates/help_modal.html
	lms/templates/index.html
 2014-01-16 12:51:22 -05:00
cahrens
81fecf3e6c Duplicate children so as to not create a DAG. 2014-01-16 11:24:35 -05:00
zubiar-arbi
769c7221fa dont update iframe src attribute if it is empty 
STUD-1136
 2014-01-16 13:33:54 +05:00
Will Daly
ca180834dc Merge pull request #2128 from edx/will/bok-choy-fixtures-rebase 
Bok-choy fixtures, Studio tests, and (some) ORA tests
 2014-01-15 12:18:47 -08:00
cahrens
0d8d7cb393 Support duplicating an existing xblock to a supplied parent location. 
STUD-1190
 2014-01-15 14:36:40 -05:00
Mark Hoeber
fd45874372 Updated help on Advanced Settings page 
Added note to use double, not single quotes for string values.
STUD-1144
 2014-01-15 14:21:59 -05:00
Will Daly
4afd5ea49f Refactored bok-choy directory structure 
Added fixtures for course and xblock creation
Added bok-choy Studio tests
Added bok-choy tests for ora self- and ai- assessment
Refactored auto-auth; added staff and course-enrollment options
Removed extra javascript properties from page objects
 2014-01-15 09:37:32 -05:00
Don Mitchell
ad3140a6e6 Cleaned up modules to reflect centralizing auth 2014-01-14 17:04:44 -05:00
Don Mitchell
3ebac80778 Replace authz fns with roles.py ones 
STUD-1006
 2014-01-14 17:04:44 -05:00
Chris Dodge
a3211a7405 Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org 
fix errorenous logic when running a microsite that could reside in a hosting environment with a marketing site in front of it

pep8/pylint fixes

address PR feedback, remove underscore from test hostname

more pep8/pylint cleanup. Skip test_microsites test, it works on localdev, not on Jenkins. Need to talk with QA team

manually add Ned's single-to-double quote fix

change aws.py runtimes so that the microsite_dir that is read from configuration is changed to a python path

Conflicts:
	lms/templates/help_modal.html
 2014-01-14 14:36:01 -05:00
Calen Pennington
46109bb3e8 Use XBlock xml serialization and deserialization 
XModules continue to use their own interface for xml, but provide an
adaptor that makes the the XBlock interface available.

[LMS-179]
 2014-01-14 13:28:47 -05:00