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

8444 Commits

Author SHA1 Message Date
Sarina Canelake
6418f6fe8b Add Chinese (Hong Kong) language 2014-06-12 10:41:09 -04:00
Brian Talbot
14ad71f206 Merge pull request #3462 from edx/andya/source-maps 
Update SASS ( 3.3.5), Bourbon ( 4.0.2), Neat (1.6.0)
 2014-06-11 22:31:37 -04:00
Sarina Canelake
7e36c35043 Merge branch 'release' 2014-06-11 21:30:05 -04:00
Brian Talbot
44982ae3ca correcting for updated Bourbon radial-gradient mixin syntax 2014-06-11 21:19:46 -04:00
Brian Talbot
02b0725456 correcting for Bourbon deprecated inline-block() mixin 2014-06-11 21:19:46 -04:00
Jim Abramson
b6bf1b8848 Merge pull request #4056 from edx/jsa/search-spell-correction-fixes 
clarify and internationalize the search spell correction message.
 2014-06-11 13:14:56 -04:00
Calen Pennington
13ec3698d5 Merge pull request #4058 from cpennington/hotfix/lms-2830 
Allow users that have unregistered from a verified course to re-register.
 2014-06-11 13:05:12 -04:00
jsa
5dfd4d4dcc clarify and internationalize the search spell correction message. 2014-06-11 12:41:34 -04:00
Calen Pennington
f6ea16223b Allow users that have unregistered from a verified course to re-register. 
Fixes LMS-2830
 2014-06-11 12:37:53 -04:00
lduarte1991
fecb2e1682 Annotation Tool: PR #3969 
Text Annotation Tool: Added Instructor Filter and Clear Search

Video Annotation Tool: Added Instructor Filter

Image Annotation Tool: Added Instructor Filter

Image Annotation Tool: Annotation Mode for AB Testing

Annotation Tools PR Fixes

- forgot to overwrite the previous line

Annotation Tools: PR Fixes

- Fixed camel case for variable name
- Fixed indentation in imageannotation.html
- Changed all mentions of Instructor Username to Email
- Turned annotation_mode into phrase
- Fixed indentation in imageannotation.html
- Added comments in imageannotation.html

- Changing annotation_mode in OSDA

Annotator Tools: OpaqueKeys update for Notes

Annotation Tools: Added CommonAnnotatorMixin

Annotator Tool: Fixed delete bug and factored out settings

Removed print context

Conflicts:
	common/lib/xmodule/xmodule/imageannotation_module.py
	common/lib/xmodule/xmodule/textannotation_module.py
	common/lib/xmodule/xmodule/videoannotation_module.py
	lms/djangoapps/notes/views.py
 2014-06-11 10:19:06 -04:00
lduarte1991
643a7bfa95 Annotation Tools: PR #3907 
Annotation Tools: Load Tinymce in student_view

Annotation Tools: Fixing tests for student_view

Fixed typo from autocomplete

Fixed dict for tests
 2014-06-11 10:15:14 -04:00
Will Daly
b00398f5ee ORA2 release-2014-06-11T10.43 
Install edx-submissions from PyPi instead of from edx-ora2
 2014-06-11 08:15:10 -04:00
Sarina Canelake
890093ebbf Fix Notes import 2014-06-10 18:13:32 -04:00
Sarina Canelake
2aea261d48 Merge branch 'release' 
Conflicts:
	common/djangoapps/course_modes/views.py
	common/djangoapps/student/tests/test_roles.py
	common/djangoapps/student/views.py
	common/lib/opaque_keys/opaque_keys/__init__.py
	common/lib/opaque_keys/opaque_keys/tests/test_opaque_keys.py
	common/lib/xmodule/xmodule/contentstore/mongo.py
	lms/djangoapps/certificates/management/commands/gen_cert_report.py
	lms/djangoapps/notes/views.py
 2014-06-10 16:59:23 -04:00
Sarina Canelake
749cb4ee7d Merge pull request #4031 from edx/sarina/other-ok-fixes 
Sarina/other ok fixes
 2014-06-09 15:18:13 -04:00
Sarina Canelake
bf6c342dcf Fix location.url [LMS-2786] 2014-06-09 15:17:20 -04:00
Diana Huang
baf0cee0be Fix gen_cert_report to use CourseKeys. 2014-06-09 15:17:13 -04:00
Sarina Canelake
a9cad6a5bb Fix logging bug in openended grading 2014-06-09 15:16:18 -04:00
Julia Hansbrough
3a9f0b3f74 Fix import 2014-06-09 15:13:31 -04:00
Don Mitchell
acc02b0e09 Fix to excess asset query 2014-06-09 15:13:23 -04:00
Julia Hansbrough
ade82c2d05 Notes convert course_id to course_key 2014-06-09 15:12:23 -04:00
Diana Huang
729f0eb203 Fix variable name. 2014-06-09 15:10:48 -04:00
Don Mitchell
2c6437a279 Fix performance regression 
Remove course_from_id
don't fetch whole course when the root will do
don't fetch even the root if the id will do
check for definition.data == null
 2014-06-09 15:10:47 -04:00
Will Daly
b33a511172 Merge pull request #4001 from edx/will/ora2-i18n-js-strings 
Serve ORA2 JavaScript i18n strings
 2014-06-09 12:40:37 -04:00
Will Daly
dc34d753c0 Serve ORA2 JavaScript i18n strings 2014-06-09 11:35:09 -04:00
Joe Blaylock
fa9a022cca Merge pull request #4016 from edx/jrbl/bugfix_lxml_flattening 
Bugfix certificates request queue HTML flattening
 2014-06-06 11:10:33 -07:00
Julia Hansbrough
d2b2699166 Merge pull request #3969 from lduarte1991/lduarte-harvardx-pr2 
Annotation Tool: Urgent update for ChinaX AB Testing
 2014-06-06 13:55:10 -04:00
Ned Batchelder
ec5aee2949 Remove duplicates in a class list so tests aren't duplicated 2014-06-06 13:17:36 -04:00
Joe Blaylock
277dcb1113 Bugfix certificates request queue HTML flattening 2014-06-06 09:31:46 -07:00
lduarte1991
9c0d14ea2b Annotator Tools: OpaqueKeys update for Notes 2014-06-05 15:53:26 -04:00
Jim Abramson
f5cfd1ef96 Merge pull request #3986 from edx/jsa/search-spell-correction 
Add support for search spell corrections to Forums UX.
 2014-06-05 15:14:00 -04:00
jsa
58c5066e66 Add support for search spell corrections to Forums UX. 
Co-authored-by: Brian Talbot <btalbot@edx.org>

JIRA: FOR-591
 2014-06-05 15:00:29 -04:00
lduarte1991
68acf66f6c Annotation Tools: PR Fixes 
- Fixed camel case for variable name
- Fixed indentation in imageannotation.html
- Changed all mentions of Instructor Username to Email
- Turned annotation_mode into phrase
- Fixed indentation in imageannotation.html
- Added comments in imageannotation.html

- Changing annotation_mode in OSDA
 2014-06-05 13:05:37 -04:00
lduarte1991
b22643adc2 Image Annotation Tool: Annotation Mode for AB Testing 
Annotation Tools PR Fixes

- forgot to overwrite the previous line
 2014-06-05 12:47:48 -04:00
lduarte1991
50e8ae9a6e Image Annotation Tool: Added Instructor Filter 2014-06-05 12:47:48 -04:00
lduarte1991
1dcf2dc10a Video Annotation Tool: Added Instructor Filter 2014-06-05 12:47:48 -04:00
lduarte1991
8429897c82 Text Annotation Tool: Added Instructor Filter and Clear Search 2014-06-05 12:47:48 -04:00
cahrens
5ab61fc4b2 Implement a custom editor for the split_module. 
STUD-1529
 2014-06-05 12:16:16 -04:00
polesye
7b2d67f209 BLD-1049: Allow the video player to work with redirected links. 2014-06-05 09:34:54 +03:00
Jay Zoldak
c08831b4b6 Merge pull request #3974 from edx/zoldak/fix-translation-tags 
Fix some translation tags
 2014-06-03 18:15:21 -04:00
Jay Zoldak
ac17e809ee Fix some translation tags 2014-06-03 15:50:11 -04:00
Greg Price
6ab6b72c86 Merge pull request #3941 from edx/gprice/handle-invalid-json 
Improve handling of bad JSON from comments service
 2014-06-03 14:13:29 -04:00
Will Daly
b700dc0cca Merge pull request #3939 from edx/will/ora2-ai-grading-settings 
ORA2 AI Grading Settings
 2014-06-03 14:06:47 -04:00
Greg Price
dc2342859e Improve handling of bad JSON from comments service 
Instead of allowing the JSONDecodeError to escape, raise an error
indicating the request id and containing the first 100 characters
of the response to aid investigation.
 2014-06-03 13:34:36 -04:00
Will Daly
5f7520e121 Add AI algorithm configuration to LMS settings 
Added ORA2_FILE_PREFIX setting
 2014-06-03 11:49:56 -04:00
Julia Hansbrough
136bcb2911 Merge pull request #3934 from edx/flowerhack/handout-error-logs 
Removed excessive logging
 2014-06-03 09:30:31 -04:00
Adam
f832011335 Merge pull request #3956 from edx/adam/user-id-profile-information 
adds user id to student profile information (LMS-2791)
 2014-06-03 09:04:36 -04:00
Julia Hansbrough
e1688e2a42 Removed excessive logging 2014-06-02 20:02:25 +00:00
Adam Palay
a2b2b37ed7 adds user id to student profile information (LMS-2791) 2014-06-02 15:49:46 -04:00
Greg Price
0d37b4b254 Merge branch 'release' 
Conflicts:
	cms/djangoapps/contentstore/tests/test_course_listing.py
	common/djangoapps/student/management/commands/create_random_users.py
	common/lib/xmodule/xmodule/modulestore/loc_mapper_store.py
	lms/djangoapps/bulk_email/forms.py
	lms/djangoapps/courseware/tests/test_video_handlers.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/management/commands/openended_post.py
	lms/djangoapps/instructor/management/commands/openended_stats.py
	lms/djangoapps/instructor/tests/test_spoc_gradebook.py
 2014-06-02 15:29:40 -04:00