Commits · 650a2ba423907f099492027fd3ef75e4ca641338 · edx / edx-platform · GitLab

18 Jun, 2013 1 commit
- Added deletion tests · 650a2ba4
  JonahStanley committed Jun 18, 2013
  
  650a2ba4 Browse Files
17 Jun, 2013 39 commits
- Changed change_text to implement new type_in_codemirror function · 15facf8f
  JonahStanley committed Jun 17, 2013
  
  15facf8f Browse Files
- Merge branch 'master' into jonahstanley/add-courseteam-tests · 46da8976
```
Conflicts:
	cms/envs/test.py
```
  JonahStanley committed Jun 17, 2013
  46da8976 Browse Files
- Merge pull request #186 from edx/christina/latex_and_click · 080c5e4b
```
Bug fix for LaTeX source not saving
```
  Christina Roberts committed Jun 17, 2013
  080c5e4b Browse Files
- Merge pull request #192 from edx/ned/backdated-changelog-entries · 267241a0
```
CHANGELOG entry for the whitelistable sandboxing change.
```
  Ned Batchelder committed Jun 17, 2013
  267241a0 Browse Files
- Merge pull request #190 from edx/feature/cdodge/soft-delete-assets · c3105df9
```
need to comment out another thumbnail check due to build test environmen...
```
  chrisndodge committed Jun 17, 2013
  c3105df9 Browse Files
- CHANGELOG entry for the whitelistable sandboxing change. · d7e03890
  Ned Batchelder committed Jun 17, 2013
  
  d7e03890 Browse Files
- need to comment out another thumbnail check due to build test environment not… · 53f18f27
```
need to comment out another thumbnail check due to build test environment not having libjpeg installed
```
  Chris Dodge committed Jun 17, 2013
  53f18f27 Browse Files
- Now using context files and os.path · 25fe8e80
  JonahStanley committed Jun 17, 2013
  
  25fe8e80 Browse Files
- Merge pull request #187 from edx/ned/remove-obsolete-changelogs · e78eb9aa
```
These CHANGELOGS were never used, and are now obsolete.
```
  Ned Batchelder committed Jun 17, 2013
  e78eb9aa Browse Files
- Change code to use css_click in hopes that will make the test pass on Don's mac. · 73ba1e54
```
css_click will try clicking multiple times.
```
  cahrens committed Jun 17, 2013
  73ba1e54 Browse Files
- Merge pull request #188 from edx/feature/cdodge/soft-delete-assets · 71a6da64
```
disable assertions on thumbnail generation as it puts a system requireme...
```
  chrisndodge committed Jun 17, 2013
  71a6da64 Browse Files
- disable assertions on thumbnail generation as it puts a system requirement on… · a52f62a9
```
disable assertions on thumbnail generation as it puts a system requirement on libjpeg which may not be installed on the test machines
```
  Chris Dodge committed Jun 17, 2013
  a52f62a9 Browse Files
- Change the wording of problem steps to follow Given, When, Then... convention. · 92fc452b
  cahrens committed Jun 17, 2013
  
  92fc452b Browse Files
- Removed _MODULESTORE reference that was doing nothing · ef1f523c
  JonahStanley committed Jun 17, 2013
  
  ef1f523c Browse Files
- These CHANGELOGS were never used, and are now obsolete. · 77a90736
  Ned Batchelder committed Jun 17, 2013
  
  77a90736 Browse Files
- Merge pull request #148 from edx/feature/cale/xblock-init · 3fdc02db
```
Feature/cale/xblock init
```
  Calen Pennington committed Jun 17, 2013
  3fdc02db Browse Files
- Remove waits by adding code in click that will try the operation multiple times (thanks to Jonah). · 298417c7
  cahrens committed Jun 17, 2013
  
  298417c7 Browse Files
- Make XModuleDescriptor use __init__ from XBlock · 82606a06
```
Fixes JIRA LMS-203
```
  Calen Pennington committed Jun 17, 2013
  82606a06 Browse Files
- Move video xmodule tests to xmodule directory · 438ac3b1
  Calen Pennington committed Jun 17, 2013
  
  438ac3b1 Browse Files
- Merge pull request #170 from edx/feature/cdodge/soft-delete-assets · 319eb0ba
```
Feature/cdodge/soft delete assets
```
  chrisndodge committed Jun 17, 2013
  319eb0ba Browse Files
- I think we need to add the new assets.js into the PIPELIE · 0d6f2139
  Chris Dodge committed Jun 17, 2013
  
  0d6f2139 Browse Files
- refactored asset page related JS into it's own page · 16e476e8
  Chris Dodge committed Jun 17, 2013
  
  16e476e8 Browse Files
- allow for an optional throw_on_not_found on contentstore().find() so we can… · 7cebb873
```
allow for an optional throw_on_not_found on contentstore().find() so we can clean up caller logic in the tests
```
  Chris Dodge committed Jun 17, 2013
  7cebb873 Browse Files
- add unit test for emptying the trashcan · dc94ea10
  Chris Dodge committed Jun 17, 2013
  
  dc94ea10 Browse Files
- there is no default for empty_asset_trashcan, caller must provide a list · 7e46447c
  Chris Dodge committed Jun 17, 2013
  
  7e46447c Browse Files
- put back the verbose switch in xml_importer.py · 7f1768f8
  Chris Dodge committed Jun 17, 2013
  
  7f1768f8 Browse Files
- forgot to internationalize one string · ab94b861
  Chris Dodge committed Jun 17, 2013
  
  ab94b861 Browse Files
- remove invalid comments · b443629e
  Chris Dodge committed Jun 17, 2013
  
  b443629e Browse Files
- use the new notification tools for the confirmation dialog · cd0087ca
  Chris Dodge committed Jun 17, 2013
  
  cd0087ca Browse Files
- add unit tests for asset delete/restore · 70ee4b80
  Chris Dodge committed Jun 17, 2013
  
  70ee4b80 Browse Files
- update warning message · 274d8997
  Chris Dodge committed Jun 17, 2013
  
  274d8997 Browse Files
- add CHANGELOG entry for work · 443d6a38
  Chris Dodge committed Jun 17, 2013
  
  443d6a38 Browse Files
- fix sizing of the delete column · 85b904f1
  Chris Dodge committed Jun 17, 2013
  
  85b904f1 Browse Files
- add ajax callback entry point to remove the asset · 9b749c42
  Chris Dodge committed Jun 17, 2013
  
  9b749c42 Browse Files
- add new collection configuration to support a 'trashcan' for assets. Update… · 3fa6e77d
```
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
```
  Chris Dodge committed Jun 17, 2013
  3fa6e77d Browse Files
- Merge pull request #178 from edx/valera/adding_changeleog_info · 67bcbe22
```
Added info to changelog for recent pull requests.
```
  Valera Rozuvan committed Jun 17, 2013
  67bcbe22 Browse Files
- Merge pull request #179 from edx/valera/additional_comments_on_youtube_api_bug · 3ea9f791
```
Addtional comments for YouTube API bug.
```
  Valera Rozuvan committed Jun 17, 2013
  3ea9f791 Browse Files
- Merge pull request #180 from edx/jarv/fix-segment-io · d1ebfbc9
```
fixing segment io settings bug
```
  John Jarvis committed Jun 17, 2013
  d1ebfbc9 Browse Files
- moving settings into the auth tokens section · ffeabae0
  John Jarvis committed Jun 17, 2013
  
  ffeabae0 Browse Files