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
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
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
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
Will Daly
17d8bd219a
Merge pull request #1319 from edx/will/enable-bulk-email-tests
...
Enable and update bulk email acceptance test
2013-10-17 05:44:48 -07:00
David Ormsbee
fc320ffef0
Merge pull request #1334 from edx/fix/ichuang/instructor-dashboard-grades-for-assignment
...
Fix/ichuang/instructor dashboard grades for assignment
2013-10-17 03:43:17 -07:00
Giulio Gratta
1fad68b5ca
Adding ICE undo feature
2013-10-16 16:01:56 -07:00
Jay Zoldak
dbfc38dfa9
Merge pull request #1370 from edx/zoldak/refactor-cms-acceptance-js
...
refactor studio component creation in acceptance tests
2013-10-16 14:47:29 -07:00
David Baumgold
76e6f8bc0d
Fix up Tender load order
...
So that tender_widget.js loads after we've defined window.Tender
2013-10-16 17:25:58 -04:00
Jay Zoldak
33f6d3b819
Address code review comments
2013-10-16 17:08:32 -04:00
Don Mitchell
d45beaebfa
Test the new RESTful course index and outline views.
2013-10-16 16:54:32 -04:00
Don Mitchell
095a4e3d93
Remove IDE-specific placeholder from before we had manage.pyUse manage.py instead (with cms --settings dev runserver --noreload --traceback 8001)
2013-10-16 16:54:32 -04:00
Don Mitchell
fbc68df88b
Ensure bootstrapping tests start w/ clean slate.
2013-10-16 16:54:31 -04:00
Don Mitchell
95ea4dc9cc
Tests for Locator <-> Location help functions
2013-10-16 16:54:31 -04:00
Don Mitchell
010905eb99
RESTful api for getting course listing and opening course in studio.
...
Pattern for how to do refactoring from locations to locators and from
old style urls to restful ones.
2013-10-16 16:54:31 -04:00
