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

18044 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Don Mitchell
a4ee129f04 Merge pull request #1095 from edx/dhm/asset_bug 
Fixed missing read (cut/paste f'up)
 2013-09-23 12:17:56 -07:00
Calen Pennington
63b841bca9 Merge pull request #1062 from cpennington/speed-up-location-creation 
Speed up Location creation returning existing locations where possible
 2013-09-23 11:55:36 -07:00
Calen Pennington
25ea91ed4a Merge pull request #1061 from cpennington/faster-location-urls 
Turn Locations into dicts less often
 2013-09-23 11:55:00 -07:00
Don Mitchell
e993a00d21 Test import-export-import assets 2013-09-23 14:34:36 -04:00
Chris Dodge
6dcd7cdd65 Merge branch 'release' 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
 2013-09-23 14:16:20 -04:00
Don Mitchell
3daeb59aca Fixed missing read (cut/paste f'up) 2013-09-23 14:09:58 -04:00
Calen Pennington
cfa2b27f26 Turn Locations into dicts less often 2013-09-23 13:46:48 -04:00
Christina Roberts
c1d63919d8 Merge pull request #1089 from edx/christina/basejs_bug 
Moving unregistration of change listener into asset_index.html.

Build passed when ran manually (automatic one is running now).
 2013-09-23 08:47:13 -07:00
David Ormsbee
88cae5436c Merge pull request #1085 from edx/ormsbee/ss_err_checking 
Add extra error checking and logging to Software Secure callback
 2013-09-23 07:38:39 -07:00
cahrens
9b076464f4 Moving unregistration of change listener into asset_index.html. 
Fixes broken integration test on master.
 2013-09-23 10:25:06 -04:00
Adam
89c94b4f0a Merge pull request #1065 from edx/adam/password-modal 
manage focus to/from/within password reset modal appropriately
 2013-09-23 06:36:33 -07:00
Giulio Gratta
e0f7d267df Merge pull request #1086 from edx/giulio/self-assess-fix 
Conditionalize written feedback area.
 2013-09-22 18:06:43 -07:00
Giulio Gratta
78ea6ef030 conditionalize written feedback area. 2013-09-22 17:23:22 -07:00
David Ormsbee
61e7cbb567 Add extra error checking and logging to Software Secure callback 2013-09-22 15:47:43 -04: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
1f5d222320 remove forgot-password-modal class 2013-09-20 15:14:04 -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
Adam Palay
a0d30b25a4 respond to comments 2013-09-20 13:09:30 -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