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

20381 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Greg Price
f8732a8b3d Internationalize the forums post Markdown editor 
This includes removing the "PREVIEW" label for the preview pane from CSS
and adding it to the generated DOM.
 2014-01-16 14:10:51 -05:00
Greg Price
9075dcefb6 Merge pull request #2186 from edx/gprice/timeago-i18n 
Internationalize our use of jquery.timeago
 2014-01-15 14:23:52 -08:00
Don Mitchell
41f8834453 Merge pull request #2167 from edx/dhm/split_block_id 
Encode periods and $ in block_id map
 2014-01-15 14:17:41 -08:00
Greg Price
0f09a3093e Internationalize our use of jquery.timeago 
Also get rid of an unused template and extra copies of jquery.timeago.
 2014-01-15 16:46:38 -05:00
Calen Pennington
80d54afdae Merge pull request #2178 from cpennington/ddt-without-six 
Use a version of ddt that supports unicode w/o requiring six at runtime
 2014-01-15 13:26:18 -08:00
Mark Hoeber
41d3cedc43 Merge pull request #2185 from edx/markhoeber/documentation/stud-1041 
Documentation accessibility
 2014-01-15 13:18:46 -08:00
Mark Hoeber
d422816326 Documentation accessibility 
Alt tags added to for all images. For STUD-1041
 2014-01-15 16:16:39 -05:00
Calen Pennington
4f1a420a2a Use a version of ddt that supports unicode w/o requiring six at runtime 2014-01-15 15:34:35 -05:00
Will Daly
ca180834dc Merge pull request #2128 from edx/will/bok-choy-fixtures-rebase 
Bok-choy fixtures, Studio tests, and (some) ORA tests
 2014-01-15 12:18:47 -08:00
Jim Abramson
0b617fc38f Merge pull request #2169 from edx/feature/jsa/forums-i18n-mako 
i18n: externalize strings in discussion forums templates and python code...
 2014-01-15 12:14:43 -08:00
Mark Hoeber
4eca32b36b Merge pull request #2112 from edx/markhoeber/documentation/stud-1132 
Course Start Date Changes
 2014-01-15 11:46:41 -08:00
Mark Hoeber
8d4b84b895 Merge pull request #2114 from edx/markhoeber/documentation/stud-1038 
Added doc for file sorting change
 2014-01-15 11:46:05 -08:00
jsa
dfa4a03daa i18n: externalize strings in discussion forums templates and python code. 
JIRA: FOR-398, FOR-399
 2014-01-15 14:26:22 -05:00
Greg Price
ee1651daeb Merge pull request #2120 from edx/gprice/forum-unicode-tests 
Add forum tests for non-ASCII data
 2014-01-15 10:51:30 -08:00
chrisndodge
c523b4f09b Merge pull request #2104 from edx/feature/mattdrayer/authors-addition 
First PR!  Added myself to the AUTHORS file
 2014-01-15 10:47:48 -08:00
Mark Hoeber
a2da19fd3c Merge pull request #2179 from edx/sylvia/documentation/ORA_updates 
Sylvia/documentation/ora updates
 2014-01-15 09:40:15 -08:00
Calen Pennington
ebb5a52fe0 Merge pull request #2141 from cpennington/xblock-contract-docs 
Add documentation of LMS/Studio features usable by XBlocks
 2014-01-15 09:05:03 -08:00
Sylvia Pearce
c758568deb Add scoring information 2014-01-15 11:34:22 -05:00
Calen Pennington
65d051af03 Add documentation of LMS/Studio features usable by XBlocks 
[LMS-192]
 2014-01-15 11:28:57 -05:00
Waheed Ahmed
a41ca43f4e Merge pull request #2058 from edx/waheed/ora195-json-serialization-error-fix 
JSON serialization error fixed.
 2014-01-15 08:18:27 -08:00
Don Mitchell
7e02951571 Merge pull request #2064 from edx/dhm/auth_consolidate 
Replace authz with roles.py and reconcile their behaviors
 2014-01-15 07:21:03 -08:00
Andy Armstrong
9db8b4979c Merge pull request #2175 from edx/andya/typo 
Fix typo in the announcement template
 2014-01-15 06:59:12 -08:00
Waheed Ahmed
b98f4e0229 JSON serialization error fixed and added test for it. 
ORA-195
 2014-01-15 19:47:45 +05:00
Will Daly
4afd5ea49f Refactored bok-choy directory structure 
Added fixtures for course and xblock creation
Added bok-choy Studio tests
Added bok-choy tests for ora self- and ai- assessment
Refactored auto-auth; added staff and course-enrollment options
Removed extra javascript properties from page objects
 2014-01-15 09:37:32 -05:00
Julia Hansbrough
f3f0e8a514 Merge pull request #1888 from edx/flowerhack/feature/certificate-revenue-reporting 
Verified Certificate Reports
 2014-01-15 06:18:17 -08:00
Alexander Kryklia
4388bff8a2 Merge pull request #2150 from edx/anton/fix-negative-exponents 
Anton/fix negative exponents
 2014-01-15 06:06:18 -08:00
Julia Hansbrough
1664452a14 Final iteration 2014-01-15 13:06:50 +00:00
polesye
1347645ef0 BLD-434: Add fix for negative exponents. 
Set default tolerance to 1e-3% for all responsetypes.
 2014-01-15 13:17:05 +02:00
Alexander Kryklia
cbe97d6fe6 Merge pull request #1948 from edx/anton/allow-arbitrary-regex-in-stringresponse 
Anton/allow arbitrary regex in stringresponse
 2014-01-15 03:15:43 -08:00
polesye
ee1953b37a BLD-474: Allow multiple answers for string response. 2014-01-15 12:51:24 +02:00
Julia Hansbrough
ea0ae11171 Response to CR 1-14 2014-01-15 00:27:14 +00:00
Andy Armstrong
4436ad9aca Fix typo in the announcement template 2014-01-14 18:33:56 -05:00
Sylvia Pearce
3c3f2b394c Add scoring information and create internal links 2014-01-14 18:29:27 -05:00
David Ormsbee
de6eb99b66 Merge pull request #2174 from edx/gprice/fix-ddt-version 
Refer to a ddt commit that actually exists (merging to unbreak master)
 2014-01-14 15:08:54 -08:00
Greg Price
72084e1f27 Refer to a ddt commit that actually exists 2014-01-14 17:28:10 -05:00
Jason Bau
e5215d72b1 Merge pull request #2165 from edx/jbau/course_about_better_errormsg 
add FAQ link to course_about error msg
 2014-01-14 14:10:29 -08:00
Jason Bau
1b2aa4543c add FAQ link to course_about error msg 
use double-quotes, not single
 2014-01-14 14:09:03 -08:00
Don Mitchell
ad3140a6e6 Cleaned up modules to reflect centralizing auth 2014-01-14 17:04:44 -05:00
Don Mitchell
3ebac80778 Replace authz fns with roles.py ones 
STUD-1006
 2014-01-14 17:04:44 -05:00
Don Mitchell
858e354a6d Moved roles.py to common student 2014-01-14 17:04:43 -05:00
Sylvia Pearce
d884bd8927 Update ORA documentation per bug ORA-241 
Add "All peer grading must be done by due date" information
 2014-01-14 15:20:52 -05:00
Ned Batchelder
5b60b8bb3c Merge pull request #2170 from edx/ned/convert-contributing 
Converted CONTRIBUTING to .rst
 2014-01-14 11:51:24 -08:00
Don Mitchell
13a04927f8 Encode periods and $ in block_id map 
STUD-872
 2014-01-14 14:43:31 -05:00
Ned Batchelder
d6b05cfcd0 Converted CONTRIBUTING to .rst 2014-01-14 14:08:07 -05:00
Greg Price
5b2ff9b21a Add unit tests for non-ASCII forum content 2014-01-14 13:56:36 -05:00
Calen Pennington
d2a0df4118 Merge pull request #2129 from cpennington/xblocks-xml-import-export 
XBlock Xml Serialization/Deserialization
 2014-01-14 10:56:09 -08:00
Greg Price
3c3ef50e13 Merge pull request #2168 from edx/gprice/forum-coffee-i18n 
Internationalize forums CoffeeScript code
 2014-01-14 10:55:08 -08:00
Calen Pennington
a55724d117 Prevent unicode data from being injected into a Location using the _replace function 2014-01-14 13:28:49 -05:00
Calen Pennington
46109bb3e8 Use XBlock xml serialization and deserialization 
XModules continue to use their own interface for xml, but provide an
adaptor that makes the the XBlock interface available.

[LMS-179]
 2014-01-14 13:28:47 -05:00
Ned Batchelder
566bb16220 Implement InheritanceFieldData 2014-01-14 13:09:36 -05:00