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

18333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julian Arni
ecddd932ca Adding Pillow jpeg and tiff system libs 2013-09-23 16:37:30 -04:00
Greg Price
717cf6ad03 Merge pull request #1098 from edx/jkarni/fix/revert-xml-comments 2013-09-23 13:34:44 -07:00
Greg Price
5bf8960351 Merge pull request #1099 from edx/hotfix/unicode-course-wiki 
add unicode support for course_wiki
 2013-09-23 13:24:25 -07:00
jkarni
97cd5a8555 Merge pull request #1013 from edx/jkarni/fix/import-warnings 
Jkarni/fix/import warnings
 2013-09-23 13:15:55 -07:00
Adam Palay
e9b15b6f02 add unicode support for course_wiki 2013-09-23 16:15:47 -04:00
jkarni
199f898d23 Merge pull request #1087 from edx/jkarni/fix/revert-xml-comments 
Jkarni/fix/revert xml comments
 2013-09-23 12:18:21 -07:00
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
Julian Arni
e5c90d33fc Fix middleware order in CMS. 
And include Don's fix for partial course_id lookup.
 2013-09-23 15:11:06 -04: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
Calen Pennington
ad2da44cb1 Make Textbooks properly lazy 2013-09-23 13:44:34 -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
Don Mitchell
379a147a57 Begin transactional with_version impl 
Change create_item to optionally add the item to the head version and not create a new version.
 2013-09-23 11:35:53 -04:00
Don Mitchell
bd56ee21d2 split get_item uses loc_mapper to decode old style Locations 2013-09-23 11:35:53 -04:00
Don Mitchell
40d11c73cf location mapper maturation 
richer exceptions, add_map return course_id, fix a bug, filter out unwanted kwargs in init
 2013-09-23 11:35:53 -04:00
Usman Khalid
231b130911 Removed hardcoded case for edge for /courses 2013-09-23 15:30:00 +00:00
Usman Khalid
b2af990d3c If setting COURSES_ARE_BROWSABLE is off return 404 on /courses 2013-09-23 15:19:32 +00:00
Usman Khalid
3ff203d11f Renamed setting ENABLE_STUDENT_SELF_ENROLLMENT to COURSES_ARE_BROWSABLE 2013-09-23 15:04:11 +00:00
Julian Arni
b4e6a8b209 Fix order-dependency in tests 2013-09-23 10:52:05 -04: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
Julian Arni
c196d1895a i18n fix 2013-09-23 10:13:33 -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
Usman Khalid
3c3edac05f Fixed tests name in staticbook 2013-09-23 12:58:14 +00:00
Julian Arni
920b76410c Revert "don't remove comments from xml module" 
This reverts commit 343456e314.
 2013-09-22 21:39:36 -04:00
Julian Arni
303508a95b Revert "Make default parser keep comments" 
This reverts commit 238899faac.
 2013-09-22 21:39:14 -04: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
Julian Arni
268b5b47ae Remove cache workaround 2013-09-20 17:25:43 -04: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
Julian Arni
7a8d463260 Put static server middleware after the middleware it requires 2013-09-20 17:22:51 -04:00
Julian Arni
bf633f9c5d Perform auth checks in middleware 
Includes static server tests.
 2013-09-20 17:22:08 -04: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