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

18333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Wilson
d503e3313f Add task progress table to instructor dash. 
Add call to MakoMiddleware() to initialize templates in celery worker server.

Pass task_ids by POST properties (as a list) to collect task progress status.
 2013-06-18 11:04:05 -04:00
Brian Wilson
91ac6e68e8 Define initial celery task on instructor dash. 
Add CourseTaskLog, and make calls to regrading.

Add regrading implementation, and hack the marshalling of request.
 2013-06-18 11:04:05 -04:00
Peter Fogg
a4032522a3 Fix merge conflict in CHANGELOG.rst. 2013-06-18 10:31:57 -04:00
Jonah Stanley
94238238e7 Merge pull request #58 from edx/jonahstanley/add-navigation-tests 
Jonahstanley/add navigation tests
 2013-06-18 07:29:17 -07:00
polesye
9cd9129d9f Merge pull request #101 from edx/anton/videoalpha_tests 
Anton/videoalpha tests
 2013-06-18 07:26:27 -07: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
Valera Rozuvan
fe694a1548 Fixed up CHANGELOG. 2013-06-18 16:57:06 +03:00
Valera Rozuvan
bb3cf56f7d Fixed up CHANGELOG. 2013-06-18 16:55:28 +03:00
Valera Rozuvan
3086f16d77 Added comment about enabling some Video Alpha tests when testing locally. Updated CHANGELOG. 2013-06-18 16:30:15 +03:00
Valera Rozuvan
b75876e3ac As per PR comments from reviewer, fixing coding style. 2013-06-18 16:30:15 +03:00
Anton Stupak
cfb9a54e21 Add tests for additional events 2013-06-18 16:30:15 +03:00
Anton Stupak
78e22a910e Disable tests because of problems with phantomjs 2013-06-18 16:30:15 +03:00
Anton Stupak
70889c3625 Add tests for Event Logger 2013-06-18 16:30:15 +03:00
Anto Stupak
499c682d95 Add tests for HTML5 part of Videoalpha 2013-06-18 16:30:14 +03:00
Anto Stupak
70cc9a168b Add tests for Youtube part of Videoalpha 2013-06-18 16:30:14 +03:00
Vasyl Nakvasiuk
80f38b8f3c python tests for videoalpha 2013-06-18 16:30:14 +03:00
Peter Fogg
8ae22cf3ed Fix merge conflict in CHANGELOG.rst. 2013-06-18 09:01:37 -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
pdehaye
c1dc2628a0 need to import os 2013-06-18 00:52:23 +02:00
John Jarvis
a3f45bd94a moving segment io setting below auth.json 2013-06-17 17:45:22 -04:00
Peter Fogg
5cb456ba85 Fix merge conflict. 2013-06-17 16:49:22 -04:00
JonahStanley
15facf8fc0 Changed change_text to implement new type_in_codemirror function 2013-06-17 16:48:37 -04:00
Peter Fogg
56015e4b94 Update CHANGELOG.rst; move acceptance test methods into more appropriate files; docstring cleaning. 2013-06-17 16:47:15 -04:00
JonahStanley
46da897610 Merge branch 'master' into jonahstanley/add-courseteam-tests 
Conflicts:
	cms/envs/test.py
 2013-06-17 16:43:56 -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
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