Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
43,013 Commits 1 Branch 0 Tags
f520f9bd4eebf8e13ff79c092c1165584ca33e4d
Commit Graph

27 Commits

Author SHA1 Message Date
Andy Armstrong
93235d118d Reorder imports using isort (except lms and cms) 2017-05-30 16:04:54 -04:00
Gregory Martin
e1e47793df change help strings 2017-01-12 09:02:28 -05:00
cahrens
b8ddf709dc Convert javascript_loader to JS. 
Also reformat to 4 spaces per indent.
 2016-10-13 13:59:00 -04:00
Christina Roberts
2497f0a0eb WIP: xblock pipeline work (#10176) 
[PERF-303] Integer XBlocks/XModules into the static asset pipeline.

This PR, based on hackathon work from Christina/Andy, implements a way to discover all installed XBlocks and XModules and to enumerate their public assets, then pulling them in during the collectstatic phase and hashing them.  In turn, the methods for generating URLs to resources will then returned the hashed name for assets, allowing them to be served from nginx/CDNs, and cached heavily.
 2016-04-29 10:52:42 -04:00
Robert Raposa
5e69224c32 Deprecate escaping in display_name_with_default 
- Remove escaping in display_name_with_default
- Move escaped version to deprecated display_name_with_default_escaped
- Does not include any other changes to remove double-escaping

Thanks to agaylard who initiated this work:
https://github.com/edx/edx-platform/pull/10756

TNL-3425
 2015-12-22 11:52:04 -05:00
Ned Batchelder
f5d0f3ff55 Remove useless pylint suppressions 2015-11-22 07:41:19 -05:00
Renzo Lucioni
2f0e663581 Use ugettext_noop instead of lambdas assigned to the underscore 
Replaces instances of an old hack with the more clear ugettext_noop.
 2015-11-04 09:17:18 -05:00
stv
b215d771b7 Fix PEP8: E128 continuation line under-indented 
for visual indent
 2014-11-24 20:46:50 -05:00
lduarte1991
b7313d6d2e Annotation Tools: Pylint Fix left over from previous PR 2014-09-23 13:03:48 -04:00
lduarte1991
bb4cfaba03 Annotation Tools: Adding Try-Catch for anonyous_student_id issue in staging 
- changed message and added i18n
 2014-09-17 13:00:37 -04:00
lduarte1991
a1541b61f2 [TNL-288] Annotation Tools: Give staff/instructors full permissions 
- changed role to 'in' condition

 - fixed comment about get_real_user

 - Adding Tests and Fixing Pep8 Violations
 2014-09-13 13:42:06 -04:00
lduarte1991
5c859c7128 Annotation Tools: Adding Annotator to CMS 2014-08-13 21:35:37 -04:00
Sarina Canelake
7e36c35043 Merge branch 'release' 2014-06-11 21:30:05 -04:00
lduarte1991
e48cc16d45 Annotations Tools: i18n Make stati strings extractable 
Original changes found in this commit
https://github.com/edx/edx-platform/commit/a6bae4d238fdc6a60c8ee9f1b80ca
3512bb085eb

Conflicts:
	common/lib/xmodule/xmodule/textannotation_module.py
	common/lib/xmodule/xmodule/videoannotation_module.py
 2014-06-11 10:23:45 -04:00
lduarte1991
848c7165e3 Annotation Tool: PR #4019 
Reverting commit @3bfb633 and updating openseadragon.js for latest build

Conflicts:
	common/lib/xmodule/xmodule/imageannotation_module.py
	common/lib/xmodule/xmodule/textannotation_module.py
	common/lib/xmodule/xmodule/videoannotation_module.py
 2014-06-11 10:21:08 -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
lduarte1991
894428ea9a Reverting commit @3bfb633 and updating openseadragon.js for latest build 2014-06-06 15:40:03 -04:00
lduarte1991
3bfb633fd3 Annotator Tool: Fixed delete bug and factored out settings 
Removed print context
 2014-06-06 12:39:35 -04:00
lduarte1991
54974a51ca Annotation Tools: Added CommonAnnotatorMixin 2014-06-06 10:09:22 -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
50e8ae9a6e Image Annotation Tool: Added Instructor Filter 2014-06-05 12:47:48 -04:00
lduarte1991
1d6f3c631d Annotation Tools: Load Tinymce in student_view 2014-05-29 11:34:40 -04:00
louyihua
63ef3bd05a i18n: More extractable & localizable strings in xmodules 2014-05-26 15:30:01 +08:00
lduarte1991
e4e4b32c62 Image Annotation Tool: Add linkback functionality to image thumbnails 
Changes requested in PR
 2014-05-23 14:59:31 -04:00
lduarte1991
0318c95537 Image Annotation Tool Fixes 
- Added component to view

- Added correct images for OSD

- Fixed path to codemirror

- Tinymce fullscreen works now

- Pep8/Pylint Fixes

- Default image changed and added call to super
 2014-05-23 14:58:18 -04:00
lduarte1991
32e96681f6 Image Annotation Tool: create xmodule and install js files 2014-05-23 14:57:23 -04:00