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

3726 Commits

Author SHA1 Message Date
David Baumgold
b6281cb0a6 Define CMS.URL.UPLOAD_ASSET immediately 2013-10-11 17:12:00 -04:00
David Baumgold
fb01d8fa81 Fixes to avoid CSRF error in acceptance tests 2013-10-11 17:11:59 -04:00
David Baumgold
1007f5aeb4 load gettext on every page 2013-10-11 17:11:59 -04:00
Christina Roberts
11142c7cbb Merge pull request #1300 from edx/christina/fix-rounding-error 
Grading rounding error.
 2013-10-11 07:33:26 -07:00
Frances Botsford
4fc801f09f fix for forgot password alignment on studio log in page 2013-10-11 09:51:44 -04:00
Brian Talbot
03c9a46d79 Studio: visually hides the tender widget tag UI, again 2013-10-10 16:37:31 -04:00
David Baumgold
3e9c09e097 Ensure that jQuery loads before any other JS dependency 2013-10-10 14:27:29 -04:00
David Baumgold
cf66d0a52a Merge pull request #1303 from edx/db/source-edit-leanModal 
source-edit.html depends on leanModal
 2013-10-10 11:26:55 -07:00
John Jarvis
92a7d75b5d Merge pull request #1305 from edx/jarv/revert-1240 
Revert "Merge pull request #1240 from edx/dhm/config_separation"
 2013-10-10 10:27:58 -07:00
chrisndodge
82e42cc580 Merge pull request #1156 from edx/feature/cdodge/add-preview-configs-via-middleware 
add some middleware to determine whether draft modulestore or non-draft ...
 2013-10-10 10:24:51 -07:00
David Baumgold
b80d1572f0 source-edit.html depends on leanModal 2013-10-10 13:16:15 -04:00
John Jarvis
a517dc2085 Revert "Merge pull request #1240 from edx/dhm/config_separation" 
This reverts commit ec01253e30, reversing
changes made to ae8c9710e5.
 2013-10-10 13:14:08 -04: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
8c080b6fb6 Acceptance test for fixing rounding error on weight. 2013-10-10 12:02:21 -04:00
cahrens
3ed2fcbb31 Parse floats to ints in CourseGrader model. 
Fixes STUD-826.
 2013-10-10 12:02:21 -04: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
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
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
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
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
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
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
Chris Dodge
8f9d815f10 add some middleware to determine whether draft modulestore or non-draft modulestore should be used 
change to use regex to do the domain mappings. Also add config to AWS to be able to set from configuration file.

handle cases where HTTP_HOST is none, like in unit tests

add linefeed at end

fix up regex matches

switch to use thread local storage to hold the request itself

.

.

convert over to use open source 3rd party library

convert over to use django-cum

add unit test

remove comment

.

add comment to config setting

fix comment

use better regex for localdev

no need to break

no need to wrap an imported function, it's visible to any file that is importing us

add comment

add unit test

clean up test

use a separate env file to set the preview hostname
 2013-10-09 11:53:26 -04:00
David Baumgold
61c25fa6ee load common libs via require 
using requirejs config to define deps
 2013-10-09 11:38:14 -04: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
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
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
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
Calen Pennington
658810a94f Use xblock render shortcuts 2013-10-08 15:58:23 -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
Will Daly
774dd03668 Disable another video caption test 2013-10-08 14:07:35 -04:00
Will Daly
7eb4522b32 Disabled video caption acceptance tests 2013-10-08 13:28:45 -04: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