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

20360 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Ned Batchelder
d6b05cfcd0 Converted CONTRIBUTING to .rst 2014-01-14 14:08:07 -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
Ned Batchelder
1932c126b8 Rename DbModel to KvsFieldData. 2014-01-14 13:09:36 -05:00
Ned Batchelder
679f1d68fc Remove unused things. 2014-01-14 13:09:36 -05:00
Ned Batchelder
b6bd293266 Clean up some pre-existing formatting. 2014-01-14 13:09:35 -05:00
Greg Price
a8e3bca8c8 Internationalize forums CoffeeScript code 2014-01-14 13:04:51 -05:00
Greg Price
a1dc49cc9b Remove defunct forum post tagging code 2014-01-14 13:03:56 -05:00
Brian Talbot
3faf7456b9 Merge pull request #2159 from edx/talbs/lms-fix-certificate-button 
LMS: FIX - Add Styling Back to Certificate Download Button
 2014-01-14 09:59:16 -08:00
Jason Bau
6aeadb874b Merge pull request #2163 from edx/jbau/sass-path-bugfix 
small bugfixes for theming+sass+templates
 2014-01-14 08:45:00 -08:00
Sarina Canelake
129c24477f Merge pull request #2062 from jazkarta/feature-idde2 
Individual Due Date Extension feature
 2014-01-14 08:00:14 -08:00
Chris Rossi
831f907c79 Add individual due dates feature. 
Adds a feature to the edX platform which allows instructors to set
individual due dates for students on particular coursework. This code is
meant primarily for on-campus use--it is not intended that this feature
would be used for MOOCs. It adds a new tab, "Extensions", to the beta
instructor dashboard which allows changing due dates per student. This
feature is enabled by setting FEATURES['INDIVIDUAL_DUE_DATES'] = True.
 2014-01-14 10:19:02 -05:00
Brian Talbot
e475f835cf Merge pull request #2164 from edx/talbs/update-copyright 
Copyright Notice Updates
 2014-01-14 07:17:04 -08:00
Sarina Canelake
371c41e5ac Merge pull request #2158 from edx/sarina/remove-university-refs 
Sarina/remove university refs
 2014-01-14 07:06:45 -08:00
Sarina Canelake
9ce10493ad Remove references to old university images 2014-01-14 09:27:03 -05:00
Brian Talbot
367d2dc2ae Studio/LMS: Updates copyright notices to 2014 2014-01-13 19:59:24 -05:00
Jason Bau
6560c4faf8 small bugfixes for theming+sass+templates 
change ruby and to &&
 2014-01-13 15:28:35 -08:00
Jason Bau
7b6cf0dc95 Merge pull request #2162 from edx/jbau/sass-path-bugfix 
Revert "small bugfixes for theming+sass+templates"
 2014-01-13 15:22:32 -08:00
Jason Bau
eb15355b74 Revert "small bugfixes for theming+sass+templates" 
This reverts commit 5f3313ece4.
 2014-01-13 14:35:24 -08:00
Will Daly
f553f68a5d Merge pull request #2161 from edx/will/disable-more-video-tests 
Disabled video updateplaytime JS test
 2014-01-13 13:59:29 -08:00