Julia Hansbrough
|
bce220d7ab
|
API tests, email tests, working notifications
|
2013-10-10 17:06:39 +00:00 |
|
Julia Hansbrough
|
259d728018
|
Merged in email confirmation modal
|
2013-10-10 17:06:38 +00:00 |
|
Will Daly
|
c66b5dc3d4
|
Added acceptance tests for bulk email (through beta dashboard)
|
2013-10-10 17:06:38 +00:00 |
|
Julia Hansbrough
|
e325317bde
|
Changed GET to POST and xmodule HTML editor call, section CSS
|
2013-10-10 17:06:37 +00:00 |
|
Julia Hansbrough
|
75eddb6a15
|
Implemented bulk email interface for new dashboard
Responses to Adam's comments; reset common.py, i18n compliance, deleted extraneous email.html file, fixed an HttpResponse, deleted unnecessary commented-out code, some small style tweaks
|
2013-10-10 17:06:36 +00:00 |
|
Adam Palay
|
3f8c2f55f5
|
disable buttons for large courses on legacy and beta instr dash
set max enrollment for downloads to 200
|
2013-10-10 17:06:34 +00:00 |
|
Julia Hansbrough
|
dba11a9677
|
Implemented bulk email interface for new dashboard
|
2013-10-10 17:06:34 +00:00 |
|
Christina Roberts
|
5b1b0fe1e6
|
Merge pull request #1285 from edx/christina/firefox-test-failure
Change mocking of height so it passes in Chrome as well as FireFox.
|
2013-10-10 09:59:30 -07:00 |
|
David Baumgold
|
7a24188ca6
|
Merge pull request #1278 from edx/db/increase-requirejs-timeout
Increase requirejs load timeout to 60 seconds
|
2013-10-10 09:37:39 -07:00 |
|
cahrens
|
6b5d864885
|
Change test to pass on Chrome as well as FireFox.
|
2013-10-10 12:01:11 -04:00 |
|
David Baumgold
|
30dc441807
|
Merge pull request #1288 from edx/db/grading-deps-ui
grading.js depends on jquery.ui
|
2013-10-10 08:49:24 -07:00 |
|
Christina Roberts
|
94ed3c6abb
|
Merge pull request #1275 from edx/christina/delete-static-tabs
Delete unused static-pages.html.
|
2013-10-10 08:28:24 -07:00 |
|
Will Daly
|
f37e12182e
|
Merge pull request #1296 from edx/will/tolerant-wait-for-requirejs
Make wait_for_requirejs more tolerant of errors
|
2013-10-10 08:13:34 -07:00 |
|
frances botsford
|
187fc8ea1c
|
Merge pull request #1280 from edx/fix/frances/lms-video-dl-buttons2
Improving the video and transcript download buttons
|
2013-10-10 07:10:38 -07:00 |
|
Frances Botsford
|
5d509c2e08
|
addressing review feedback on video buttons - switched to use themeable color variables
|
2013-10-10 10:09:43 -04:00 |
|
Will Daly
|
3376eb0f46
|
Make wait_for_requirejs more tolerant of errors
|
2013-10-10 09:59:54 -04:00 |
|
Ned Batchelder
|
9dba84fe1f
|
Merge pull request #1197 from edx/ned/quiet-lti-server-test
Suppress request logging in the LTI test server.
|
2013-10-10 06:50:31 -07:00 |
|
Julia Hansbrough
|
b70ee72580
|
Merge pull request #1290 from edx/flowerhack/fix/htmleditorlegacy
Defined baseUrl in the legacy instructor dashboard template
|
2013-10-09 16:31:29 -07:00 |
|
Jay Zoldak
|
ce8eaa713e
|
Merge pull request #1284 from edx/zoldak/fix-video-js-test
Fix intermittently failing video js tests
|
2013-10-09 15:08:23 -07:00 |
|
Julia Hansbrough
|
47685af07d
|
Defined baseUrl in the legacy instructor dashboard template, fixing a bug where the HTML editor would fail to load
|
2013-10-09 21:32:50 +00:00 |
|
David Baumgold
|
838f4df6b5
|
Merge pull request #1269 from edx/db/clarify-debug
Clarify USE_I18N settings
|
2013-10-09 13:55:30 -07:00 |
|
Ned Batchelder
|
d42a350784
|
Merge pull request #1279 from edx/ned/remove-cache-warning-from-tests
Remove the now-unused import.
|
2013-10-09 13:33:35 -07:00 |
|
Don Mitchell
|
ec01253e30
|
Merge pull request #1240 from edx/dhm/config_separation
Segregate the mongo db config from the modulestore config
|
2013-10-09 13:24:30 -07:00 |
|
David Baumgold
|
6c2dbce434
|
grading.js depends on jquery.ui
|
2013-10-09 15:59:27 -04:00 |
|
David Baumgold
|
cbaa3089ba
|
Updated comment
|
2013-10-09 15:54:01 -04:00 |
|
David Baumgold
|
ae8c9710e5
|
Merge pull request #1276 from edx/db/load-common-via-require
load common libs via require
|
2013-10-09 12:17:22 -07:00 |
|
David Baumgold
|
6c747e31bc
|
Merge pull request #1273 from edx/db/fix-drag-and-drop-requirejs
make drag_and_drop component work with requirejs and changed static url
|
2013-10-09 12:16:55 -07:00 |
|
Jay Zoldak
|
ac4ac23d25
|
Fix intermittently failing video js tests
|
2013-10-09 15:16:45 -04:00 |
|
cahrens
|
70cb24a37f
|
Delete unused static-pages.html.
|
2013-10-09 15:06:58 -04:00 |
|
Will Daly
|
b5f1d99829
|
Merge pull request #1282 from edx/will/wait-between-component-clicks
Wait between clicks for new component
|
2013-10-09 12:06:02 -07:00 |
|
Frances Botsford
|
729c0bca09
|
updating video download links to a list - review feedback
|
2013-10-09 14:40:01 -04:00 |
|
Christina Roberts
|
1e353985f9
|
Merge pull request #1281 from edx/christina/toggle-expand
Only change the collapse/expand state on the first child.
|
2013-10-09 11:11:40 -07:00 |
|
cahrens
|
28dd142758
|
Only change the collapse/expand state on the first child.
There are possibly children nested below that.
|
2013-10-09 13:25:36 -04:00 |
|
Frances Botsford
|
5653112f5e
|
ux cleanup of video and transcript download buttons
|
2013-10-09 12:02:09 -04:00 |
|
Sarina Canelake
|
650c913110
|
Merge pull request #1260 from edx/sarina/email_FROM_address
Change the default FROM address for bulk email
|
2013-10-09 08:57:00 -07:00 |
|
Christina Roberts
|
e2075476c1
|
Merge pull request #1274 from edx/christina/disable-sporadic-tests
Unfortunately, delete tests are still failing sporadically in Jenkins.
|
2013-10-09 08:55:49 -07:00 |
|
David Baumgold
|
7f783da16c
|
Increase requirejs load timeout to 60 seconds
|
2013-10-09 11:53:37 -04:00 |
|
David Baumgold
|
61c25fa6ee
|
load common libs via require
using requirejs config to define deps
|
2013-10-09 11:38:14 -04:00 |
|
David Baumgold
|
8906cffb22
|
correct placement of baseUrl variable, use it to configure requirejs
|
2013-10-09 11:28:46 -04:00 |
|
Ned Batchelder
|
9cd0771fd0
|
Merge pull request #1272 from edx/ned/remove-cache-warning-from-tests
Use a better metadata_cache_key
|
2013-10-09 08:18:46 -07:00 |
|
Will Daly
|
93edfb0b49
|
Merge pull request #1268 from edx/will/fix-problem-acceptance
Guard against StaleElementException in css_click
|
2013-10-09 07:52:38 -07:00 |
|
Will Daly
|
c6b6a2788c
|
Merge pull request #1270 from edx/will/fix-multistep-component-test
Fix for failures in component.feature
|
2013-10-09 07:52:23 -07:00 |
|
Carlos Andrés Rocha
|
fd7293144e
|
Merge pull request #1263 from rocha/add-config-root-env-variable-to-aws-config
Add variable to set location of config files on aws
|
2013-10-09 07:45:16 -07:00 |
|
cahrens
|
5b58318490
|
Unfortunately, delete tests are still failing sporadically in Jenkins.
|
2013-10-09 10:27:54 -04:00 |
|
David Baumgold
|
e53680bb92
|
make drag_and_drop component work with requirejs and changed static url
|
2013-10-09 10:26:22 -04:00 |
|
Calen Pennington
|
46ed857c1a
|
Merge pull request #1221 from cpennington/lms-xblock-css-js
Put XBlock css and javascript onto the LMS courseware page
|
2013-10-09 07:21:39 -07:00 |
|
Gabe Mulley
|
5359e2ebef
|
Merge pull request #1207 from mulby/gabe/tracking-tests
add acceptance tests for event tracking
|
2013-10-09 07:08:49 -07:00 |
|
Ned Batchelder
|
13f120b0ca
|
Remove the now-unused import.
|
2013-10-09 10:03:46 -04:00 |
|
Ned Batchelder
|
ca345d92cc
|
Write to stdout to keep messages, but not pollute tests.
|
2013-10-09 10:03:10 -04:00 |
|
Ned Batchelder
|
3c2d1003b4
|
Suppress request logging in the LTI test server.
|
2013-10-09 09:42:11 -04:00 |
|