Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,039 Commits 1 Branch 0 Tags
09bdcbbc6f02c3f4e5c1f28d2cb956bce0dfceff
Commit Graph

4262 Commits

Author SHA1 Message Date
Feanil Patel
4636b2706c Merge pull request #2494 from edx/feanil/fix_cms_gather_assets 
Pull THEME_NAME from envs tokens if it's there.
 2014-02-06 11:25:37 -05:00
Will Daly
ac4d3e10d0 Disabled flaky JS transcript test 2014-02-06 08:00:25 -05:00
Feanil Patel
2aab8f89f2 Pull THEME_NAME from envs tokens if it's there. 
If the FEATURES['USE_CUSTOM_THEME'] flag is set but the
'THEME_NAME' is not set.  We get a compilation error during
cms gather assets.
 2014-02-05 18:40:03 -05:00
marcotuts
70f064e532 Merge pull request #2468 from edx/marco/studio/fix/component-header-styling 
Added back in component header visual separation from component renderin...
 2014-02-05 17:47:35 -05:00
marco
799095fd7b updated csscomb ordering for css properties, moving border above padding. 2014-02-05 17:04:00 -05:00
Adam Palay
f4c6bd1bad Revert "If unit display name is non-empty string, change it to a defaul (STUD-1284)" 
This reverts commit b8da1c5bb7.
 2014-02-05 13:07:33 -05:00
Adam Palay
b8da1c5bb7 If unit display name is non-empty string, change it to a defaul (STUD-1284) 2014-02-05 13:05:26 -05:00
Christina Roberts
235d10ddc6 Merge pull request #2434 from edx/christina/preview_handler 
preview_handler changes to support Locators
 2014-02-05 12:53:11 -05:00
cahrens
c2199279e7 Changes to preview to support xblocks using Locators intead of Locatins. 
STUD-967
 2014-02-05 12:16:20 -05:00
Dave St.Germain
a6797899da Removed inappropriate section tags. Because screen readers announce each section, they should not be used unless they are actually defining meaningful sections. 2014-02-05 11:32:08 -05:00
Calen Pennington
6d67d0c677 Merge pull request #1949 from cpennington/xblock-studio-js-and-css 
Enable XBlock js and css in Studio
 2014-02-05 08:19:45 -05:00
marcotuts
3e5a591afe added back in component header visual separation from component rendering block, making clear the display name for each component is not rendered to students 2014-02-04 18:57:09 -05:00
Calen Pennington
569c5def77 Make uses of quote_slashes always operate on encoded strings 2014-02-04 15:39:40 -05:00
Calen Pennington
f6731342de Make Studio load XBlock fragment js and css on the client-side 
[LMS-1421][LMS-1517]
 2014-02-04 15:38:13 -05:00
Carson Gee
69097e7b4a Merge pull request #2032 from carsongee/cg/ssl-studio 
More fully integrate and test ssl external auth in CMS
 2014-02-04 09:54:17 -08:00
Carson Gee
8cbe263ca0 Rename of feature AUTH_USE_MIT_CERTIFICATES to AUTH_USE_CERTIFICATES across platform. 
Caution! This is backwards incompatible
 2014-02-04 10:50:48 -05:00
Calen Pennington
49217ebe8b Allow multiple client-side runtimes on a single page 
Make XBlock client-side runtimes proper classes, so that handlerUrl can
be defined in a per-runtime way, and we can have multiple runtimes on a
single page.

[LMS-1630][LMS-1421][LMS-1517]
 2014-02-04 08:55:36 -05:00
David Baumgold
27b2ff7e99 Merge pull request #2401 from edx/db/component-label-display-name 
Pass component display name to Mako template
 2014-02-03 12:04:00 -08:00
Carson Gee
f33c308979 Switched from symlink to rename of template 2014-02-03 14:12:30 -05:00
Carson Gee
2bf6df23c8 More fully integrate and test ssl external auth in CMS 2014-02-03 14:00:40 -05:00
David Baumgold
46248c7006 add lettuce test for displaying category if display_name is empty 2014-02-03 13:45:07 -05:00
Calen Pennington
f5ffc94d16 Prep for initial language release 2014-02-03 13:35:56 -05:00
David Baumgold
7cab3869c4 Fall back on category is display_name is empty or unset 2014-02-03 12:10:55 -05:00
marcotuts
c43d36b704 visual styling adjustments to component header 2014-02-03 11:40:57 -05:00
David Baumgold
a78dad77ff Pass component display name to Mako template 
STUD-1241
 2014-02-03 11:40:47 -05:00
Julia Hansbrough
3aa80654cb Midcourse reverification: fixing broken tests 
Also, refactored code representing ReverifyInfo
 2014-01-31 22:08:09 +00:00
Julia Hansbrough
0b7594178b Moved reverification windows into common 
Added verification sidebar, banner for major courseware sections, quality & test improvements
 2014-01-31 22:08:08 +00:00
David Baumgold
aa105d7a58 translate component tooltips 2014-01-31 14:17:22 -05:00
David Baumgold
597474955b tabs to spaces 2014-01-31 14:15:44 -05:00
Jay Zoldak
9cfd649c08 Merge pull request #2137 from abdoosh00/feature/unicode 
Unicode changes to support R to L script
 2014-01-31 06:48:01 -08:00
Chris Dodge
7cd343e031 wire in env settings into aws.py 2014-01-30 16:38:43 -05:00
Jay Zoldak
bc30addfb9 Unicode changes to support QRF 
fixing unit tests

fixing merge error

fixing xqueue submission issue with unicode url (trial 0.1)

fixing fotmats as commented upon

removing yaml file language selection

Unicode changes to support QRF

removed unnecessary pass in modulestore/init.py

fixing merge error

fixing fotmats as commented upon

removing yaml file language selection

fixing pep8 violations

- fixing pylint violations

pylint violation

fixing line spaces and formats

ignore pylint E1101

remove empty line

fixing pylint violations

 pep8 violations

bulk mail unicode/decode

fix migration error

fix pep8 just to push again

more unicode/decode
Final changes to comments and error messages.
 2014-01-30 16:20:36 -05:00
chrisndodge
5951eb8dae Merge pull request #2379 from edx/chrisndodge/lock-accounts-after-failed-attempts 
Add AWS.py configuration hooks to tie in login failure lockout parameters
 2014-01-30 13:08:48 -08:00
Chris Dodge
cdf8b7cf16 add aws.py hooks 2014-01-30 15:38:02 -05:00
Chris Dodge
0d49305c4d add ability to have an optional password policy enforcement on account creation 2014-01-30 15:32:05 -05:00
David Baumgold
751669cbe7 /create_account: use proper HTTP status codes 
Use status code 400 when there is a validation error in creating an account.
 2014-01-30 15:23:57 -05:00
David Baumgold
6c40951cbb /register_post is an invalid URL 2014-01-30 13:42:47 -05:00
chrisndodge
1b7e144beb Merge pull request #2331 from edx/chrisndodge/lock-accounts-after-failed-attempts 
Ability to lock out accounts for N seconds after M failed login attempts
 2014-01-30 07:34:06 -08:00
Christina Roberts
088a713788 Merge pull request #2330 from edx/christina/export-commands 
Export conversion script
 2014-01-30 06:59:22 -08:00
David Baumgold
08fb49506a Merge pull request #2302 from edx/db/django-command-migrate-to-split 
Django command for migrating courses to split-mongo (and deleting)
 2014-01-30 06:51:27 -08:00
cahrens
2ee964345f Convert between export formats. 
STUD-1196
 2014-01-30 09:22:43 -05:00
Oleg Marshev
13c19c98e2 Add role parameter to LTI. BLD-583. 2014-01-30 14:37:33 +02:00
David Baumgold
7cbee5e817 rename locator_string to package_id 2014-01-29 16:57:01 -05:00
Chris Dodge
8c60f2935a Add optional feature to lock out accounts after N failed login attempts. Lockouts will last M seconds. 
add DB migration and fix earlier mistakes in student migration history

add tests and fix bugs that came out of those unit tests

remove unused import

pep8/pylint

address some PR feedback

fix tests

fix broken test

try to mock time

use freeze-gun to overload the system time to simulate the future
 2014-01-29 16:54:28 -05:00
David Baumgold
e7c5e62da7 Read from doc url mapping file at load time, rather than once per request 2014-01-29 15:28:40 -05:00
David Baumgold
e10e47d8ab Add test for specifying locator to migrate_to_split command 2014-01-29 15:11:05 -05:00
David Baumgold
cfdc5b5e96 fix docstrings 2014-01-29 15:11:05 -05:00
David Baumgold
e0c1abc11f check for old mongo course 2014-01-29 15:11:05 -05:00
David Baumgold
e18507f188 fix pep8/pylint issues 2014-01-29 15:11:04 -05:00
David Baumgold
3eee65892b Added command to delete split-mongo course 2014-01-29 15:11:04 -05:00