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

6587 Commits

Author SHA1 Message Date
Greg Price
b60f5f807d Make forums endpoints return better status codes 
Previously, AJAX calls would return 400, and page views and attempts
to load inline discussions would return 404 if communication with the
comments service failed. Now such problems cause a 500 status code.
 2013-10-10 14:20:48 -04: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
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
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
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
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
Frances Botsford
729c0bca09 updating video download links to a list - review feedback 2013-10-09 14:40:01 -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
David Baumgold
8906cffb22 correct placement of baseUrl variable, use it to configure requirejs 2013-10-09 11:28:46 -04: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
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
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
Sarina Canelake
c9172b79e6 Change the default FROM address for bulk email 2013-10-08 16:38:08 -04: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
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
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
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
David Baumgold
15b65fbecc Fix static links for footer images 2013-10-08 11:39:22 -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
7f29ac56fe Merge pull request #1244 from edx/will/fix-wordcloud 
Remove unnecessary call from wordcloud test
 2013-10-08 07:40:55 -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
Valera Rozuvan
de1381dbfc Added acceptance tests. 2013-10-08 12:00:07 +03:00
Valera Rozuvan
812b085b84 Added hard-coded flag to video.html that turns on/off autohiding of captions. 
Front-end functionality was not removed. When flag is set to "True", old
behaviour of autohiding of controls and captions will be enabled.
 2013-10-08 12:00:06 +03:00
Ned Batchelder
a4bf549af4 Use assertIsInstance instead of assertTrue(type(x) == y) 2013-10-07 18:20:31 -04:00
Adam Palay
c64399424e re-enable some buttons on instr dash 2013-10-07 18:13:21 -04:00
Will Daly
4effdbb4b2 Remove unnecessary call from wordcloud test 2013-10-07 18:09:54 -04:00
David Ormsbee
8ea3e2047c Merge pull request #1231 from edx/ormsbee/verify_tests3 
Model tests for verify_student flow.
 2013-10-07 12:57:24 -07:00
David Ormsbee
02fc6a40db Add model tests to verify_student flow. 2013-10-07 15:56:38 -04:00
David Baumgold
fd7e8baccb Tie the USE_I18N setting to DEBUG setting 
We want USE_I18N to be on in development, but off in production. Tying
this setting to the DEBUG setting accomplishes that neatly.
 2013-10-07 15:04:15 -04:00
Adam
faf796b574 Merge pull request #1125 from edx/adam/remove-instr-dash-buttons 
disable buttons for legacy and beta instr dash
 2013-10-07 10:36:51 -07:00
Brian Talbot
8ec583c355 LMS: abstracts consistent message/copy color styling from Instructor Dashboard view 
LMS: adds message styling to the separate instructor_2 Sass file
 2013-10-07 10:14:10 -04:00
Adam Palay
197f9015aa disable buttons for large courses on legacy and beta instr dash 
set max enrollment for downloads to 200
 2013-10-07 10:11:08 -04:00
Will Daly
3257a7baf2 Refactored navigation feature 
Fixed grading tests
 2013-10-07 09:41:18 -04:00
David Baumgold
715aa6985e Merge pull request #662 from edx/db/requirejs 
requirejs in Studio
 2013-10-04 11:42:07 -07:00
Usman Khalid
a47442ed01 Merge pull request #1222 from edx/usman/lms1112-register-form-help-text 
register.html: Corrected help text for username & name fields
 2013-10-04 11:28:31 -07:00
David Baumgold
d97921e6e2 Convert Studio JS to use require.js 2013-10-04 13:43:50 -04:00
Diana Huang
f51a99c9bc Add in the static namespace to the new template 2013-10-04 13:28:33 -04:00
Will Daly
54ea98d249 Merge pull request #1219 from edx/will/run-individual-tests 
Allow rake test to run individual tests again
 2013-10-04 07:27:30 -07:00
Diana Huang
3ec8df9f5e Merge pull request #1216 from edx/diana/dashboard-cleanup 
Some dasbhoard template cleanup
 2013-10-04 06:17:06 -07:00