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
Chris Dodge
0e09ee61d7 update some unit tests on clone_course 2013-08-08 21:25:42 -04:00
Chris Dodge
55bfe46e79 need to filter out non-own metadata. Also we need to clone draft content 2013-08-08 21:25:42 -04:00
Chris Dodge
32d92d97e6 get_item -> get_instance 2013-08-08 21:01:38 -04:00
Chris Dodge
487ae964e4 implement PR feedback 2013-08-08 21:01:38 -04:00
Chris Dodge
4054544126 handle exceptions inside the outer exception handling 2013-08-08 21:01:38 -04:00
Chris Dodge
69c34a65b1 switch the notification to be a prompt and allow for the user to go to the edit unit page which contains the module in error. Otherwise, present the raw exception message and allow user to go to the course outline page. 2013-08-08 21:01:38 -04:00
Chris Dodge
fcaf3e6329 give some debug message regarding why export might fail 2013-08-08 21:01:38 -04:00
Vik Paruchuri
e39abe11db Fix rubric with staff grading 2013-08-08 19:50:55 -04:00
Vik Paruchuri
e4bcfa5c21 Fix indents and copy behavior 2013-08-08 19:31:34 -04:00
Carlos Andrés Rocha
e6288ad19c Fix manage.py to ouput the help of the django command if requested 
Commands like the following were not working correctly:
```
$ python manage.py lms runserver --lms
```
 2013-08-08 19:08:35 -04:00
Vik Paruchuri
687ab3ddae Merge remote-tracking branch 'origin/master' into feature/vik/oe-ui 
Conflicts:
	common/lib/xmodule/xmodule/open_ended_grading_classes/peer_grading_service.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	lms/templates/combinedopenended/combined_open_ended.html
	lms/templates/combinedopenended/combined_open_ended_status.html
	lms/templates/combinedopenended/openended/open_ended.html
	lms/templates/combinedopenended/openended/open_ended_rubric.html
	lms/templates/combinedopenended/selfassessment/self_assessment_prompt.html
 2013-08-08 19:03:46 -04:00
Vik Paruchuri
a9926f0460 Display message to student when they cannot see their peer grading feedback yet. 2013-08-08 18:43:54 -04:00
Vik Paruchuri
900377e4ee Return written feedback 2013-08-08 17:53:29 -04:00
Carlos Andrés Rocha
264e3b246b Change console logging stream from stdout to stderr 2013-08-08 17:39:23 -04:00
jnater
edc62ff692 Merge pull request #615 from edx/jnater/update_authors 
Fix my name in AUTHORS file
 2013-08-08 14:24:06 -07:00
Vik Paruchuri
d44b2e62a0 Proper partial credit checks 2013-08-08 17:19:06 -04:00
Jean Manuel Nater
f105cd4225 Fix my name in AUTHORS file 2013-08-08 17:09:22 -04:00
Vik Paruchuri
f59045c3f9 Scope rubrics locally, make them into classes 2013-08-08 16:54:39 -04:00
Sarina Canelake
2401fa2e65 Update the XBlock version to fix save bugs 2013-08-08 16:53:13 -04:00
Jonah Stanley
02d8da1cb9 Merge pull request #594 from edx/jonahstanley/firefox-acceptance-tests 
Jonahstanley/firefox acceptance tests
 2013-08-08 13:49:02 -07:00
frances botsford
581a8a6217 Merge pull request #586 from edx/fix/frances/studio-pdf-text-clarification 
adjustment to sidebar help text on PDF textbook page in studio
 2013-08-08 13:41:20 -07:00
Vik Paruchuri
803b7eb2af Fix peer grading rubric issue. Redo peer grading JS to scope locally 2013-08-08 16:31:36 -04:00
lapentab
69bbc3eeb0 Add system site packages to acceptance tests 2013-08-08 14:37:19 -04:00
Vik Paruchuri
15b0e12068 Remove progress indicators, make rubric display properly 2013-08-08 14:02:33 -04:00
Vik Paruchuri
fd38223244 Fix grading submitted messages 2013-08-08 13:31:43 -04:00
JonahStanley
3e68bdaaf1 Changed world.browser.find_by_css to world.css_find 2013-08-08 13:24:29 -04:00
JonahStanley
bb9d0df0d7 Changed problem-editor scenario to pass in both firefox and chrome 2013-08-08 13:24:29 -04:00
JonahStanley
287d219a8e Fixed wording on comments as tests are no longer skipped 2013-08-08 13:24:29 -04:00
JonahStanley
76764b8be2 Fixed weight test so it won't behave differently on firefox 2013-08-08 13:24:28 -04:00
JonahStanley
bcdc4bcbd4 Better avoiding of stale element exception 2013-08-08 13:24:28 -04:00
JonahStanley
f2a31adf6f Now using world.is_firefox() 2013-08-08 13:24:28 -04:00
JonahStanley
5a579921f2 Fixed stylistic things and no longer skipped tests in firefox 2013-08-08 13:24:28 -04:00
JonahStanley
514af944cd Fixed video tests for firefox 2013-08-08 13:24:28 -04:00
JonahStanley
83854643a2 Upgraded selenium requirements to run with the latest firefox 2013-08-08 13:24:28 -04:00
JonahStanley
fb41e8f20c Fixed subsection test for firefox 2013-08-08 13:24:28 -04:00
JonahStanley
4c74a05c58 Added comments to the two flakey features on firefox 2013-08-08 13:24:27 -04:00
JonahStanley
36d948f5d3 Unskipped an acceptance test 2013-08-08 13:24:27 -04:00
JonahStanley
38c2997fcf Added a comment on the features that will not work on firefox 2013-08-08 13:24:27 -04:00
JonahStanley
4d6984e3e2 Fixed some of the ui-helpers and made the course-team test faster 2013-08-08 13:24:27 -04:00
JonahStanley
96db47e437 Fixed up the course-team tests 2013-08-08 13:24:27 -04:00
JonahStanley
3f49abc271 Only triggering event in firefox 2013-08-08 13:24:27 -04:00
JonahStanley
b8e29697d4 Fixed upload test for firefox 2013-08-08 13:24:27 -04:00
JonahStanley
2d709be29f Code mirror now will work on firefox 2013-08-08 13:24:26 -04:00
JonahStanley
83d2c808e0 Added comments saying why tests were skipped 
Added comment

Removed set_trace
 2013-08-08 13:24:26 -04:00
JonahStanley
7e67ee378a Checklist links will not appear using a firefox webdriver (will work manually) 2013-08-08 13:24:26 -04:00
JonahStanley
3e543ce4c6 Skipped a test for firefox due to different interactions 2013-08-08 13:24:26 -04:00
JonahStanley
973d5e653d Fixed issue of firefox behaving differently for erroneous input 
Removed set traces
 2013-08-08 13:24:26 -04:00
JonahStanley
9cce3a9a07 Cleaned up some tests and made them work for firefox 2013-08-08 13:24:26 -04:00
JonahStanley
46d0e5ed05 Fixed display-name bug and added in a function to trigger events on firefox as well as check if it is firefox 2013-08-08 13:24:26 -04:00
JonahStanley
94d0ad5563 Fixed issue preventing navigation to various course setting pages 2013-08-08 13:24:25 -04:00