Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,569 Commits 1 Branch 0 Tags
02626ffda7eb604a0459a84f25110afbdb298bce
Commit Graph

14569 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Baumgold
02626ffda7 Removed unused test code 2013-06-18 11:27:13 -04:00
David Baumgold
fb0d16afe2 Only show at most 300 chars in AJAX error notification 2013-06-18 10:23:44 -04:00
David Baumgold
aa24508024 Add underscore.string library 
http://epeli.github.io/underscore.string/
 2013-06-18 10:23:18 -04:00
David Baumgold
b6e3b0ee03 Refactor Backbone Notifications 
Models are extraneous for something as temporary as a notifaction -- this change
moves all the configuration into the views, and removes the models entirely.
 2013-06-18 10:20:31 -04:00
Jason Bau
048be222a6 Update CHANGELOG.rst 2013-06-17 18:02:03 -06:00
Jason Bau
33027e7e59 Merge pull request #175 from edx/fix/jbau/handle-None-discussion-start_time 
Fix for broken forums due to forum entry with no start_date
 2013-06-17 16:55:56 -07:00
Jason Bau
28ae2b6346 change form of making datetime.max aware (in UTC) 2013-06-17 16:11:35 -07:00
John Jarvis
a3f45bd94a moving segment io setting below auth.json 2013-06-17 17:45:22 -04:00
Renzo Lucioni
c05a06a885 Merge pull request #182 from edx/renzo/segment-io-auth-backport 
Switch to using environment variables to get key for Segment.io
 2013-06-17 13:40:24 -07:00
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
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
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
cahrens
92fc452b34 Change the wording of problem steps to follow Given, When, Then... convention. 2013-06-17 14:30:37 -04:00
Ned Batchelder
77a9073655 These CHANGELOGS were never used, and are now obsolete. 2013-06-17 14:11:42 -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
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
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
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
Renzo Lucioni
1e3efadc28 switch to using environment variables to get key for Segment.io 2013-06-17 10:58:37 -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
John Jarvis
770b9f1f87 fixing segment io settings bug 
* Moving to the auth tokens section
* Removing the feature flag logic since all features are loaded earlier
```
    for feature, value in ENV_TOKENS.get('MITX_FEATURES', {}).items():
        MITX_FEATURES[feature] = value
```
 2013-06-17 09:01:20 -04:00
Valera Rozuvan
184c0a5c40 Added comment regarding the fact that the temporary bug fix should be eventually removed. 2013-06-17 09:17:48 +03:00
Valera Rozuvan
bb70907e20 Added info to changelog for recent pull requests. 2013-06-17 08:48:55 +03:00
Jason Bau
da2fda1045 Fix for broken forums due to forum entry with no start_date 
modification of @jrbl's version to handle a dict with value None
 2013-06-15 01:30:42 -07:00