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

19654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christina Roberts
080c5e4bc1 Merge pull request #186 from edx/christina/latex_and_click 
Bug fix for LaTeX source not saving
 2013-06-17 13:36:49 -07:00
Ned Batchelder
267241a0c2 Merge pull request #192 from edx/ned/backdated-changelog-entries 
CHANGELOG entry for the whitelistable sandboxing change.
 2013-06-17 13:30:39 -07:00
chrisndodge
c3105df9fc Merge pull request #190 from edx/feature/cdodge/soft-delete-assets 
need to comment out another thumbnail check due to build test environmen...
 2013-06-17 13:23:56 -07:00
Renzo Lucioni
f528f61ec1 Add new Jasmine test to ensure Segment.io is called when appropriate 2013-06-17 16:18:07 -04:00
Ned Batchelder
d7e03890d7 CHANGELOG entry for the whitelistable sandboxing change. 2013-06-17 16:11:03 -04:00
Chris Dodge
53f18f27b9 need to comment out another thumbnail check due to build test environment not having libjpeg installed 2013-06-17 15:59:14 -04:00
JonahStanley
25fe8e8070 Now using context files and os.path 2013-06-17 15:54:10 -04:00
Ned Batchelder
e78eb9aa66 Merge pull request #187 from edx/ned/remove-obsolete-changelogs 
These CHANGELOGS were never used, and are now obsolete.
 2013-06-17 12:46:32 -07:00
cahrens
73ba1e547e Change code to use css_click in hopes that will make the test pass on Don's mac. 
css_click will try clicking multiple times.
 2013-06-17 15:46:10 -04:00
Renzo Lucioni
97f4291b2a Add comment clarifying which Segment.io key is in use 2013-06-17 15:35:04 -04:00
chrisndodge
71a6da6485 Merge pull request #188 from edx/feature/cdodge/soft-delete-assets 
disable assertions on thumbnail generation as it puts a system requireme...
 2013-06-17 12:20:00 -07:00
Chris Dodge
a52f62a923 disable assertions on thumbnail generation as it puts a system requirement on libjpeg which may not be installed on the test machines 2013-06-17 14:59:48 -04:00
Don Mitchell
085a590bdd timezone conversion: more unit tests 
and code reorganization
 2013-06-17 14:48:18 -04:00
cahrens
92fc452b34 Change the wording of problem steps to follow Given, When, Then... convention. 2013-06-17 14:30:37 -04:00
JonahStanley
ef1f523c55 Removed _MODULESTORE reference that was doing nothing 2013-06-17 14:12:42 -04:00
Ned Batchelder
77a9073655 These CHANGELOGS were never used, and are now obsolete. 2013-06-17 14:11:42 -04:00
Don Mitchell
9d464701f9 timezone conversion tests 2013-06-17 14:04:12 -04:00
Calen Pennington
3fdc02dbc4 Merge pull request #148 from edx/feature/cale/xblock-init 
Feature/cale/xblock init
 2013-06-17 11:03:44 -07:00
cahrens
298417c732 Remove waits by adding code in click that will try the operation multiple times (thanks to Jonah). 2013-06-17 13:55:15 -04:00
Renzo Lucioni
c30d2d2f52 Incorporate Segment.io into Logger.log with whitelist 2013-06-17 13:48:50 -04:00
Peter Fogg
8159e86141 Many changes to finish up PR. To wit: 
-- Changed docstrings to use double quote.
-- More consistent naming for youtube IDs (normal_speed_id -> youtube_id_1_0).
-- Formatting changes for readability.
-- Updated test XML to expect JSON-encoded strings; prevents tests from spuriously failing.
 2013-06-17 13:46:20 -04:00
Calen Pennington
82606a062c Make XModuleDescriptor use __init__ from XBlock 
Fixes JIRA LMS-203
 2013-06-17 13:38:57 -04:00
Calen Pennington
438ac3b1a4 Move video xmodule tests to xmodule directory 2013-06-17 13:38:29 -04:00
Don Mitchell
4c8a92e968 Merge branch 'dhm/timeconv/bug0' of github.com:edx/edx-platform into dhm/timeconv/bug0 
Conflicts:
	common/lib/xmodule/xmodule/fields.py
	common/lib/xmodule/xmodule/timeinfo.py
 2013-06-17 13:30:35 -04:00
Don Mitchell
cb40e9ff88 Fix a few remaining tz naive dates 
And remove redundant but != date parsing methods. In process make
the general parsing function less lenient (don't default date nor
month)
 2013-06-17 13:26:45 -04:00
chrisndodge
319eb0bad7 Merge pull request #170 from edx/feature/cdodge/soft-delete-assets 
Feature/cdodge/soft delete assets
 2013-06-17 09:56:17 -07:00
Jean Manuel Nater
07486a4dbc Refactoring the code in tests.py to remove unnecessary dependencies on the XML Modulestore. 2013-06-17 11:54:16 -04:00
Will Daly
b2bc39fa09 Updated diff-cover to version 0.1.2, which fixes a bug 
in which missing lines were over-reported
 2013-06-17 11:17:58 -04:00
Chris Dodge
0d6f213997 I think we need to add the new assets.js into the PIPELIE 2013-06-17 11:10:36 -04:00
Chris Dodge
16e476e8e4 refactored asset page related JS into it's own page 2013-06-17 11:10:36 -04:00
Chris Dodge
7cebb873df allow for an optional throw_on_not_found on contentstore().find() so we can clean up caller logic in the tests 2013-06-17 11:10:36 -04:00
Chris Dodge
dc94ea1041 add unit test for emptying the trashcan 2013-06-17 11:10:36 -04:00
Chris Dodge
7e46447cd5 there is no default for empty_asset_trashcan, caller must provide a list 2013-06-17 11:10:36 -04:00
Chris Dodge
7f1768f8f8 put back the verbose switch in xml_importer.py 2013-06-17 11:10:36 -04:00
Chris Dodge
ab94b8618c forgot to internationalize one string 2013-06-17 11:10:36 -04:00
Chris Dodge
b443629ee8 remove invalid comments 2013-06-17 11:10:36 -04:00
Chris Dodge
cd0087ca53 use the new notification tools for the confirmation dialog 2013-06-17 11:10:35 -04:00
Chris Dodge
70ee4b8060 add unit tests for asset delete/restore 2013-06-17 11:10:35 -04:00
Chris Dodge
274d8997a2 update warning message 2013-06-17 11:10:35 -04:00
Chris Dodge
443d6a382f add CHANGELOG entry for work 2013-06-17 11:10:35 -04:00
Chris Dodge
85b904f176 fix sizing of the delete column 2013-06-17 11:09:52 -04:00
Chris Dodge
9b749c4201 add ajax callback entry point to remove the asset 2013-06-17 11:09:52 -04:00
Chris Dodge
3fa6e77dff add new collection configuration to support a 'trashcan' for assets. Update class factory to allow callers to specify if they want the default set of assets or the trashcan 2013-06-17 11:09:52 -04:00
Don Mitchell
48ee275799 Fix a few remaining tz naive dates 
And remove redundant but != date parsing methods. In process make
the general parsing function less lenient (don't default date nor
month)
 2013-06-17 11:09:26 -04:00
Renzo Lucioni
1e3efadc28 switch to using environment variables to get key for Segment.io 2013-06-17 10:58:37 -04:00
Renzo Lucioni
7518f32f5e Instrument sequentials with segment-io so we know when people switch tabs manually or using the arrows to navigate 2013-06-17 10:30:17 -04:00
Valera Rozuvan
67bcbe228b Merge pull request #178 from edx/valera/adding_changeleog_info 
Added info to changelog for recent pull requests.
 2013-06-17 06:44:45 -07:00
Valera Rozuvan
3ea9f79132 Merge pull request #179 from edx/valera/additional_comments_on_youtube_api_bug 
Addtional comments for YouTube API bug.
 2013-06-17 06:44:23 -07:00
John Jarvis
d1ebfbc9b5 Merge pull request #180 from edx/jarv/fix-segment-io 
fixing segment io settings bug
 2013-06-17 06:09:01 -07:00
John Jarvis
ffeabae069 moving settings into the auth tokens section 2013-06-17 09:07:02 -04:00