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

23334 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Don Mitchell
f7558c40e8 Fixes ../courseware/Peer_Grading_Panel/peergrading:L12P5_grading/ reported bug 2014-05-20 11:44:51 -04:00
Calen Pennington
f883a36935 Merge pull request #3780 from cpennington/missing-semicolon 
Fix missing semicolon in annotation html
 2014-05-20 10:27:30 -04:00
Calen Pennington
9ca09db469 Fix missing semicolon in annotation html 2014-05-19 15:34:29 -04:00
Mark Hoeber
a7139a84b6 Add stevedore requirements for RTD builds 2014-05-19 14:58:54 -04:00
Mark Hoeber
1e27f177da Adding opaque keys module to system path in doc configuration 
To make RTD work.
 2014-05-19 13:46:07 -04:00
Don Mitchell
5a62c83d05 Handle some records not having lower_id 2014-05-19 13:31:03 -04:00
Calen Pennington
30f2c9331d Merge pull request #3763 from cpennington/opaque-keys-merge-master 
Merge latest master into opaque-keys
 2014-05-19 13:10:55 -04:00
Calen Pennington
a3b6ef8bae Rename variables to make type clearer 2014-05-19 10:58:38 -04:00
Calen Pennington
4df122a92e Update annotations modules to use the course_id from the runtime, rather than extracting it from the page 2014-05-19 09:37:53 -04:00
Calen Pennington
2ce6719153 Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master 2014-05-19 09:29:34 -04:00
Calen Pennington
8f72394e81 Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/templates/widgets/header.html
 2014-05-19 09:20:08 -04:00
Will Daly
6c7ca7ae89 Merge pull request #3768 from edx/will/ora2-release-2014-05-19 
ORA2 release 2014-05-19
 2014-05-19 08:44:02 -04:00
Sarina Canelake
03496b5da1 Merge pull request #3771 from edx/sarina/051914-language-update 
Sarina/051914 language update
 2014-05-19 08:43:37 -04:00
Sarina Canelake
593f591847 Update translations (autogenerated message) 2014-05-19 08:35:08 -04:00
Sarina Canelake
5fd2eef58d Add Croatian language 2014-05-19 08:13:18 -04:00
Will Daly
8b3992bf4b ORA2 release 2014-05-19 2014-05-19 08:05:13 -04:00
Anton Stupak
b3fb545b10 Merge pull request #3716 from edx/anton/i18n-symbolic-response 
SymbolicResponse fix error message.
 2014-05-19 11:23:07 +03:00
polesye
aedde3397e SymbolicResponse fix error message. 2014-05-19 09:00:09 +03:00
Nimisha Asthagiri
b3233f2932 Merge pull request #3619 from edx/markhoeber/documentatoin/online-help-system 
Online help system
 2014-05-16 22:02:23 -04:00
Nimisha Asthagiri
73275eeb82 Updated tests for online help 2014-05-16 21:27:57 -04:00
Mark Hoeber
27ff0db57b Added new context sensitive link and updated text 
Sock template changes
 2014-05-16 20:38:09 -04:00
Nimisha Asthagiri
84d8fcf1b5 Acceptance tests for online help. 2014-05-16 20:38:09 -04:00
Mark Hoeber
8fcbdaed03 Update of all templates 
Changed help button to link and removed drop-down items
 2014-05-16 20:38:09 -04:00
Nimisha Asthagiri
b7440a51e8 Dev support for context-sensitive help. 2014-05-16 20:37:32 -04:00
Carson Gee
3b25801881 Merge pull request #3615 from jazkarta/devstack-local-filestorage 
Use local storage instead of S3 for uploads in devstack.
 2014-05-16 17:10:05 -04:00
Don Mitchell
1c6a0f0a6c Merge pull request #3761 from edx/dhm/opaque-export 
Dhm/opaque export
 2014-05-16 16:40:06 -04:00
Chris Rossi
db8b33d04d Use path already created by ansible. 2014-05-16 16:37:39 -04:00
Chris Rossi
42e8e3068e Use local storage instead of S3 for uploads in devstack. 2014-05-16 16:37:39 -04:00
Sarina Canelake
4a842131d6 Merge pull request #3760 from edx/sarina/fix-split-test-child-id 
Sarina/fix split test child
 2014-05-16 16:12:53 -04:00
Sarina Canelake
afac5145e3 Merge pull request #3757 from edx/sarina/fix-git_import 
Sarina/fix git import
 2014-05-16 16:12:33 -04:00
Calen Pennington
ba7abf4291 Fix test_import_export.py 2014-05-16 15:41:14 -04:00
Calen Pennington
dd6609fa2c Fix dashboard data tests 2014-05-16 15:38:59 -04:00
Don Mitchell
d636c56af2 xml export of drafts was exporting everything 
now only exports the drafts into the draft subdir
STUD-1627
 2014-05-16 15:29:25 -04:00
Calen Pennington
56a6b99f61 Merge pull request #3759 from cpennington/opaque-keys-rtfd-requirements 
Add napoleon to the requirements to build our docs
 2014-05-16 15:10:27 -04:00
Calen Pennington
6d5478a483 Migrate new code from merge to use OK standards 2014-05-16 14:20:35 -04:00
Calen Pennington
d4280e8529 Fix merge conflicts 2014-05-16 14:10:50 -04:00
Calen Pennington
18c91d0f1d Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/tests/utils.py
	cms/djangoapps/contentstore/views/import_export.py
	cms/djangoapps/contentstore/views/tests/test_import_export.py
	common/djangoapps/student/views.py
	lms/djangoapps/class_dashboard/dashboard_data.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/static/js/staff_debug_actions.js
	lms/templates/notes.html
	lms/templates/staff_problem_info.html
 2014-05-16 14:01:20 -04:00
David Baumgold
2549551e3c Merge pull request #3752 from edx/db/doc-cognitive-load 
Added rst version of cognitive load page
 2014-05-16 13:59:39 -04:00
David Baumgold
8afe315ce4 link to code considerations page from contributor doc 2014-05-16 13:59:21 -04:00
Sarina Canelake
1919df71a2 Fix split test child id 2014-05-16 13:52:42 -04:00
Calen Pennington
bad2941f09 Add napoleon to the requirements to build our docs 2014-05-16 13:49:55 -04:00
clytwynec
6396373bd5 Merge pull request #3758 from edx/clytwynec/disable-XBlockAcidNoChildTest 
disabled test_lms.py:XBlockAcidNoChildTest.test_acid_block
 2014-05-16 12:01:05 -04:00
srpearce
64909df1de Merge pull request #3740 from edx/sylvia/docs/BLD-1032 
Update Video component to reflect new UI
 2014-05-16 11:52:47 -04:00
Sylvia Pearce
14f3bcfe66 Update Video docs to reflect new UI 2014-05-16 11:52:19 -04:00
Sarina Canelake
b3462d1c67 Fix issues with psychometrics and git import 2014-05-16 11:47:14 -04:00
Calen Pennington
af8cab2a37 Fix doc typos from #3746 2014-05-16 11:35:56 -04:00
Calen Pennington
0e4f29a87a Merge pull request #3746 from cpennington/opaque-keys-docs-link 
Update opaque_keys docs
 2014-05-16 11:34:03 -04:00
Christine Lytwynec
0533859366 disabled test_lms.py:XBlockAcidNoChildTest.test_acid_block 2014-05-16 11:17:26 -04:00
zubair-arbi
4ec689ed5e Merge pull request #3640 from edx/zub/bugfix/std1595-importcoursepermission 
remove redundent code on course import
 2014-05-16 19:05:46 +05:00
Diana Huang
12ae70b091 Merge pull request #3753 from edx/diana/update-forums-cmd 
Update get_discussion_link command to use CourseKeys
 2014-05-16 09:42:43 -04:00