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

4303 Commits

Author SHA1 Message Date
Julia Hansbrough
552572694f Added middleware for handling language changes 2014-02-14 22:34:29 +00:00
Julia Hansbrough
7d81a510bc Moved UserPreferences to common 2014-02-14 10:32:11 -05:00
polesye
faab4caeef BLD-837: Fix download transcript behavior. 2014-02-14 11:51:51 +02:00
Carson Gee
989a97963c Merge pull request #718 from edx/feature/ichuang/push-to-lms 
Let a Studio user export course to git (and via git, to elsewhere, eg LMS)
 2014-02-13 20:22:31 -05:00
Christina Roberts
0c74d6ac54 Merge pull request #2562 from edx/christina/lms-mixed 
Clean up of modulestore references (primarily LMS).
 2014-02-13 20:05:31 -05:00
Julia Hansbrough
5131818153 Merge pull request #2597 from edx/release 
Release
 2014-02-13 15:17:38 -05:00
Calen Pennington
d58358a484 Merge pull request #2555 from cpennington/xblock-acid-acceptance-tests 
Add acceptance tests of the Acid block in both LMS and Studio
 2014-02-13 14:23:31 -05:00
Calen Pennington
6125d97301 Add acceptance tests using the AcidBlock for LMS and Studio 
[LMS-1645]
[LMS-2062]
[LMS-2063]
[LMS-2064]
 2014-02-13 13:22:10 -05:00
Dave St.Germain
c7c807f270 Merge pull request #2426 from edx/dcs/a11y-labels 
Add labels to CAPA inputtypes.
LMS-1895
 2014-02-13 13:19:31 -05:00
Dave St.Germain
4fa1f1163e Added labels to CAPA input types, with markdown syntax for adding them 
in studio.
LMS-1895 and others
 2014-02-13 13:18:24 -05:00
Calen Pennington
3a7b265c8a Add trailing commas to multiline lists, to prevent string concatenation bugs 2014-02-13 13:12:42 -05:00
Carson Gee
5e0f781674 Major refactor and rename of feature 
All forward facing wording changed to Export to Git
Export to git functions removed from management command and put in common file
Additional error checking and documentation improvements
Nitpicks and other minor fixes
 2014-02-13 12:53:47 -05:00
Carson Gee
f02c074db9 Push To LMS updates 
Added tests
Converted scripts to django commands
Removed advanced module requirement
Generalized to platform
Switched to subprocess for shell commands
Beefed up resiliency and error checking.
Refactored since #1910 removed get_location_and_verify_access
Added settings to aws for export directory and reworked test setup and teardown
Several review based fixes
Added line to Changelog
Changed URL handler to be accepting and moved git bare repo inside of test_root/data
Added exception logging to help trace issues
Added output in exception logging
Made the branch to commit to explicit instead of implicit
Skipping git identity test on condition of global configuration set
 2014-02-13 10:21:18 -05:00
ichuang
e524f5be35 add push_to_lms to Studio; uses MITX_FEATURES['ENABLE_PUSH_TO_LMS'] 2014-02-13 10:01:28 -05:00
Christina Roberts
2b2d97cd5f Merge pull request #2578 from edx/christina/draft-bug-test 
Acceptance test for STUD-1311.
 2014-02-13 09:54:10 -05:00
cahrens
16200827c5 Acceptance test for STUD-1311. 2014-02-13 09:26:51 -05:00
Chris Dodge
6e3fb86255 Fix bug where video files with periods in them would end up producing an incorrect transcript file 2014-02-13 08:58:48 -05:00
Julia Hansbrough
d6c0ce161e Merge branch 'release' 2014-02-12 21:24:19 +00:00
Christina Roberts
b0b8257eee Merge pull request #2543 from edx/christina/reference_bug 
Rewrite Reference and ReferenceList fields on import
 2014-02-12 16:07:37 -05:00
Ali Reza Sharafat
85058ec460 Course short descriptions -- couple of more asserts and pep8 fixes 2014-02-12 20:24:26 +00:00
cahrens
894c40b89d Change Reference and ReferenceList instances on import to new namespace. 
STUD-149
 2014-02-12 15:22:12 -05:00
Calen Pennington
17fda08c8d Enable XBlocks in bok_choy tests 2014-02-12 13:41:14 -05:00
Calen Pennington
4403eb7209 Fix STUD-1311 (Don't overwrite published content w/ draft content accidentally) 2014-02-12 11:11:01 -05:00
zubiar-arbi
f7e78544de failing test for xblock_handler 
STUD-1311
 2014-02-12 10:13:58 -05:00
polesye
f957b34427 BLD-811: Revert functionality. 2014-02-12 12:05:02 +02:00
Frances Botsford
34ea03c887 fixed missing polyfill buttons, adjusted layout of number input in component editor 
UX-381
 2014-02-11 15:20:00 -05:00
cahrens
09d90b16af Clean up of modulestore references (primarly LMS). 
STUD-1151
 2014-02-11 14:29:22 -05:00
polesye
102d1cb253 Persist student progress in video. 
Student logins to edx, plays video, selects position, closes
browser, opens video, position is restored.

BLD-385
 2014-02-11 13:53:24 +00:00
polesye
faa97379b7 BLD-658: Add view for field type Dict in Studio. 2014-02-11 14:53:57 +02:00
Christina Roberts
4f696586b3 Merge pull request #2466 from edx/christina/move-tests 
Move tests related to views files into views/tests.
 2014-02-10 17:06:10 -05:00
cahrens
fc1e8fae2e Remove unused imports. 2014-02-10 16:08:59 -05:00
David Baumgold
a143309a22 Add unit tests to handle duplicate user registration attempts 2014-02-10 16:05:34 -05:00
cahrens
c2aa0bf629 pep8 cleanup 2014-02-10 16:03:06 -05:00
cahrens
5dfe9d7052 Remove unused methods. 2014-02-10 16:03:06 -05:00
cahrens
f9c1c0b38b Move tests related to views files into views/tests. 2014-02-10 16:03:06 -05:00
Don Mitchell
16f0d12a1f Merge pull request #2356 from edx/dhm/mixed_ms_wrapper 
MixedModulestore wraps most getters, update_item, delete_item
 2014-02-10 16:01:50 -05:00
Andy Armstrong
651d1afbf8 Add the ability to view templates in a browser in development mode 
This adds a simple mechanism to view any template file directly in a browser. The intention is that we can use this to build up reference HTML files which illustrate common UX patterns. We can then view the resulting pages without having to have a working implementation.

In development mode, the URL is /template followed by the path to the template file. For example, you can view the 404 page at:

    /template/404.html

You can also supply string parameters to the template by specifying them as query parameters in the URL.

e.g.  /template/my_template?name=Foo
 2014-02-07 14:56:35 -05:00
Giulio Gratta
5e67612e9b Image Modal CMS HTML Block subtype 
- Added YAML file for the HTML template code for the modal to work
- Added CSS and JS code for modal to look and function properly
- Updated code to take comments into account.
- Simplified HTML template and expanded JS to set up image modal on load.
- Added preliminary drag script.
- Converted jQuery UI draggable to Draggabilly
 2014-02-07 09:21:20 -08:00
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
Don Mitchell
1de9d55844 Review-driven changes (to-be-squashed) 2014-02-05 16:34:24 -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
Don Mitchell
b8ea7f3c43 update_item and other refactorings continued 2014-02-05 10:24:24 -05:00