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

8013 Commits

Author SHA1 Message Date
Jillian Vogel
1a8a1274d8 Merge pull request #13534 from open-craft/jill/choice_response_computed 
Allows ChoiceResponse problems to set correctness with python variables
 2016-10-14 17:55:12 +10:30
Jillian Vogel
8124aacfcc Allows ChoiceResponse CAPA problems to use script-computed variables to 
determine choice correctness, as MultipleChoiceResponse problems already do.

Adds a unit test for this change, and for the existing MultipleChoiceResponse
computed correctness capability.
 2016-10-14 08:20:14 +10:30
Brian Beggs
9a23babc9d Merge pull request #13747 from edx/release 
Merge hotfix back to master.
 2016-10-13 14:46:02 -04:00
alisan617
8d429a91f3 add child of text check unit page 2016-10-12 17:23:51 -04:00
Brian Beggs
fa81f303f5 Merge pull request #13735 from edx/release 
Merge release -> master for release-2016-10-12
 2016-10-12 14:06:17 -04:00
Albert St. Aubin
088b5c6615 Corrected issue with the Show Hint button enabled state with single hint. 
TNL-5737
 2016-10-11 15:50:40 -04:00
Andy Armstrong
51167aedef Merge pull request #11710 from raccoongang/kssl/ui_conditional_module 
Add ui in studio for conditional_module.
 2016-10-11 10:45:39 -04:00
alisan617
d7c841f80d Merge pull request #13703 from edx/alisan/capa-button-bar-label-minor-fix 
put display previously removed in capa space pr
 2016-10-07 11:46:19 -04:00
Brian Jacobel
bc66285b53 Merge pull request #13588 from edx/bjacobel/5555 
UX improvements to sequence nav
 2016-10-07 11:09:45 -04:00
Mushtaq Ali
23388588e7 Merge pull request #13564 from edx/mushtaq/video-transcript 
Handle when no video transcript uploaded for a language
 2016-10-07 20:08:25 +05:00
alisan617
e1f2072c42 put display previously removed in capa space pr 2016-10-07 10:32:05 -04:00
Mushtaq Ali
11a07ca8c9 Show validation message when no transcript file uploaded for a language in a video component in studio. 
Also, don't show respective transcript language in video language menu when a related transcript is not uploaded for that language.

TNL-5200
 2016-10-07 19:15:44 +05:00
muhammad-ammar
aed1ea8028 fix attribute access 2016-10-07 12:14:32 +05:00
Christina Roberts
256223d07b Merge pull request #13052 from edx/alisan/capa-problem-button-bar-tnl4880 
Problem (capa) feedback rework
 2016-10-06 21:20:25 -04:00
Andy Armstrong
1da5572830 Merge pull request #13674 from edx/andya/move-i18n-tests 
Move i18n_tests from common into pavelib
 2016-10-06 20:17:55 -04:00
muhammad-ammar
47280eddb6 support descriptons for multiple inputs group 
TNL-5403
 2016-10-06 17:36:04 -04:00
cahrens
1122c40f07 Moving ignore rules to relevant classes instead general rule. 
Also replaces section with div, updates short_id, and makes textbox accessible.

TNL-5576, TNL-5575, TNL-5574, TNL-5671, TNL-5376
 2016-10-06 17:35:54 -04:00
muhammad-ammar
c3b6b10478 Problem (capa) feedback UX revamp. 
TNL-4877
 2016-10-06 17:34:43 -04:00
Christina Roberts
432f6cdf0c Merge pull request #13680 from edx/christina/revert-capa-form 
Revert "single form element per capa problem"
 2016-10-06 17:18:48 -04:00
cahrens
53a6edd032 Revert "single form element per capa problem" 
This reverts commit 943a3a5eb1.
 2016-10-06 16:00:19 -04:00
Eric Fischer
e24915d286 Revert "Merge pull request #13614 from edx/efischer/revert_grades" 
This reverts commit 9aa35cd8ad.
 2016-10-06 14:25:27 -04:00
Andy Armstrong
6d0136fea9 Move i18n_tests from common into pavelib 2016-10-06 13:28:46 -04:00
muhammad-ammar
943a3a5eb1 single form element per capa problem 
TNL-5402
 2016-10-06 14:27:39 +05:00
Andy Armstrong
ecf4515b6e Introduce id verification step for proctored exams 
TNL-5083
 2016-10-05 17:22:35 -04:00
Jesse Shapiro
22c42dbf78 Merge pull request #13602 from open-craft/haikuginger/deprecate-dnd-v1 
[SOL-1612] Add DnDv2 to advanced problems; relabel DnDv1 as deprecated
 2016-10-05 15:28:50 -04:00
Brian Jacobel
8b0b4f5ce2 Redesign sequence nav, move breadcrumbs out of sequence container 
TNL-5555
 2016-10-05 13:39:27 -04:00
alisan617
66ea22cab6 Merge pull request #13587 from edx/alisan/bookmark-btn-TNl-5625-unit-title-TNL-5623 
add new unit title and renew bookmark button
 2016-10-05 12:53:40 -04:00
Jesse Shapiro
47d18c35fe Add DnDv2 to advanced problems; relabel DnDv1 as deprecated 2016-10-05 09:22:35 -04:00
alisan617
a0a46c461e add new unit page title TNL-5623 
new bookmark button placement and look TNL-5625
 2016-10-04 16:51:34 -04:00
sanfordstudent
44bddf8a69 Merge pull request #13610 from edx/sstudent/TNL-4171 
Removing Scored/has_score from randomized content block
 2016-10-03 16:14:57 -04:00
Adam
9aa35cd8ad Merge pull request #13614 from edx/efischer/revert_grades 
Potential Grades revert PR
 2016-09-30 14:08:58 -04:00
Sanford Student
39fb66fccf removing scored/has_score from randomized content block 
for TNL-4171
 2016-09-30 09:59:39 -04:00
Nimisha Asthagiri
d3d776388f Update grade when CAPA problem state is reset 
TNL-5686
 2016-09-29 08:44:37 -04:00
Nimisha Asthagiri
663fbbbaa0 Merge pull request #13547 from edx/beryl/correct_weight 
Fix Problem grades that have weight values
 2016-09-27 12:24:12 -04:00
Muhammad Ammar
3f7441c80f Merge pull request #13505 from edx/ammar/tnl-5557 
allow html inside label and descriptions
 2016-09-27 21:00:42 +05:00
Matjaz Gregoric
d2c0ac3286 Merge pull request #13475 from open-craft/mtyaka/youtube-api-error 
Don't show error in studio when fetching YouTube metadata fails.
 2016-09-27 17:30:10 +02:00
Nimisha Asthagiri
5ba77275d8 Fix problem weights in persisted grades 
TNL-5599
 2016-09-27 10:09:09 -04:00
muhammad-ammar
6ff762b63e allow html inside label and descriptions 
TNL-5557
 2016-09-27 15:48:27 +05:00
Jesse Zoldak
3de366dcf9 Fix pylint errors 2016-09-24 06:53:26 -04:00
Jesse Zoldak
24ae284f34 Move helper methods from the capa tests module __init__ file 2016-09-23 13:21:49 -04:00
Jesse Zoldak
7242fe138b Declare additional requirements for installing the capa module 2016-09-23 13:07:00 -04:00
Chris
4f28b81fee Merge pull request #13334 from edx/clrux/ac-571-video-transcript-download 
AC-571 updating video download/transcript area
 2016-09-21 10:32:20 -04:00
Giulio Gratta
0eca0eadaf Revert "Add fa loading spinner to CAPA problems" 
This reverts commit a3eb726f5f.
 2016-09-20 12:56:20 -07:00
Chris Rodriguez
0ebc90472c AC-571 updating video download/transcript area 2016-09-20 06:22:24 -04:00
Matjaz Gregoric
c47561e1bb Don't show error in studio when fetching YouTube metadata fails. 
The error message was very confusing ("Studio is having trouble saving
your work").

Log a warning in the JS console instead.
 2016-09-18 16:42:50 +02:00
Oksana Slusarenro
cda7f1dc6c Changed the Help and Field Label text. 2016-09-15 10:24:54 +03:00
Giulio Gratta
a3eb726f5f Add font awesome loading spinner to CAPA problems 
- loading spinner is automatically replaced by the content when AJAX problem_get returns
 2016-09-14 14:58:35 -07:00
Christina Roberts
2afc986666 Merge pull request #13469 from edx/release 
Merge release back into master
 2016-09-14 17:11:53 -04:00
cahrens
c7c8a4e500 Don't delete question p-tag if children. 
TNL-5510
 2016-09-14 09:45:24 -04:00
John Eskew
9e07bb530c Bump edx-opaque-keys version to 0.3.4 2016-09-13 14:54:32 -04:00