Will Daly
04cce630bf
Create reports/javascript so test:js doesn't fail the first time
2013-10-18 14:07:05 -04:00
Will Daly
7c15edf686
Use js-test-tool v0.1.4
2013-10-18 14:03:45 -04:00
Ned Batchelder
009b3e9c50
Merge pull request #1403 from edx/ned/small-dictfielddata-cleanups
...
Simple cleanups of DictFieldData
2013-10-18 11:02:38 -07:00
Giulio Gratta
19d3e31d97
Merge pull request #1332 from edx/giulio/register-page
...
Change various text items to be more clear for users, as well as some grammar
2013-10-18 11:02:00 -07:00
Brian Talbot
38153f95d6
Merge pull request #1292 from edx/talbs/update-sass-bourbon-neat
...
Sass 3.2.12, Neat 1.4.0
2013-10-18 10:17:27 -07:00
Will Daly
9f1c5dd1ce
Merge pull request #1400 from edx/will/fix-grading-test
...
Added explicit wait to avoid reading default grading value
2013-10-18 09:15:00 -07:00
Brian Talbot
3a639ece1f
updating Neat generated utility files
2013-10-18 11:35:25 -04:00
Brian Talbot
5bbe330c0c
updating to Sass 3.2.12 and Neat 1.4.0
2013-10-18 11:35:25 -04:00
polesye
79f11de6de
Merge pull request #1342 from edx/anton/fix-video-multi-speed-bug
...
Video player: Fix multi speed bug
2013-10-18 08:09:42 -07:00
Will Daly
14b5f42c7c
Added explicit wait to avoid reading default grading value
2013-10-18 09:54:49 -04:00
Don Mitchell
9df7236065
Merge pull request #1307 from edx/dhm/datastore_config
...
Revert "Revert "Merge pull request #1240 from edx/dhm/config_separation"...
2013-10-18 06:27:08 -07:00
Don Mitchell
8fe99a6be2
Revert "Revert "Merge pull request #1240 from edx/dhm/config_separation""
...
This reverts commit a517dc2085
2013-10-18 09:22:30 -04:00
Jay Zoldak
70cea99856
Merge pull request #1394 from edx/zoldak/fix-cms-problem-acceptance
...
Add synchronization logic for waiting after adding components
2013-10-18 05:36:48 -07:00
Will Daly
7aff8a7791
Merge pull request #1362 from edx/will/acceptance-test-logs
...
Write Django logs to file during acceptance tests
2013-10-18 05:07:53 -07:00
Ned Batchelder
d3c7c0834d
Simple cleanups of DictFieldData
...
I tried to make DictFieldData strict about only being used with one
block. That effort failed ultimately, but these are reasonable changes
I made along the way.
2013-10-18 04:51:42 -04:00
polesye
613e7f5772
Merge pull request #1336 from edx/anton/fix-video-display-issue
...
Fix Video player display issue
2013-10-18 01:21:20 -07:00
polesye
df091e5023
Remove $.cookie.
2013-10-18 11:04:06 +03:00
polesye
dda6fbd45c
Fix typo.
2013-10-18 08:51:46 +03:00
polesye
730113837b
Add js unit tests.
2013-10-18 08:47:09 +03:00
polesye
eeab7847b4
Add resizing.
2013-10-18 08:47:09 +03:00
Giulio Gratta
cca057df56
Merge pull request #1395 from edx/giulio/ICE-confirm-reset
...
Add confirm dialog to ICE reset changes
2013-10-17 17:23:22 -07:00
Gabe Mulley
c1450c8375
Merge pull request #1349 from mulby/gabe/course-id-context
...
add course_id to all emitted events
2013-10-17 15:45:37 -07:00
Jason Bau
e5cda013a2
Merge pull request #1357 from edx/jbau/shoppingcart-user-middleware
...
Jbau/shoppingcart user middleware
2013-10-17 15:41:11 -07:00
Gabe Mulley
d2b03e28fb
add course_id to event context
2013-10-17 17:44:01 -04:00
Greg Price
0138322c2b
Merge pull request #1371 from edx/gprice/cs-request-logging
...
Log all comments service requests
2013-10-17 14:32:04 -07:00
Jason Bau
7223bb125e
make condition inline
2013-10-17 14:21:44 -07:00
Giulio Gratta
af0239ab0b
add confirm dialog to ICE reset changes
2013-10-17 14:11:05 -07:00
Giulio Gratta
0b8058d8c0
Merge pull request #1377 from edx/giulio/ICE-undo
...
Tweaking ICE undo feature
2013-10-17 13:58:45 -07:00
Jay Zoldak
5d84cd0627
Add synchronization logic for waiting after adding components in acceptance tests
2013-10-17 16:48:40 -04:00
Will Daly
e53c1f5f32
Merge pull request #1186 from edx/will/js-test-xunit
...
JavaScript xunit reports.
2013-10-17 13:37:53 -07:00
Giulio Gratta
6accfcd567
change various text items to be more clear for users, as well as some grammar
2013-10-17 13:18:58 -07:00
Giulio Gratta
db802fb543
update code to reflect comment
2013-10-17 11:30:54 -07:00
Will Daly
7316a3dc3b
js-test-tool generates xunit reports.
2013-10-17 14:22:09 -04:00
Don Mitchell
2678f2a148
Merge pull request #1386 from edx/dhm/bug-courseid
...
Allow - ~ and . in course, branch, & block ids
2013-10-17 11:21:21 -07:00
Will Daly
c1a5f18e9b
Updated testing docs
2013-10-17 14:17:48 -04:00
Don Mitchell
9fc5a8a4d6
Allow - ~ and . in course, branch, & block ids
2013-10-17 13:31:44 -04:00
Don Mitchell
4b225de3a0
Merge pull request #1381 from edx/bug/clear_assets
...
Ensure contentstore has no assets before generating test set
2013-10-17 10:25:37 -07:00
Giulio Gratta
5e45861dfb
Merge pull request #1374 from edx/giulio/video-help-text
...
Added help text to multiple speed video fields
2013-10-17 09:46:07 -07:00
Julia Hansbrough
d82fa03884
Merge pull request #1380 from edx/flowerhack/fix/certDollarValueConfirm
...
Flowerhack/fix/cert dollar value confirm
2013-10-17 09:04:48 -07:00
Don Mitchell
2b99947241
Merge pull request #1309 from edx/dhm/mongo_migrate
...
Compute ObjectId locally rather than delegating to Mongo db
2013-10-17 08:32:55 -07:00
Don Mitchell
fe438bec27
Ensure contentstore has no assets before generating test set
2013-10-17 11:08:25 -04:00
Julia Hansbrough
87d0ab91d5
Removed unused template
2013-10-17 15:02:05 +00:00
Julia Hansbrough
04bc669d09
Fixed bug LMS-1117
...
When registering for an verified certificate, if you selected a suggested price option, closed the browser halfway through the steps, and re-opened, the contribution would be written in the text input field instead of preselecting the appropriate radio button. This commit fixes that behavior
2013-10-17 14:59:43 +00:00
Don Mitchell
dda08930cd
Compute ObjectId locally rather than delegating to Mongo db
...
Was following a std sql pattern, but non-sql db's are slow write
and pymongo's ObjectId() is supposed to generate a true GUID
equivalent to waiting for the db to do so.
2013-10-17 10:49:07 -04:00
frances botsford
9f5bd4e65b
Merge pull request #1373 from edx/frances/fix/studio-grading-helptext
...
Bug fix STUD-771: updated grading help text...
2013-10-17 07:42:16 -07:00
Don Mitchell
978c19dd2c
Merge pull request #1325 from edx/dhm/paginate_assets
...
Add asset pagination
2013-10-17 07:16:09 -07:00
Don Mitchell
214a3bd251
pylint/pep8 cleanups
2013-10-17 09:52:13 -04:00
Don Mitchell
ee2a3750ac
Test leaving /start out of url.
2013-10-17 09:51:56 -04:00
David Baumgold
b0689a4ed5
Merge pull request #1375 from edx/db/requirejs-load-tender
...
Fix up Tender load order
2013-10-17 06:29:15 -07:00
Don Mitchell
a6ad531d50
Merge pull request #1287 from edx/dhm/restful_crud
...
Restful api prototype
2013-10-17 05:50:05 -07:00
