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
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
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
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
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
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
Calen Pennington
2514dca550
Put XBlock css and javascript onto the LMS courseware page
...
This required changing structural XModules to fully implement
student_view, rather than just returning the HTML of their children in a
get_html call.
[LMS-223]
[LMS-1170]
2013-10-09 09:40:47 -04:00
Christina Roberts
5fc5587f9e
Merge pull request #1266 from edx/talbs/studio-dnd
...
Studio: Drag and Drop Container
2013-10-09 06:33:12 -07:00
Ned Batchelder
192222f2cc
Use a better metadata_cache_key
...
The old code created keys like "('course', 'org')", and the space
character caused a warning from Django during tests. Also, strings are
probably better than tuples for keys.
2013-10-09 09:27:25 -04:00
Will Daly
34c081d34b
Add retry logic if element not found
2013-10-09 09:14:50 -04:00
David Baumgold
16ca0252b3
Clarify USE_I18N settings
...
@jzoldak showed me that setting `USE_I18N = DEBUG` didn't actually accomplish
what I had hoped it would -- changing DEBUG didn't also change USE_I18N.
This pull request accomplishes what I was trying to accomplish, without being
quite so clever about it.
2013-10-09 09:04:12 -04:00
David Baumgold
4879b06c2a
Merge pull request #1235 from edx/db/tie-i18n-to-debug
...
Tie the USE_I18N setting to DEBUG setting
2013-10-09 05:45:20 -07:00
Gabe Mulley
17a0479849
add acceptance tests for event tracking
2013-10-09 08:09:14 -04:00
Will Daly
936b933a46
Guard against StaleElementException in css_click
2013-10-09 07:21:38 -04:00
Will Daly
95b284f80f
Wait between clicks for new component
2013-10-08 22:46:10 -04:00
Brian Talbot
bbe906f77f
Studio: changes drag and drop container to new .wrapper-dnd on outline/subsection views
2013-10-08 17:24:00 -04:00
Carlos Andrés Rocha
b62abe6566
Merge pull request #1246 from rocha/add-event-source-in-data-docs
...
Add event source in data docs
2013-10-08 14:03:55 -07:00
Carlos Andrés Rocha
e396bf883c
Replace Language with Event Source in the tracking logs documentation
...
Also:
- Add some missing event descriptions
- Reorganized rows to put relevant events together
2013-10-08 17:03:15 -04:00
Carlos Andrés Rocha
779ff4fd38
Merge pull request #1245 from rocha/add-grade-to-problem-check-event
...
Add module grade to problem_check tracking log event
2013-10-08 14:00:07 -07:00
Sarina Canelake
c9172b79e6
Change the default FROM address for bulk email
2013-10-08 16:38:08 -04:00
Calen Pennington
92cc103930
Merge pull request #1088 from cpennington/pseudo-merge-descriptors-and-modules
...
Proxy to XModule on demand
2013-10-08 13:29:30 -07:00
Calen Pennington
658810a94f
Use xblock render shortcuts
2013-10-08 15:58:23 -04:00
Calen Pennington
d785b1e213
Convert due_date_display_format tests to use factories
...
Previously, these tests modified due_date, which failed due to the new
restrictions on writing to Scope.settings from the LMS.
2013-10-08 15:29:17 -04:00
Calen Pennington
6b474724ac
Make XModuleDescriptor and XModule act as a single class
...
By transparently proxying between the XModuleDescriptor and the XModule,
and between their runtimes, we can make them act as a single class, so
that we can swap in an actual XBlock instead.
2013-10-08 15:29:17 -04:00
Greg Price
3cebb4eae2
Merge pull request #1264 from edx/gprice/fix-release-email-script
...
Fix bug that omits commits in release email script
2013-10-08 12:23:29 -07:00
Greg Price
6b7749f25e
Fix bug that omits commits in release email script
...
The command built to generate the list of commits committed but not
authored by a particular individual was incorrect, so some commits
were incorrectly omitted in the table as entries belonging to the
committer.
2013-10-08 15:22:57 -04:00
Don Mitchell
44d0494d33
Segregate the mongo db config from the modulestore config
...
as a first step to separating db connection from modeling
and to support location mapper and contentstore using same db config as modulestore
2013-10-08 15:01:48 -04:00
