6376 Commits

Author	SHA1	Message	Date
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
Will Daly	5347a49975	Disable test that fails intermittently in master	2013-09-23 16:50:02 -04: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
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
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
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
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
Vik Paruchuri	c3a155da93	Merge pull request #1064 from edx/fix/vik/pg-tests ... Add in peer grading tests to cover linking behavior	2013-09-20 10:42:37 -07:00
Vik Paruchuri	ecb6f0f944	Add in peer grading tests to cover linking behavior	2013-09-20 11:47:26 -04:00
Don Mitchell	7d13eb8f7d	Add locked attribute to assets.	2013-09-20 11:28:00 -04:00
Don Mitchell	e69955b437	Pylint/pep8 fixes	2013-09-20 11:28:00 -04:00
jkarni	b580aa0f1f	Merge pull request #1024 from edx/jkarni/fix/IOError ... Catch IOError and ignore if OS X companion file	2013-09-20 08:22:51 -07:00
Brian Talbot	9661cde5c5	xmodule - Capa/HTML: adds top/bottom margin to table elements	2013-09-20 11:10:56 -04:00
Brian Talbot	7362e267d7	xmodule - Capa/HTML: adds in standard text-justification class names authors can use within table cells	2013-09-20 11:10:56 -04:00
jmclaus	66bd8127e6	Acceptance tests now pass	2013-09-20 14:04:58 +02:00
jmclaus	7af892e66a	Disabled video autoplay for students	2013-09-20 14:04:57 +02:00
Adam	75b7514c4f	Merge pull request #965 from felipemontoya/features/fmo/lms-i18n-strings ... Features/fmo/lms i18n strings	2013-09-19 12:05:35 -07:00
Felipe Montoya	92d1f232ed	Adding to the problem template	2013-09-19 12:33:58 -05:00
Calen Pennington	0d0cb56501	Speed up Location creation returning existing locations where possible	2013-09-19 12:15:20 -04:00
polesye	78c9f7e398	Disable temporarily failed js unit tests.	2013-09-19 09:24:34 +03:00
Jay Zoldak	bd06877109	Merge pull request #1046 from edx/zoldak/quiet-fast-acceptance ... Zoldak/quiet fast acceptance	2013-09-18 13:37:30 -07:00
Giulio Gratta	c90262ebcb	Adding support for ICE track changes to calibration UI improvements	2013-09-18 12:52:20 -07:00
Jay Zoldak	be51ee2c46	Speed up lms login	2013-09-18 15:51:31 -04:00
Jay Zoldak	9e368b8d9a	Quiet the output of passing acceptance tests	2013-09-18 15:51:10 -04:00
Adam	343456e314	don't remove comments from xml module	2013-09-18 15:39:18 -04:00
Julian Arni	e26b1be3a4	Remove useless try-except clause	2013-09-18 15:28:19 -04:00
Julian Arni	0972f2207d	Catch IOError and ignore if OS X companion file	2013-09-18 15:24:52 -04:00
Jay Zoldak	da538b8770	Merge pull request #1044 from edx/zoldak/acceptance-grid ... Add ability to run against generic selenium grid	2013-09-18 12:07:21 -07:00
Calen Pennington	1d2e0b6615	Merge pull request #930 from cpennington/rename-xblock-field-data ... Rename xblock_field_data to xmodule_field_data	2013-09-18 11:33:25 -07:00
Brian Talbot	8815962356	Studio: Converts all class-based Sass archetype-focused @extends to use Sass placeholder syntax	2013-09-18 14:14:11 -04:00
Jay Zoldak	4c411e2121	Add ability to run against generic selenium grid	2013-09-18 13:49:34 -04:00
jmclaus	7659c5b130	Removed unfocused class and set the captions default values of outline-width and outline-style to it.	2013-09-18 17:34:49 +02:00
jmclaus	752e1d8b4f	Caption have unfocused class as default	2013-09-18 17:34:48 +02:00