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

8456 Commits

Author SHA1 Message Date
muhammad-ammar
ac26f27898 Merge pull request #4125 from edx/ammar/improve-certificates-test-time 
Improve certificates test time
 2014-06-17 18:45:35 +05:00
Dave St.Germain
0b37c987c6 Merge pull request #3908 from edx/dcs/support-dashboard 
Added manual refund page for support.
PR-615
 2014-06-17 08:27:34 -04:00
Dave St.Germain
f2fb57e196 Added manual refund page for support. 
PR-615
 2014-06-17 08:24:02 -04:00
Muhammad Ammar
346164189f Improve certificates test time 2014-06-17 08:54:52 +00:00
Jim Abramson
0b398c8976 Merge pull request #4118 from edx/jsa/bugfix-cc-user 
bugfix: avoid side-effects when overriding User.default_retrieve_params
 2014-06-16 16:24:15 -04:00
jsa
51f3b94f53 bugfix: avoid side-effects when overriding User.default_retrieve_params 2014-06-16 16:01:13 -04:00
Diana Huang
2dbf9442a6 Revise course mode choose page. 
LMS-2796
 2014-06-16 14:08:40 -04:00
Jim Abramson
c74b34c1a8 Merge pull request #4041 from edx/jsa/forums-search-users 
implement forums endpoint for searching users.
 2014-06-16 10:15:01 -04:00
jsa
c2ebfde429 implement forums endpoint for searching users 2014-06-16 10:12:52 -04:00
Han Su Kim
858f3ae5c9 Merge pull request #4075 from edx/han/regenerate_user 
Transition to Oqaque Keys
 2014-06-13 11:39:56 -04:00
Han Su Kim
8fdec439ee Changing over imports to opaque_keys.edx 2014-06-13 09:36:40 -04:00
Han Su Kim
0b93c5a827 Squashing commits, 
Squashing commits

Transition to Oqaque Keys

Bug fixes

Fixing regenerate_user
 2014-06-12 18:24:47 -04:00
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