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

19363 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
33f13846a5 Merge branch 'release' 2013-09-14 07:00:17 -04:00
Calen Pennington
b9f8869c50 Merge pull request #985 from cpennington/mixins-for-xml-hotfix 
Add mixins to XModuleDescriptors as they are loaded during xml parsing
 2013-09-13 19:18:52 -07:00
Ned Batchelder
ed1a07382e Merge pull request #974 from edx/ned/keep-bson-in-mongo-code 
keep-bson-in-mongo-code
 2013-09-13 14:36:13 -07:00
Diana Huang
47ce9082e4 Merge branch 'release' 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/mongo/draft.py
	lms/djangoapps/courseware/tests/modulestore_config.py
 2013-09-13 17:15:44 -04:00
Calen Pennington
ce4c76ef37 Add mixins to XModuleDescriptors as they are loaded during xml parsing 2013-09-13 16:56:33 -04:00
Diana Huang
97a69e56df Merge pull request #969 from edx/hotfix-2013-09-13 
Hotfix 09/13/2013
 2013-09-13 13:53:07 -07:00
Brian Talbot
edcd76c666 LMS: resolves header logo and global nav inheriting verification reset link styling 2013-09-13 16:39:48 -04:00
Calen Pennington
c14423dbeb Merge pull request #973 from cpennington/update-location-hotfix 
Don't try and modify the location proproperty
 2013-09-13 12:54:17 -07:00
Ned Batchelder
4d99ef7eba Merge pull request #976 from edx/ned/fix-setattr-and-getattr 
fix-setattr-and-getattr
 2013-09-13 12:50:29 -07:00
John Jarvis
39d441e132 Merge pull request #765 from edx/jarv/grade-dump 
Jarv/grade dump
 2013-09-13 12:31:25 -07:00
David Ormsbee
1ac71223c1 Merge pull request #979 from edx/ormsbee/ss_small_fixes 
Send JSON messages to Software Secure in UTF-8, without escaping
 2013-09-13 12:25:44 -07:00
Brian Talbot
15b3b9ade0 Merge pull request #977 from edx/talbs/fix-i8tn-nav 
LMS: Header Logo/Brand alt Attribute Value Fix
 2013-09-13 12:24:45 -07:00
Brian Talbot
03e8c4b0ae Merge pull request #978 from edx/talbs/fix-verification-copy2 
Verification: Copy/Instruction Edits
 2013-09-13 12:24:16 -07:00
David Ormsbee
8c056f383e Make sure our JSON messages output unescaped UTF-8 text, to match Software Secure expectations. 2013-09-13 15:20:08 -04:00
Brian Talbot
ec94376de4 Verification: revises instructional photo review copy to match page layout change 2013-09-13 15:15:44 -04:00
Calen Pennington
3f8a2f03ee Use a setter to make editing location possible 2013-09-13 15:05:17 -04:00
Brian Talbot
4b4c68d9fd LMS: resolves alt attribute copy issue for app/brand logo element - i8tn and settings data 2013-09-13 15:01:07 -04:00
Ned Batchelder
bbf508ca7b fix-setattr-and-getattr 2013-09-13 14:44:49 -04:00
Greg Price
ef02450f17 Improve accessibility for forums post toolbar 
Mark toolbar and buttons with appropriate ARIA roles, add them to the
tab order, and make the titles more screen-reader friendly.
 2013-09-13 14:41:12 -04:00
Ned Batchelder
37e81007d6 keep-bson-in-mongo-code 2013-09-13 14:29:56 -04:00
Gabe Mulley
b1a76f1258 Merge pull request #925 from mulby/fix/gabe/configurable-tracking-filter 
Make URL patterns to exclude from tracking configurable
 2013-09-13 11:10:59 -07:00
Greg Price
e360f1d54f Merge pull request #950 from edx/gprice/dialog-role 
Add ARIA dialog role to Markdown editor dialogs
 2013-09-13 10:42:58 -07:00
Diana Huang
9d6c104f54 Merge pull request #963 from edx/diana/better-order-error-handling 
Show order errors in page instead of in an alert.
 2013-09-13 09:38:19 -07:00
Vik Paruchuri
8613594c49 Merge pull request #971 from edx/fix/vik/pg-hotfix 
Fix/vik/pg hotfix
 2013-09-13 09:23:00 -07:00
Frances Botsford
bf14476242 adjusted error wording on failed photo verification order 2013-09-13 12:10:10 -04:00
David Ormsbee
dcbb9bcdfb Merge pull request #972 from edx/ormsbee/ss_small_fixes 
Small fixes for unicode
 2013-09-13 09:07:15 -07:00
Jason Bau
1a5176c9cb Merge pull request #966 from edx/jbau/fix/verify-student-aws-settings-defaults 
fix default for VERIFY_STUDENT in lms/envs/aws.py
 2013-09-13 09:02:45 -07:00
Frances Botsford
0815bd48fe adjusted error wording on failed photo verification order 2013-09-13 11:54:32 -04:00
David Ormsbee
d1e1e7e5bc Minor fixes to handle non-ASCII names/config in student verification. 2013-09-13 11:49:54 -04:00
David Ormsbee
b6a863fb0e Make sure we use the name that was frozen at time of verification when sending to Software Secure. 2013-09-13 11:48:44 -04:00
Gabe Mulley
761a4dcc97 Make URL patterns to exclude from tracking configurable 
* Add unit test coverage for this "exclusion from tracking" logic
* Exclude based on regex match instead of raw string comparison
* Exclude heartbeat requests from tracking
 2013-09-13 11:24:51 -04:00
James Tauber
c6dfd97eeb Merge pull request #902 from antoviaque/accessibility 
Help Modal - Accessibility Fixes
 2013-09-13 08:21:47 -07:00
Vik Paruchuri
c6e5e67483 Fix linking problem for peer grading, add in a test 
Conflicts:
	common/lib/xmodule/xmodule/tests/test_peer_grading.py
 2013-09-13 11:09:06 -04:00
Vik Paruchuri
00050a08a4 Address review comments 2013-09-13 11:07:36 -04:00
Vik Paruchuri
640b7fe6b5 Fix problem with peer grading list not rendering, test 2013-09-13 11:07:22 -04:00
Vik Paruchuri
009017fe07 Address review comments 2013-09-13 11:06:40 -04:00
Vik Paruchuri
b222e66f45 Fix nopathtoitem error in peer grading 2013-09-13 11:06:23 -04:00
Brian Talbot
81df682f35 Merge pull request #967 from edx/talbs/fix-verification-copy 
Verification Process: Copy Changes
 2013-09-13 08:00:35 -07:00
chrisndodge
b6761498a3 Merge pull request #954 from edx/fix/cdodge/remove-forum-permissions-on-delete 
define a unseeding forums permissions and call into it from delete_cours...
 2013-09-13 07:23:14 -07:00
Brian Talbot
1c5e9730f2 Verification: revises copy on receipt page to reflect a completed registration process 2013-09-13 10:14:06 -04:00
Chris Dodge
955e54c2e6 refactor some code out of the django-admin entry point into a help function in CMS. Update tests to use new method 2013-09-13 09:07:01 -04:00
Valera Rozuvan
52eae9839b Merge pull request #907 from edx/valera/fix_remove_unnecessary_css_code_from_video 
Removed an inclusion of t-copy-sub1 in SCSS for Video.
 2013-09-13 00:12:31 -07:00
Valera Rozuvan
27015578f2 Removed an inclusion of t-copy-sub1 in SCSS. 
This line was not doing anything and simply causing a warning while
SASS was compiling. The following is the warning:

---
WARNING on line 35 of /home/valera/edx_all/edx-platform/common/static
/xmodule/descriptors/css/_000-5df8e10160f918d31f2b2e8be3ce247d.scss:
".xmodule_edit.xmodule_VideoDescriptor .editor-with-tabs .edit-header
.component-name" failed to @extend ".t-copy-sub1".

  The selector ".t-copy-sub1" was not found.
  Use "@extend .t-copy-sub1 !optional" if the extend should be able to
    fail.
---
 2013-09-13 10:11:45 +03:00
Jason Bau
c86a56e6d9 Merge pull request #959 from edx/jbau/fix/anonymous-index-with-startdate 
fix bug with anonymous access to / with future start courses
 2013-09-12 17:33:55 -07:00
Jason Bau
2f230836e0 fix default for VERIFY_STUDENT in lms/envs/aws.py 2013-09-12 16:49:30 -07:00
Felipe Montoya
45a1e551f9 i18n: problem submit buttons. 2013-09-12 18:13:16 -05:00
Felipe Montoya
c6f4c8b2b8 i18n: staff/student toggle link 2013-09-12 18:13:12 -05:00
Felipe Montoya
a5fd04a95d i18n: submit buttons at dashboard 2013-09-12 18:12:49 -05:00
Sarina Canelake
193f7166d7 Merge pull request #962 from edx/sarina/fix-datadog-import 
Don't assign variable to .update() call
 2013-09-12 13:46:44 -07:00
frances botsford
473e80f537 Merge pull request #964 from edx/fix/frances/copy-edits-mode-choice 
adjusting wording on choice expand block
 2013-09-12 13:32:58 -07:00