Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Iss3342 #3509

Closed
wants to merge 730 commits into from
Closed

Iss3342 #3509

wants to merge 730 commits into from

Conversation

s-tikhomirov
Copy link

No description provided.

PYushchenko and others added 22 commits April 18, 2014 13:28
Conflicts:
	common/djangoapps/student/models.py
	common/djangoapps/student/views.py
	common/lib/capa/capa/xqueue_interface.py
	common/lib/xmodule/xmodule/combined_open_ended_module.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/x_module.py
	common/static/css/vendor/pdfjs/images/secondaryToolbarButton-firstPage.png
	common/static/css/vendor/pdfjs/images/secondaryToolbarButton-lastPage.png
	common/static/css/vendor/pdfjs/images/secondaryToolbarButton-rotateCcw.png
	common/static/css/vendor/pdfjs/images/secondaryToolbarButton-rotateCw.png
	common/static/css/vendor/pdfjs/images/shadow.png
	common/static/css/vendor/pdfjs/images/toolbarButton-presentationMode.png
	common/static/css/vendor/pdfjs/images/toolbarButton-secondaryToolbarToggle-rtl.png
	common/static/css/vendor/pdfjs/images/toolbarButton-secondaryToolbarToggle.png
	common/static/css/vendor/pdfjs/images/toolbarButton-sidebarToggle-rtl.png
	common/static/css/vendor/pdfjs/images/toolbarButton-viewOutline-rtl.png
	common/static/css/vendor/pdfjs/viewer.css
	common/static/js/pdfviewer.js
	common/static/js/vendor/pdfjs/compatibility.js
	common/static/js/vendor/pdfjs/l10n.js
	common/static/js/vendor/pdfjs/locale/cs/viewer.properties
	common/static/js/vendor/pdfjs/locale/de/viewer.properties
	common/static/js/vendor/pdfjs/locale/en-US/viewer.properties
	common/static/js/vendor/pdfjs/locale/es/viewer.properties
	common/static/js/vendor/pdfjs/locale/fr/viewer.properties
	common/static/js/vendor/pdfjs/locale/ja/viewer.properties
	common/static/js/vendor/pdfjs/locale/nl/viewer.properties
	common/static/js/vendor/pdfjs/locale/zh-CN/viewer.properties
	common/static/js/vendor/pdfjs/locale/zh-TW/viewer.properties
	common/static/js/vendor/pdfjs/pdf.js
	common/static/js/vendor/pdfjs/pdf.worker.js
	common/static/js/vendor/pdfjs/viewer.js
	conf/locale/config.yaml
	conf/locale/ru/LC_MESSAGES/django.mo
	conf/locale/ru/LC_MESSAGES/django.po
	conf/locale/ru/LC_MESSAGES/djangojs.mo
	conf/locale/ru/LC_MESSAGES/djangojs.po
	i18n/extract.py
	lms/djangoapps/courseware/tabs.py
	lms/djangoapps/courseware/views.py
	lms/djangoapps/instructor/views/legacy.py
	lms/djangoapps/open_ended_grading/staff_grading_service.py
	lms/envs/common.py
	lms/templates/courseware/instructor_dashboard.html
	lms/templates/dashboard/_dashboard_course_listing.html
	lms/templates/emails/confirm_email_change.txt
	lms/templates/emails/email_change.txt
	lms/templates/emails/email_change_subject.txt
	lms/templates/emails/enroll_email_allowedmessage.txt
	lms/templates/help_modal.html
	lms/templates/login.html
	lms/templates/navigation.html
	lms/templates/signup_modal.html
	requirements/edx/base.txt
@nedbat
Copy link
Contributor

nedbat commented Apr 29, 2014

Hi, @serj-nickel, can you explain this pull request? It's very large and very old. Did you really mean to suggest all these changes for edx-platform?

@nedbat
Copy link
Contributor

nedbat commented May 1, 2014

@serj-nickel I'm closing this pull request for now. When you have time, get in touch to talk about the changes you want to make.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
open-source-contribution PR author is not from Axim or 2U waiting on author PR author needs to resolve review requests, answer questions, fix tests, etc.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants