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

18017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Giulio Gratta
78ea6ef030 conditionalize written feedback area. 2013-09-22 17:23:22 -07:00
Jason Bau
730b7c626d Merge pull request #1081 from edx/jbau/shib-bugfixes 
Jbau/shib bugfixes
 2013-09-20 21:15:41 -07:00
Jason Bau
b4ce69465d Merge pull request #1072 from edx/jbau/peergrading-setting-grade-finished-assessments 
Add setting on combinedopenended to allow peergrading of finished submissions
 2013-09-20 21:10:14 -07:00
Jason Bau
7c1a3e1ea1 wording changes for setting help 2013-09-20 14:23:05 -07:00
Jason Bau
9c4ff9ba95 Add setting on combinedopenended to allow peergrading of finished submissions 2013-09-20 14:23:05 -07:00
Vik Paruchuri
57fb306c74 Merge pull request #1068 from edx/feature/vik/oe-save 
Implement a save button for open ended responses
 2013-09-20 14:16:32 -07:00
Brian Talbot
936d2e0ffe Merge pull request #1047 from edx/talbs/lms-tablesupport 
Capa and HTML xmodules: Text Justification Styling Classes Table-based Displays
 2013-09-20 14:01:03 -07:00
Adam
6805f4bb57 Merge pull request #1082 from edx/adam/accessible-mathjax 
make it so that mathplayer message only appears when mathjax is on the p...
 2013-09-20 13:51:45 -07:00
Vik Paruchuri
d9ce5e073b Implement a save button for open ended responses 2013-09-20 16:35:10 -04:00
Adam Palay
920d1c9a40 make it so that mathplayer message only appears when mathjax is on the page 2013-09-20 15:05:47 -04:00
Jason Bau
b48e3a9661 fix some shib signup session related bugs 2013-09-20 11:53:32 -07:00
Jason Bau
11ecd162d4 fix _flatten_to_ascii for str inputs 2013-09-20 11:53:09 -07:00
Adam
065a1cf2bd Merge pull request #1078 from edx/adam/parse-xml-module 
don't remove comments from xml module
 2013-09-20 11:28:46 -07:00
Don Mitchell
464e0c77f4 Merge pull request #1045 from edx/assets/persist_lock 
save lock state in contentstore
 2013-09-20 10:51:31 -07:00
Vik Paruchuri
d8af16dca2 Merge pull request #1058 from edx/fix/vik/oe-staff-error 
Fix OE AJAX post error
 2013-09-20 10:46:20 -07:00
Vik Paruchuri
c3a155da93 Merge pull request #1064 from edx/fix/vik/pg-tests 
Add in peer grading tests to cover linking behavior
 2013-09-20 10:42:37 -07:00
Greg Price
0d7f63060b Merge pull request #975 from edx/gprice/markdown-button-taborder 
Improve accessibility for forums post toolbar
 2013-09-20 10:38:57 -07:00
Will Daly
f3f59d0f15 Merge pull request #1074 from edx/will/quiet-pip 
Add -q (quiet) flag to pip install
 2013-09-20 10:19:58 -07:00
Brian Talbot
39c617216c Merge pull request #1059 from edx/talbs/fix-a11y-accounts 
Accessibility: Account-based Template Follow-up
 2013-09-20 10:13:21 -07:00
Brian Talbot
89b74bd66f edx.org - corrects typo/incorrect HTML attribute selector on register field tip 2013-09-20 13:12:37 -04:00
Nick Parlante
43c73b2df9 Merge pull request #1049 from edx/nick/html-help 
Mention in studio UI that %%USER_ID%% works
 2013-09-20 09:48:21 -07:00
Vik Paruchuri
d6a2e06d9f Test empty list behavior 2013-09-20 12:02:22 -04:00
Vik Paruchuri
ecb6f0f944 Add in peer grading tests to cover linking behavior 2013-09-20 11:47:26 -04:00
Don Mitchell
7d13eb8f7d Add locked attribute to assets. 2013-09-20 11:28:00 -04:00
Don Mitchell
e69955b437 Pylint/pep8 fixes 2013-09-20 11:28:00 -04:00
Diana Huang
3ebc002171 Merge pull request #1076 from edx/diana/hide-button-when-no-camera 
Hide the 'take photo' button when there isn't a camera.
 2013-09-20 08:25:00 -07:00
jkarni
b580aa0f1f Merge pull request #1024 from edx/jkarni/fix/IOError 
Catch IOError and ignore if OS X companion file
 2013-09-20 08:22:51 -07:00
Christina Roberts
99bf64170f Merge pull request #1031 from edx/christina/backbone-assets 
Backbone model/view for asset list.
 2013-09-20 08:16:44 -07:00
Brian Talbot
9661cde5c5 xmodule - Capa/HTML: adds top/bottom margin to table elements 2013-09-20 11:10:56 -04:00
Brian Talbot
7362e267d7 xmodule - Capa/HTML: adds in standard text-justification class names authors can use within table cells 2013-09-20 11:10:56 -04:00
Diana Huang
94f6bb66d2 Hide the 'take photo' button when there isn't a camera. 2013-09-20 10:59:17 -04:00
cahrens
948615d66f Log warning if thumbnail cannot be deleted. 2013-09-20 10:44:55 -04:00
cahrens
fe6ed08518 Code review feedback. 2013-09-20 10:44:55 -04:00
cahrens
d11c92d799 Set the URL on the collection instead of the model. 2013-09-20 10:44:55 -04:00
cahrens
9ceee3627f Simplify how we determine if asset is already showing. 2013-09-20 10:44:54 -04:00
cahrens
01d7d48f8f Create backbone models/views for assets. 
cleanup

Updates.

Testing changes.

Testing changes.

asset-index progress state cleanjup.

cleanup
 2013-09-20 10:44:54 -04:00
Will Daly
6d3df1452a Add -q (quiet) flag to pip install 2013-09-20 09:31:50 -04:00
Adam
97b738bc79 Merge pull request #1002 from edx/adam/accessible-mathjax 
add accessibility message if mathjax is detected
 2013-09-20 06:25:38 -07:00
jmclaus
1c7d821cfd Merge pull request #1041 from edx/jmclaus/bugfix_disable_video_autoplay_lms 
Disabled video autoplay for students
 2013-09-20 05:06:16 -07:00
jmclaus
66bd8127e6 Acceptance tests now pass 2013-09-20 14:04:58 +02:00
jmclaus
cbc4bd5c3a Modified acceptance test to reflect autoplay=false as a default for lms 2013-09-20 14:04:57 +02:00
jmclaus
7af892e66a Disabled video autoplay for students 2013-09-20 14:04:57 +02:00
Nick Parlante
357156b58a Mention in studio UI that %%USER_ID%% works 2013-09-19 14:28:10 -07:00
Diana Huang
c65e21c779 Merge pull request #1071 from edx/diana/order-integrity-errors 
If the current course doesn't have a verified course mode
 2013-09-19 14:10:27 -07:00
Diana Huang
3140270590 Merge pull request #1040 from edx/diana/no-ordering-twice 
Don't try to purchase the same order twice
 2013-09-19 14:07:17 -07:00
Diana Huang
2f001041ee Merge pull request #1048 from edx/diana/cybersource-unicode-handling 
Add unicode handling to the signing and verifying logic
 2013-09-19 14:04:53 -07:00
Diana Huang
ec5e767bb4 If the current course doesn't have a verified course mode 
kick the user out of the verify registration flow.
 2013-09-19 16:59:28 -04:00
Brian Talbot
2a9c99224b Merge pull request #1067 from edx/talbs/fix-a11y-browsermessage 
LMS: Hide Browser Recommendation Message from Assistive Tech Users
 2013-09-19 13:54:23 -07:00
Brian Talbot
159f680711 LMS: semantically hides the ie-centric browser warning/FF/Chrome suggestion message to avoid confusing/misleading assistive tech-based users. 2013-09-19 16:37:50 -04:00
Adam Palay
34362b88a6 add accessibility message if mathjax is detected 
use ie conditional html tags to detect for compatible ie versions
 2013-09-19 16:07:56 -04:00