6405 Commits

Author	SHA1	Message	Date
Diana Huang	78829a37b5	Merge pull request #1127 from edx/diana/modes-expiration-dates ... Add the ability to set expiration dates on course modes.	2013-09-25 14:22:22 -07:00
Diana Huang	37d906e4db	Add the ability to set expiration dates on course modes.	2013-09-25 16:15:42 -04:00
Don Mitchell	ef26e8baa3	Just write the loc name as the key in the policy file	2013-09-25 14:41:42 -04:00
Will Daly	2338ed2d8a	Merge pull request #1126 from edx/will/fix-openid-test ... Fix intermittent failure in OpenID test	2013-09-25 11:36:02 -07:00
Calen Pennington	f4b37b28b1	Merge pull request #1060 from cpennington/lazy-textbooks ... Make Textbooks properly lazy	2013-09-25 11:32:09 -07:00
Will Daly	2b54922285	Fix intermittent failure in OpenID test	2013-09-25 13:05:56 -04:00
jkarni	7bd54546e3	Merge pull request #597 from edx/feature/msteele/scrollup ... Add scroll-to-top when switching verticals from bottom nav buttons.	2013-09-25 08:38:24 -07:00
Valera Rozuvan	a8349a06cd	Merge pull request #1120 from edx/valera/fix_for_unnecessary_outline_around_video ... Fix for bug BLD-359: Unnecessary focus outline around Video Player.	2013-09-25 07:00:47 -07:00
Diana Huang	19ee540a33	Merge pull request #1115 from edx/diana/verify-pep8-pylint ... Clean up some old pep8/pylint violations	2013-09-25 06:23:47 -07:00
Don Mitchell	dd788c8fb2	Merge pull request #1107 from edx/dhm/bug_attrs ... Ensure location is valid before trying to fetch	2013-09-25 05:50:49 -07:00
Valera Rozuvan	8b4489233e	Fix for bug BLD-359: Unnecessary focus outline around Video Player.	2013-09-25 14:53:46 +03:00
Diana Huang	4ee9ef61cf	Clean up some old pep8/pylint violations ... Also, deletes some unused code.	2013-09-24 17:12:31 -04:00
Don Mitchell	20e4d585c8	Add documentation and comments.	2013-09-24 16:31:21 -04:00
Don Mitchell	d1a82f2ac5	Import/export static content properties ... Even though xml based courses will ignore.	2013-09-24 16:31:20 -04:00
Greg Price	7275f85232	Merge branch 'release'	2013-09-24 15:27:18 -04:00
jkarni	ad939b1e7c	Merge pull request #1090 from edx/jkarni/feature/middleware-locked-assets ... Jkarni/feature/middleware locked assets	2013-09-24 12:25:05 -07:00
Julian Arni	1a0b752a81	Review fixes	2013-09-24 14:59:07 -04:00
Jay Zoldak	002f3ef9e2	Speed up waiting for elements not present on remote webdriver sessions.	2013-09-24 11:27:42 -04:00
Don Mitchell	3b61d5721a	Ensure location is valid before trying to fetch ... Prevent accidental wildcarding.	2013-09-24 09:03:36 -04:00
jmclaus	3a5d7d8638	Addressed PR comments	2013-09-24 12:12:10 +02:00
jmclaus	feb95eb869	Fixed tests	2013-09-24 10:31:37 +02:00
jmclaus	2cc9679ea8	Used Jasmine jQuery for tests instead	2013-09-24 10:31:37 +02:00
jmclaus	ffa49b0391	Added tests	2013-09-24 10:31:37 +02:00
jmclaus	9836fd51c7	Speed control now regains focus after a speed entry has been selected with the keyboard	2013-09-24 10:31:36 +02:00
Greg Price	4a2a6fba80	Merge pull request #1103 from edx/dhm/asset_bug ... Dhm/asset bug	2013-09-23 14:24:19 -07:00
Will Daly	5347a49975	Disable test that fails intermittently in master	2013-09-23 16:50:02 -04:00
Greg Price	973751124d	Merge pull request #1101 from edx/gprice/forum-a11y ... Improve forums nav accessibility	2013-09-23 13:49:34 -07:00
jkarni	199f898d23	Merge pull request #1087 from edx/jkarni/fix/revert-xml-comments ... Jkarni/fix/revert xml comments	2013-09-23 12:18:21 -07:00
Don Mitchell	a4ee129f04	Merge pull request #1095 from edx/dhm/asset_bug ... Fixed missing read (cut/paste f'up)	2013-09-23 12:17:56 -07:00
Julian Arni	e5c90d33fc	Fix middleware order in CMS. ... And include Don's fix for partial course_id lookup.	2013-09-23 15:11:06 -04:00
Calen Pennington	63b841bca9	Merge pull request #1062 from cpennington/speed-up-location-creation ... Speed up Location creation returning existing locations where possible	2013-09-23 11:55:36 -07:00
Calen Pennington	25ea91ed4a	Merge pull request #1061 from cpennington/faster-location-urls ... Turn Locations into dicts less often	2013-09-23 11:55:00 -07:00
Don Mitchell	3daeb59aca	Fixed missing read (cut/paste f'up)	2013-09-23 14:09:58 -04:00
Calen Pennington	cfa2b27f26	Turn Locations into dicts less often	2013-09-23 13:46:48 -04:00
Calen Pennington	ad2da44cb1	Make Textbooks properly lazy	2013-09-23 13:44:34 -04:00
Julian Arni	b4e6a8b209	Fix order-dependency in tests	2013-09-23 10:52:05 -04:00
Julian Arni	920b76410c	Revert "don't remove comments from xml module" ... This reverts commit 343456e314.	2013-09-22 21:39:36 -04:00
Julian Arni	303508a95b	Revert "Make default parser keep comments" ... This reverts commit 238899faac.	2013-09-22 21:39:14 -04:00
Jason Bau	730b7c626d	Merge pull request #1081 from edx/jbau/shib-bugfixes ... Jbau/shib bugfixes	2013-09-20 21:15:41 -07:00
Julian Arni	268b5b47ae	Remove cache workaround	2013-09-20 17:25:43 -04:00
Jason Bau	7c1a3e1ea1	wording changes for setting help	2013-09-20 14:23:05 -07:00
Jason Bau	9c4ff9ba95	Add setting on combinedopenended to allow peergrading of finished submissions	2013-09-20 14:23:05 -07:00
Julian Arni	bf633f9c5d	Perform auth checks in middleware ... Includes static server tests.	2013-09-20 17:22:08 -04:00
Vik Paruchuri	57fb306c74	Merge pull request #1068 from edx/feature/vik/oe-save ... Implement a save button for open ended responses	2013-09-20 14:16:32 -07:00
Brian Talbot	936d2e0ffe	Merge pull request #1047 from edx/talbs/lms-tablesupport ... Capa and HTML xmodules: Text Justification Styling Classes Table-based Displays	2013-09-20 14:01:03 -07:00
Vik Paruchuri	d9ce5e073b	Implement a save button for open ended responses	2013-09-20 16:35:10 -04:00
Jason Bau	b48e3a9661	fix some shib signup session related bugs	2013-09-20 11:53:32 -07:00
Jason Bau	11ecd162d4	fix _flatten_to_ascii for str inputs	2013-09-20 11:53:09 -07:00
Adam	065a1cf2bd	Merge pull request #1078 from edx/adam/parse-xml-module ... don't remove comments from xml module	2013-09-20 11:28:46 -07:00
Don Mitchell	464e0c77f4	Merge pull request #1045 from edx/assets/persist_lock ... save lock state in contentstore	2013-09-20 10:51:31 -07:00