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

699 Commits

Author SHA1 Message Date
Don Mitchell
8d070e6422 Rewrite course url matcher to not be greedy 
LMS-11181
 2014-08-18 16:18:22 -04:00
Sarina Canelake
6dd9d9ec3f Merge pull request #4586 from jazkarta/edx-jsme-1.0 
Release edx-jsme 1.0
 2014-08-14 10:02:55 -04:00
Sarina Canelake
c285bda69f Merge pull request #4625 from fmyzjs/ipv6 
Support ipv6 in geoinfo and Embargo
 2014-08-14 09:26:57 -04:00
Jason Zhu
13846e074d Support ipv6 in geoinfo and Embargo 2014-08-14 16:13:35 +08:00
lduarte1991
8cfdb8f14c Annotation Tools: Adding comments and adding CSS groups 2014-08-13 21:35:37 -04:00
Renzo Lucioni
2ad9557403 Factor out Optimizely project ID 2014-08-12 14:20:30 -04:00
cahrens
ee836d4c40 Merge branch 'release' from 2014-08-12 release. 2014-08-12 13:51:58 -04:00
Chris Rossi
88af00904f Release edx-jsme 1.0 2014-08-11 09:04:27 -04:00
Renzo Lucioni
2380235fd7 Add Optimizely widget 2014-08-08 14:58:18 -04:00
Nimisha Asthagiri
abbfa95e4c LMS-11168 Support for removing versions and branch in Split, Mixed, and SQL. 
Make default_store thread-safe.
 2014-08-07 18:07:41 -04:00
Nimisha Asthagiri
a55b406c53 LMS-11177 Add Split to configuration settings. 2014-08-07 17:59:37 -04:00
Clinton Blackburn
1a4e067712 Added link from instructor dashboard to analytics dashboard 2014-08-07 12:13:34 -04:00
lduarte1991
0ca9bfa7e4 Annotation Tools: Added Grouping Plug-In 
- adding comments

 - spacing issues and indentation
 2014-08-06 14:49:40 -04:00
Sarina Canelake
ecba41e865 Add Eng (GB) and Albanian lang codes 2014-08-04 11:13:06 -04:00
Nimisha Asthagiri
538bec92a7 LMS-11137 Course Action State Django models. 2014-07-29 15:03:36 -04:00
Usman Khalid
b594bd480a Merge pull request #4427 from edx/usman/lms6507-mako-dir 
Use /tmp/mako_lms and /tmp/mako_cms for compiled mako templates.
 2014-07-28 21:52:20 +05:00
Calen Pennington
48645020d1 Merge pull request #4392 from louyihua/lms-window-origin 
Add defininition of window.location.origin in both studio and LMS
 2014-07-25 14:27:27 -04:00
zubair-arbi
cfa873cc1d ignore MAC meta files on import and also remove any such files from the course 
STUD-1725
 2014-07-21 13:16:00 +05:00
Jason Bau
aac0fac3d2 Default ENABLE_ANALYTICS_ACTIVE_COUNT to False for dev envs 2014-07-17 15:04:22 -04:00
Jason Bau
e1fcac93c5 fix shib reg from course about page 2014-07-17 10:51:32 -04:00
Usman Khalid
682e3108a8 Use /tmp/mako_lms and /tmp/mako_cms for compiled mako templates. 
Currently a new temp directory is created for every process via
mkdtemp_clean() which cleans it on process exit.

However, this is not compatible with using --preload option of
gunicorn. With this option the tmp directory is created on gunicorn
start and is shared by all the workers. But when a worker exits it
deletes the directory. And so on the next requent the tmp directory
needs to be recreated and the templates need to be recompiled.

LMS-6507
 2014-07-15 17:37:23 +05:00
louyihua
7f1c784629 Add defininition of window.location.origin in both CMS/LMS 
The same bug in studio was fixed in #3893, and as TinyMCE is also used in LMS, it should be also fixed in LMS.
Here a common javascript file called 'ie_shim.js' is added, so that in the future it can be used for other IE compatibility purposes too.
 2014-07-15 11:34:52 +08:00
Nimisha Asthagiri
4859eee23b Move modulestore django settings migration code down into the modulestore layer so it works for all django-based callers. 2014-07-14 11:59:40 -04:00
Stephen Sanchez
0a73d403d7 Merge pull request #4238 from edx/sanchez/TIM-645-File-Upload-Service 
Updating settings and requirements for platform to support file upload
 2014-07-14 09:22:40 -04:00
Sarina Canelake
5edcd969c8 Add new Transifex languages 
Filipino, Marathi, Serbian, Telugu, Uzbek
 2014-07-14 09:19:24 -04:00
Sarina Canelake
cfb7f99c8e Add filter to ignore deprecation warnings by default 
Add filter to only show first occurance of DepWarning
 2014-07-11 15:40:09 -04:00
Julia Hansbrough
d9dd45662e Enables LMS to handle deprecated URLs 
LMS-2651
 2014-07-09 21:51:37 +00:00
Stephen Sanchez
f23492e14e Updating AWS settings 2014-07-08 16:38:12 -04:00
Stephen Sanchez
573d3c89fc Updating settings and requirements for lms and cms to support file upload 2014-07-08 13:15:37 -04:00
Anton Stupak
8201c9906a Merge pull request #4038 from edx/anton/redirect-on-error 
Add 401 error handler.
 2014-07-01 17:03:09 +03:00
Nimisha Asthagiri
8dca8053f6 Fix branch settings. 2014-06-27 21:47:53 -04:00
Nimisha Asthagiri
a9213509c3 Enable Mixed Modulestore STUD-1540 
Refactor get_parent_locations STUD-1663
 2014-06-26 18:00:11 -04:00
Oleg Marshev
715fde27c4 Redirect Chinese students to a Chinese CDN for video. 2014-06-24 18:39:52 +03:00
polesye
2d8e1226c8 Move js import into courseware js group. 2014-06-23 17:56:28 +03:00
Will Daly
c16bdf332b ORA2 release-2014-06-23T13.19 2014-06-23 09:23:33 -04:00
Sarina Canelake
9fb2731a57 Add Amharic language 2014-06-23 07:42:39 -04:00
Sarina Canelake
54cf1adb86 Add Tamil language 2014-06-23 07:42:39 -04:00
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