Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,471 Commits 1 Branch 0 Tags
9cd0771fd0cbf863d5e2ed57a9cfbaff70e390f0
Commit Graph

18471 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
Carlos Andrés Rocha
f2bf95b205 Add variable to set location of config files on aws 
The env variable CONFIG_ROOT is used to determine the location of the
JSON configuration files. This is useful when a deployment of the
platform is used to access different environments when executing django
commands.
 2013-10-08 14:46:18 -04:00
Will Daly
64e3624e16 Merge pull request #1262 from edx/will/disable-caption-test-2 
Disable another video caption test
 2013-10-08 11:33:01 -07:00
Will Daly
774dd03668 Disable another video caption test 2013-10-08 14:07:35 -04:00
Carlos Andrés Rocha
7749bbbe51 Add module grade to problem_check tracking log event 2013-10-08 13:53:35 -04:00
Carlos Andrés Rocha
b2cd0d28d1 Merge pull request #1229 from rocha/cleanup-eventtracking-mongo-authentication 
Cleanup mongodb authentication
 2013-10-08 10:46:33 -07:00
Will Daly
7a214344e5 Merge pull request #1261 from edx/will/disable-caption-tests 
Disabled video caption acceptance tests
 2013-10-08 10:36:40 -07:00
Will Daly
7eb4522b32 Disabled video caption acceptance tests 2013-10-08 13:28:45 -04:00
Julia Hansbrough
1200703076 Merge pull request #1258 from edx/flowerhack/fix/htmleditor 
Defined baseUrl in the LMS template
 2013-10-08 10:15:46 -07:00
Julia Hansbrough
d93e96cbc3 Defined baseUrl in the LMS template, fixing a bug where HTML editors called within LMS would fail to load 2013-10-08 17:03:52 +00:00
Christina Roberts
c484dc6cbb Merge pull request #1255 from edx/db/requirejs-load-jquery 
load jquery in requirejs deps
 2013-10-08 09:28:50 -07:00
David Baumgold
eb07e0bd58 Remove unused setup_require.coffee file 2013-10-08 12:06:18 -04:00
David Baumgold
0e9c15bf7f Merge pull request #1256 from edx/db/fix-footer-image 
Fix static links for footer images
 2013-10-08 09:02:21 -07:00
Christina Roberts
814a218bfb Merge pull request #1254 from edx/christina/enable-overview-tests 
Re-enable tests that were failing on Jenkins.
 2013-10-08 08:46:09 -07:00
David Baumgold
f1a104754e load jquery in requirejs deps 2013-10-08 11:40:42 -04:00
David Baumgold
15b65fbecc Fix static links for footer images 2013-10-08 11:39:22 -04:00
Carlos Andrés Rocha
e0fb94cc55 Cleanup mongodb authentication 
Authenticate to the database before getting a reference to the
collection.
 2013-10-08 11:26:29 -04:00
Ned Batchelder
a03a11e0e7 Merge pull request #1253 from edx/ned/use-assertisinstance 
Use assertIsInstance where we can
 2013-10-08 07:47:21 -07:00
Will Daly
560dac6ac5 Merge pull request #1242 from edx/will/disable-broken-tests 
Disable non-deterministic test to get stability on master
 2013-10-08 07:43:35 -07:00
Will Daly
7f29ac56fe Merge pull request #1244 from edx/will/fix-wordcloud 
Remove unnecessary call from wordcloud test
 2013-10-08 07:40:55 -07:00
Will Daly
c3bd7d3db8 Merge pull request #1243 from edx/will/fix-course-image-test 
Use wait_for to allow course image time to update
 2013-10-08 07:40:07 -07:00
Valera Rozuvan
e3c0bb839b Merge pull request #1183 from edx/valera/add_option_transcripts_remove_onhover 
Valera/add option transcripts remove onhover
 2013-10-08 07:37:02 -07:00
cahrens
9d31924793 Re-enable tests that were failing on Jenkins. 2013-10-08 10:23:47 -04:00
Christina Roberts
009deb7da8 Merge pull request #1236 from edx/christina/course-updates-bug 
Don't remove course update when clicking outside modal.
 2013-10-08 07:20:10 -07:00
Christina Roberts
c5733015fd Merge pull request #611 from edx/peter-fogg/draggabilly 
Rework drag/drop on overview and subsection pages.
 2013-10-08 07:14:34 -07:00
Adam
6418175a56 Merge pull request #1251 from edx/adam/remove-instr-dash-buttons 
re-enable some buttons on instr dash
 2013-10-08 07:04:25 -07:00
cahrens
1de194aaa4 Use RequireJS for test dependencies, and use domReady. 2013-10-08 09:55:15 -04:00
Valera Rozuvan
2cc25873e9 Fixing Jean Michel access. bug. 2013-10-08 16:52:21 +03:00