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

662 Commits

Author SHA1 Message Date
Sarina Canelake
6418f6fe8b Add Chinese (Hong Kong) language 2014-06-12 10:41:09 -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
Will Daly
5f7520e121 Add AI algorithm configuration to LMS settings 
Added ORA2_FILE_PREFIX setting
 2014-06-03 11:49:56 -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
lduarte1991
b83e27fc9d Diacritic Plugin for Annotator Tool: Pull-request Fixes 
Making sure extension comes after annotator css
 2014-06-02 10:45:29 -04:00
lduarte1991
de5edcffbb Diacritic Plugin for Annotator TooL: Added CSS and JS files 
- UI Fixes for Diacritic Mark Plugin
 2014-06-02 10:45:29 -04:00
Adam
b15f3f1951 Merge pull request #3841 from edx/fix/large-email-queries-2 
Fix/large email queries 2
 2014-05-29 16:37:25 -04:00
Adam Palay
5b769df452 No longer chunk queries when sending out bulk email (LMS-2718) 
refactor _generate_items_for_subtask not to chunk queries

use django's iterator methor for querysets

remove bulk email query settings

use read_replica if available, since this is read-only

update changelog
 2014-05-29 09:10:25 -04:00
Julia Hansbrough
0d854bd51e Moved hardcoded defaults into settings 2014-05-28 20:44:26 +00:00
Sarina Canelake
ed5c36ee2d Add Gujarati language 2014-05-27 07:43:03 -04:00
Sarina Canelake
84ecac97bd Add Oriya language 2014-05-27 07:42:58 -04:00
Sarina Canelake
01a4f3a21f Merge pull request #3863 from edx/sarina/feature-flag-analytics-dash 
Hide beta dash Analytics tab behind feature flag
 2014-05-23 16:21:19 -04:00
Sarina Canelake
682191c474 Hide beta dash Analytics score distribution widget behind feature flag 
ENABLE_INSTRUCTOR_ANALYTICS flag is present to conditionally hide data
dependent on external analytics server installation
 2014-05-23 15:31:22 -04:00
lduarte1991
32e96681f6 Image Annotation Tool: create xmodule and install js files 2014-05-23 14:57:23 -04:00
Julia Hansbrough
5752312bbb Merge pull request #2776 from aboudreault/embargo-restrict-additions 
Extended Embargo feature to support site access restriction and ip network
 2014-05-21 15:24:07 -04:00
David Baumgold
6e0e13003f Merge pull request #3744 from lduarte1991/lduarte-harvardx 
Reconnecting Token Generator for Annotation Tool [Fix]
 2014-05-20 15:34:34 -04:00
Alan Boudreault
877ec3f963 some minor improvements to embargo 2014-05-20 10:03:06 -04:00
Alan Boudreault
db161543d8 Modified EMBARGO_SITE to SITE_EMBARGOED, improved logs 2014-05-19 15:53:45 -04:00
Alan Boudreault
ba6e61b907 Extended Embargo feature to support site access restriction and ip network 2014-05-19 15:12:02 -04:00
Sarina Canelake
5fd2eef58d Add Croatian language 2014-05-19 08:13:18 -04:00
lduarte1991
0c1b045f3c Using Edx version of tinymce 2014-05-16 14:02:25 -04:00
lduarte1991
e911d57911 Revert "Revert pull request #3466" 
This reverts commit 59e3cae4c9.
 2014-05-15 15:23:28 -04:00
David Baumgold
59e3cae4c9 Revert pull request #3466 2014-05-14 13:55:26 -04:00
Brian Wilson
d6a74a644d Merge branch 'master' into release 
Conflicts:
	cms/static/js/views/modals/edit_xblock.js
 2014-05-13 11:10:48 -04:00
Sarina Canelake
a5381db070 Only show banner on legacy dash for edx.org 
LMS-1296
 2014-05-12 12:42:19 -04:00
Sarina Canelake
ced09a6b04 Switch default instructor dashboard to new dash 
LMS-1296
 2014-05-12 10:18:27 -04:00
David Baumgold
c0a5171c75 Merge pull request #3466 from lduarte1991/lduarte-harvardx 
Reconnecting Token Generator for Annotation Tool
 2014-05-09 16:14:42 -04:00
Ned Batchelder
4d4390c0c9 IGNORABLE_404_ENDS is wrong and unused 
This setting is only used if SEND_BROKEN_LINK_EMAILS is true, which it
is not, and it is deprecated, and this value for it is wrong, since it
is used as an iterable.
 2014-05-06 18:02:53 -04:00
Ned Batchelder
db8c4de202 Remove press-page machinery and assets 2014-05-06 13:29:17 -04:00
Renzo Lucioni
bfee237a0d Add ability to deactivate GA snippet 2014-05-05 17:31:07 -04:00
Adam
5cef9f7a37 Merge pull request #3202 from edx/talbs/lms-dashboard-trackstatus 
LMS: Show Enrollment Type on Dashboard
 2014-05-05 13:19:49 -04:00
Waqas
a07da78a0f Add the "VERIFIED_CERTIFICATES" toggle on dashboard 2014-05-05 20:10:26 +05:00
Sarina Canelake
8f0173dc10 Add new languages 2014-05-05 09:13:51 -04:00
Gabe Mulley
36269bd5a8 Integrate event-tracking in to the LMS 
Support incremental conversion of events from the old API to the new, in order to ensure the new system is working, enrollment events have been modified to make use of the new API.
 2014-05-01 14:04:35 -04:00
Adam Palay
8ad4cdb366 factor out google analytics ids (LMS-2555) 2014-04-28 16:47:17 -04:00
Sarina Canelake
3422fcfe21 Update how translations are pulled 2014-04-27 17:40:18 -04:00
Sarina Canelake
cb5904050a Correct native spelling of Armenian language 2014-04-27 11:06:49 -04:00
David Baumgold
5edae3edb0 Merge pull request #2780 from FiloSottile/progress_success_button 
Show a success button at the top of the Progress page
 2014-04-25 16:56:58 -04:00
lduarte1991
5ae1ca9685 Reconnecting Token Generator for Annotation Tool 2014-04-24 16:14:05 -04:00
Adam
1934586afa Merge pull request #3422 from edx/usman/lms2554-tinymce-js 
Fixed path of tinymce.js.
 2014-04-22 12:31:17 -04:00
Usman Khalid
543306b29f Fixed path of tinymce.js. 
LMS-2554
 2014-04-22 20:41:02 +05:00
Sarina Canelake
f4332bb413 Add new languages from Transifex 2014-04-22 09:48:28 -04:00
Dave St.Germain
660244201f Refactored course_nav middleware to isolate the django-wiki hack, 
remove unnecessary code, and clarify what it's doing.
 2014-04-08 15:24:48 -04:00
Sarina Canelake
d7f499f276 Don't pull unreviewed languages from Transifex 2014-04-07 13:19:25 -04:00
Filippo Valsorda
1ce7a24572 Make the SHOW_PROGRESS_SUCCESS_BUTTON feature more flexible 
The button text default is now in the template and i18n-able, a
PROGRESS_SUCCESS_BUTTON_TEXT_OVERRIDE option is offered in settings.
The button url now uses string formatting.
 2014-04-05 18:16:28 +02:00
Filippo Valsorda
da5ab6d222 Add SHOW_PROGRESS_SUCCESS_BUTTON feature 
Show a button at the top of lms/templates/courseware/progress.html if the
lowest nonzero grade cutoff has been reached. Introduce two settings:
PROGRESS_SUCCESS_BUTTON_URL is the href of that button (the course id is
appended); PROGRESS_SUCCESS_BUTTON_TEXT is the text, defaults to
"Download your certificate"
 2014-04-05 18:13:00 +02:00
chrisndodge
c407e89889 Merge pull request #2781 from edx/cdodge/password-history-enforcements 
Add some optional policies around password resets, such as password reus...
 2014-04-04 16:14:43 -04:00
Nimisha Asthagiri
f44a1b6c1c Tiny MCE version 4.0.20 
Changed tiny-MCE to not load CSS files dynamically.
Added CSS files for tiny-MCE in env files.
Moved TinyMCE files to directory structure required by Jake command.
Changed clients of "tinymce.min.js" to use "tinymce.full.min.js" instead.
Updated CHANGELOG to indicate tinymce version 4.0.20.
Renamed tinymce.css.
Directions for creating tinymce.full.min.js and commenting of edX changes.
Updated comments related to disabling dynamic JS and CSS file loading in tinymce.
Allow TinyMCE to handle CSS within the iframe.
 2014-04-02 11:12:26 -04:00
David Baumgold
c388b408e1 Merge pull request #3054 from louyihua/fix-chinese-language-name 
Fix the chinese name of chinese language in common.py
 2014-03-31 13:52:26 -04:00
Sarina Canelake
36185936dd Merge pull request #3130 from edx/sarina/033114-language-update 
Update translations (autogenerated message)
 2014-03-31 13:43:24 -04:00