Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

17975 Commits

Author SHA1 Message Date
Vik Paruchuri
915f815c63 Merge remote-tracking branch 'origin/master' into fix/vik/studio-oe 
Conflicts:
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-07-18 11:55:37 -04:00
Ned Batchelder
900e794c02 Only quiet the particular logger we think is too noisy. 2013-07-18 11:53:21 -04:00
Ned Batchelder
3d67c506a3 Use TransactionTestCase, to keep other tests from failing, even though it slows them down. 2013-07-18 11:16:46 -04:00
Ned Batchelder
10f062cf18 Records should be sorted by created,id so that timestamp ties will be broken by id. 2013-07-18 11:16:46 -04:00
Ned Batchelder
83cb3d1924 Add batch and sleep arguments so we can control the speed from the command line. 2013-07-18 11:16:46 -04:00
Ned Batchelder
3a49136f03 Quiet some debug output, get transactions right. 2013-07-18 11:16:46 -04:00
Ned Batchelder
07aad29684 The clean_history management command to remove excess courseware_studentmodulehistory records. 2013-07-18 11:16:46 -04:00
Jason Bau
c789642ebd Merge pull request #396 from edx/jbau/fix/stanford-pwdreset-remove-vendor-js 
put block around main_vendor js in main_django.html
 2013-07-17 14:33:21 -07:00
Don Mitchell
6dda90f6f8 Merge pull request #419 from edx/dhm/template_acceptance 
Missing comma on template -> category refactoring
 2013-07-17 10:13:58 -07:00
Adam
f0969fca4c Merge pull request #374 from edx/fix/adam/mrev-check 
notify students for NotFoundErrors from capa_module, improve tracking
 2013-07-17 08:26:27 -07:00
Adam Palay
dfa435012b notify students for NotFoundErrors from capa_module, improve error logging 2013-07-17 11:03:47 -04:00
ihoover
b42eacaa8f moved MAX_AUTO_AUTH_USERS to ENV_TOKENS 2013-07-17 10:00:24 -04:00
frances botsford
033a36efb9 Merge pull request #371 from edx/fix/frances/lms-pdfviewer-cleanup 
Quick LMS pdfviewer  layout cleanup
 2013-07-17 06:53:10 -07:00
Don Mitchell
5b367e8321 Missing comma on template -> category refactoring 
And several pep8 changes
 2013-07-17 09:22:34 -04:00
ihoover
ee4bc424ce remove depracated feature flag GENERATE_RANDOM_USER_CREDENTIALS 2013-07-17 09:12:07 -04:00
Alexander Kryklia
813c22d138 Adds integration tests for word_cloud module 2013-07-17 14:57:32 +03:00
ihoover
ceacc3b4b5 moved auto_auth view to students.view and fixed flag conflicts 2013-07-16 17:43:32 -04:00
Calen Pennington
d3993653cf Merge pull request #270 from edx/dhm/non-persisted-studio-templates 
Non-persisted studio templates
 2013-07-16 14:42:57 -07:00
Don Mitchell
be4fbc562e Refactor tests to no longer use templates 
Add boilerplate option to ItemFactory
Minor start date fix to not use microsecs
 2013-07-16 16:00:28 -04:00
ihoover
e5f44165f8 Made activation flag and ENV_TOKEN 2013-07-16 15:29:38 -04:00
Calen Pennington
8b5979641b Change default rerandomize and showanswer 
The defaults used to be rerandomize=always, showanswer=closed. This is
preserved for capa problems being imported from XML. However, for
courses, and for problems created in Studio, the default has been
changed to never/finished, to match the previous defaults used by
Studio.
 2013-07-16 14:33:58 -04:00
Don Mitchell
3722685e1a No longer persist XModule templates 
Instead, we use XModule field default values when creating an empty
XModule. Driven by this use case, we also allow for XModules to be
created in memory without being persisted to the database at all. This
necessitates a change to the Modulestore api, replacing clone_item with
create_draft and save_xmodule.
 2013-07-16 14:33:58 -04:00
Don Mitchell
8c904f31a9 Move defaults from yaml templates to field definitions. 
This standardizes the XModule field default values to be the same as the
values that are presented by studio when a component is added to a
course.
 2013-07-16 14:24:41 -04:00
ihoover
9eb1cce352 maximum number of random users 2013-07-16 14:05:41 -04:00
ihoover
66eb47fb0d Disabled csrf and made auto_login page toggleable with setting 2013-07-16 11:54:50 -04:00
Don Mitchell
ef8618f7ad Make DraftModuleStore mongo only 
DraftModuleStore was originally designed as a mixin, but never used that
way, and with the upcoming changes to use the versioned module store,
never will be. This changes removes a circular dependency between
mongo.py and draft.py.
 2013-07-16 08:55:26 -04:00
Kevin Chugh
6e2de9dba2 tweak css and fix merge conflicts 2013-07-15 21:12:05 -04:00
Kevin Chugh
fbd0f1bec0 wire up static HTML to allow panel functionality 2013-07-15 20:09:01 -04:00
Frances Botsford
27b7e35bd3 i18n the PDF prev/next button text 2013-07-15 13:54:04 -04:00
Greg Price
7c5943a87c Tweak behavior of submit buttons on register and login pages 
The buttons are not re-enabled if the registration/login submission succeeds
(and, therefore, the user is about to be directed to another page). Also, any
error message that is present does not disappear immediately before the page
redirects.
 2013-07-15 13:13:52 -04:00
Jason Bau
c9943306ef put block around main_vendor js in main_django.html 
should be a no-op for edx-east, but allow edx-west to remove
vendor.js with a blank {% block %}
in our password_reset_confirm.html to fix a bug
 2013-07-12 23:22:50 -07:00
chrisndodge
dcc63be4b5 Merge pull request #388 from edx/fix/cdodge/dont-display-github-links-in-mongo-lms 
[STUD-431] Seems like the Edit/QA links in LMS are triggered by a ENABLE_LMS_MIGRAT...
 2013-07-12 18:03:43 -07:00
Chris Dodge
db7434fa18 add comment as to why we are turning off this feature flag 2013-07-12 20:02:23 -04:00
Vik Paruchuri
ffad965536 fix some combinedopenended ui and data routing 2013-07-12 15:06:11 -04:00
Vik Paruchuri
0cadc8af36 Change status bar UI 2013-07-12 14:13:53 -04:00
mikigoyal
0a05cdc21b Merge pull request #389 from edx/lms/bug/lms-605 
Fixed a spelling mistake. LMS-605
 2013-07-12 10:05:10 -07:00
Miki Goyal
ae45f5461c Fixed a spelling mistake. LMS-605 2013-07-12 12:19:15 -04:00
Jonah Stanley
72c9a24dd6 Merge pull request #274 from edx/jonahstanley/refactor-global-to-world 
Jonahstanley/refactor global to world
 2013-07-12 09:10:25 -07:00
Chris Dodge
1060cf5cec Seems like the Edit/QA links in LMS are triggered by a ENABLE_LMS_MIGRATION feature flag. So when running as mongo-backed, set that to False 2013-07-12 11:51:57 -04:00
mikigoyal
4eb82224f0 Merge pull request #382 from edx/bug/lms-600 
Fix alt text for the login page: LMS-600
 2013-07-12 07:45:50 -07:00
JonahStanley
484e217de3 Fixed some errors 2013-07-12 10:32:48 -04:00
JonahStanley
1f1bba5507 Scenario Dictionary now holds objects 2013-07-12 10:32:48 -04:00
JonahStanley
131f1a49c4 All lms acceptance tests refactored to use world dictionaries 2013-07-12 10:32:47 -04:00
JonahStanley
35094a968b Beginnings of refactoring the acceptance tests 2013-07-12 10:32:45 -04:00
Miki Goyal
5fd84465e2 Fix alt text for the login page: LMS-600 2013-07-12 10:05:13 -04:00
JonahStanley
c37a9e3e23 Refactored problem_setup to use retry_on_exception 2013-07-12 09:28:51 -04:00
JonahStanley
b4036c66cf Refactored the ui tests to use retry_on_exception 2013-07-12 09:28:50 -04:00
JonahStanley
ebc9fa9e2a Made a retry_on_exception world function that will retry the given function 2013-07-12 09:28:50 -04:00
JonahStanley
f1dd81a67a Refactored LMS so all potential stale element exceptions are avoided 2013-07-12 09:28:49 -04:00
Jonah Stanley
50ea165a8e Merge pull request #297 from edx/jonahstanley/refactor-unittest-courses 
Jonahstanley/refactor unittest courses
 2013-07-11 12:44:05 -07:00