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

7979 Commits

Author SHA1 Message Date
Adam
9aa35cd8ad Merge pull request #13614 from edx/efischer/revert_grades 
Potential Grades revert PR
 2016-09-30 14:08:58 -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
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
Matt Drayer
e53721433f Merge pull request #13413 from edx/release 
Merge release back to master
 2016-09-07 11:30:24 -04:00
M. Rehan
985449758a Merge pull request #13313 from edx/mrehan/tnl-4945-inherit-lib-problem-setting 
TNL-4945 – Prioritize Library defaults over the fields coming from parent blocks.
 2016-09-07 14:57:13 +05:00
muhammad-ammar
d85cdcace2 update question tag extraction logic 2016-09-06 16:35:34 +05:00
Qubad786
be80ef3a7f prioritize Library's defaults over inherited ones. 2016-09-06 12:00:56 +05:00
Ehtesham
1b960e3e17 requiring codemirror compressed with all addons included 2016-09-02 21:40:20 +05:00
muhammad-ammar
f91583c24c make responsetypes with multiple inputtypes accessible 2016-09-02 19:44:25 +05:00
muhammad-ammar
19cc68c8c3 make numerical and math expression input accessible 
TNL-4973
 2016-09-02 19:44:24 +05:00
Ehtesham
31be6fad43 make CAPA dropdown problems accessible 2016-09-02 19:44:24 +05:00
muhammad-ammar
e1a595d88a make textinput accessible 
TNL-4972
 2016-09-02 19:44:23 +05:00
muhammad-ammar
7240b6256c Associate descriptions with question text 
TNL-5014
 2016-09-02 19:44:22 +05:00
Ehtesham
3556f2a3ea make CAPA problems (MultipleChoice and Checkboxes) accessible 2016-09-02 19:44:22 +05:00
muhammad-ammar
d14928cc61 separation based on responsetypes poc 
FEDX-176
 2016-09-02 19:44:22 +05:00
Sanford Student
d54a784a43 creating django admin settings for subsection grades 2016-09-02 09:32:33 -04:00
Chris Rodriguez
be470adb03 Removing unused variable from recent word cloud updates 2016-08-31 12:44:31 -04:00
Mushtaq Ali
ec13ba4340 Fix when checking in mongo store, has_course with a split course key returns False. 2016-08-26 15:49:34 +05:00
Eric Fischer
2dc4f5d6bf Merge pull request #13303 from edx/efischer/tnl_5057 
TNL 5057 Silence XML parse error in capa_module
 2016-08-25 16:30:15 -04:00
Eric Fischer
bf4211088f Merge pull request #13295 from edx/efischer/opt_grade 
Grades cleanup
 2016-08-25 16:29:55 -04:00
sanfordstudent
fb20312ef1 Merge pull request #13294 from edx/sstudent/TNL-5041 
check for null doc
 2016-08-25 14:49:24 -04:00
Eric Fischer
0059f88d2a Silence XML parse error in capa_module 
TNL-5057 This un-actionable error is polluting the stream of devops pages, and
should be quieted. A longer term fix will be made in TNL-5245.
 2016-08-25 12:00:18 -04:00
Eric Fischer
13687e4753 Grades cleanup 
Small changes to the grades djangoapp
    -sets up mock_get_score context handler
    -fixes an issue with not invalidating lazy scores property
    -code quality fixes
    -query count optimization in PersistentSubscetionGrade.create
    -adds atomic blocks to avoid IntegrityErrors corrupting an entire request
 2016-08-25 11:43:49 -04:00
Qubad786
b25dc54d68 update library content block's children on branches 2016-08-25 16:44:52 +05:00
Sanford Student
20379c14c0 check for null doc 2016-08-24 13:18:28 -04:00
Chris Rodriguez
2255b5c83b AC-552 word cloud accessibility updates 2016-08-24 11:14:25 -04:00
alisan617
6ed5b2e3fc filter doinline escape string for inline css 2016-08-23 10:07:12 -04:00
Eric Fischer
22046d4067 Use PersistentSubsectionGrade in grades application 
Hooks the pre-existing grades code into our new PersistentSubsectionGrade data
model. Includes test updates, and some minor changes to the data model that
were discovered in testing.
 2016-08-22 09:47:37 -04:00
Chris Rodriguez
b5efcc15f5 AC-530 fixing link-href ignores in the platform 2016-08-19 10:04:40 -04:00
alisan617
a250b03b60 Merge pull request #13274 from edx/alisan/TNL-5289-python-evaluated-input 
trailing text remove its parent class that doesn not exist in python …
 2016-08-18 15:17:59 -04:00
alisan617
90d7141c20 Merge pull request #12853 from eduNEXT/Bound3R/TNL-3717 
resolve byte-sized bug TNL-3717
 2016-08-18 14:31:41 -04:00
alisan617
289ab1476d trailing text remove its parent class that doesn not exist in python input type 2016-08-18 12:57:27 -04:00
Bound3R
3c5b0a9f73 resolve byte-sized bug TNL-3717 
small fix for align text and radio/checkbox

alinged checbox and radio inputs.

create silent class for Choice Text Group

clean up

change px to em
 2016-08-17 11:43:51 -05:00
M. Rehan
ffbaf1fe54 Merge pull request #12813 from edx/aj/TNL4826-lib-problems-not-update-with-import 
Refersh library children for the block during import.
 2016-08-16 00:52:58 +05:00
Qubad786
aca82be335 Move fix to importer module and fix branch_setting in MixedModuleStore. 2016-08-15 18:50:50 +05:00