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

14265 Commits

Author SHA1 Message Date
Han Su Kim
bdfd81d2f3 Merge remote-tracking branch 'origin/master' into release, conflicts resolved 
Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt
 2014-03-06 16:56:16 -05:00
Carson Gee
9d55c88c76 Add option for importing a course from a named branch of a git repo 2014-03-06 16:26:25 -05:00
Bertrand Marron
01c5cd5dc4 Fix unicode issue in shopping cart 
Fails when course name contains non-ascii characters.
 2014-03-06 11:46:53 +01:00
Don Mitchell
b44780812c Merge pull request #2738 from edx/dbarch/mixed_ms_router 
Dbarch/mixed ms router
 2014-03-05 17:17:07 -05:00
Don Mitchell
432249e9cf making mixed ms capable of front ending all modulestores for most operations including CRUD 
STUD-600
 2014-03-05 14:32:56 -05:00
Diana Huang
bce7d9e43d Add tests and clean up A/B testing 
Also fixes STUD-1351
 2014-03-05 13:46:03 -05:00
Dave St.Germain
72e876fe40 Prevent reflected XSS in instructor dashboard. 2014-03-05 11:45:45 -05:00
Alexander Kryklia
6772faa0a5 Merge pull request #2796 from edx/alex/no_default_subs_en 
Catch exception if for en no default subs is uploaded.
 2014-03-05 16:49:54 +02:00
Alexander Kryklia
ccb776e928 Catch exception if for en no default subs is uploaded. 2014-03-04 15:41:46 +02:00
Jason Bau
35a3ebd92f Merge pull request #2761 from edx/jbau/add-userid-to-FieldDataCache 
Move FieldDataCache assert to check both get and get_or_create
 2014-03-03 12:08:09 -08:00
chrisndodge
c4401fdc7f Merge pull request #2553 from edx/cdodge/microsite-cleanup 
Address Microsite PR feedback - separate out middleware from microsite logic, shor...
 2014-02-28 17:38:19 -05:00
Kristin Stephens
3881ffdc0d New tab (Metrics) in instructor dashboard 
Metrics tab shows student data:
  -Count of students opened a subsection
  -Grade distribution per problem

for each section/subsection of the course.

Implemented for both the old and beta dashboard
Controlled by a feature flag 'CLASS_DASHBOARD'
Data is aggregated across all students
Aggregate data computed from courseware_studentmodule
 2014-02-28 14:01:44 -08:00
Chris Dodge
aa43689a93 This PR addresses the open feedback on the Microsites feature 2014-02-28 16:27:12 -05:00
Chris Dodge
fce30825df allow the prevention of the LMS/CMS from being renderable in an iframe 2014-02-28 14:21:07 -05:00
Chris Dodge
10465e3eb0 add some authorization checks to the Wiki 2014-02-28 13:36:18 -05:00
Jason Bau
a160428b9b Move FieldDataCache assert to check both get and get_or_create 2014-02-27 20:06:16 -08:00
Adam Palay
89795191cb Merge remote-tracking branch 'origin/release' 
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
 2014-02-27 17:33:40 -05:00
Calen Pennington
9d850eec2d Fix case where both old and new transcripts are uploaded, but transcript language isn't one of the new transcripts. 2014-02-27 15:42:19 -05:00
Waheed Ahmed
cb4d3dd327 Merge pull request #2671 from edx/waheed/lms1479-front-end-validation-for-username-email 
Added validation for username and email max length.
 2014-02-26 19:42:04 +05:00
Waheed Ahmed
874d7360c1 Added validation for username and email max length. 
LMS-1479
 2014-02-26 16:25:37 +05:00
zubiar-arbi
cf47b6b670 assign default forum role 'Student' to user on course recreate with same name STUD-1140 
STUD-1140
 2014-02-26 15:40:44 +05:00
chrisndodge
663671ec4c Merge pull request #2534 from edx/jbau/fix-non-microsite-subdomain-branding-default 
fix non-microsite SUBDOMAIN_BRANDING defaults
 2014-02-25 19:30:45 -05:00
Calen Pennington
a2137cec35 Merge pull request #2603 from cpennington/xblock-acid-resources-test 
Add tests of local_resource_url
 2014-02-25 16:46:10 -05:00
Calen Pennington
9126777ed7 Add test of local_resource_url in AcidBlock 2014-02-25 14:01:37 -05:00
Gabe Mulley
fe21f47573 Add module display name to module related server events 
This information will likely be used frequently for analytics purposes, so we would like to denormalize here to avoid having to join with the modulestore later.

Fixes: AN-594
 2014-02-25 11:53:36 -05:00
Adam Palay
8d2db05635 add i18n scraping to tabs.py (LMS-2166) 
add dummy strings
 2014-02-24 15:46:03 -05:00
Alexander Kryklia
25407ef3e7 BLD-642: Allow multiple transcripts with video. 2014-02-24 21:57:08 +02:00
Don Mitchell
0b262e7cea Merge pull request #2660 from edx/dbarch/parse_course_id 
Dbarch/parse course
 2014-02-24 13:24:00 -05:00
Don Mitchell
81a92e4bfc Consolidate course_id triple parsing 2014-02-24 11:45:59 -05:00
Ned Batchelder
28e9ae0412 Tests of the localized start dates 2014-02-24 10:06:13 -05:00
Ned Batchelder
6bb0eee3c6 Make the i18n service available everywhere. 
To get all dates localized, we need all runtimes to have the i18n
service, and since runtimes are made by the modulestores, we need to
pass it to them.

Soon (fingers crossed), modulestores won't be involved in making
runtimes, and many of these changes will go away.
 2014-02-24 10:06:13 -05:00
Jay Zoldak
a620cc0004 Merge branch 'release' 
Conflicts:
	lms/templates/courseware/accordion.html
 2014-02-21 16:17:02 -05:00
Calen Pennington
dbc99ef8ad Implement children for pure XBlocks in edx-platform 
This requires fixing the javascript api implementation, and adding
an implementation of get_block to the ModuleSystem api.

However, the implementation is incomplete, due to mismatches between
the expectations of XModule and XBlock.

Also adds tests using the Acid block to make sure that the javascript
and python apis for children are working correctly.
 2014-02-21 15:01:20 -05:00
Jason Bau
183d9bbb93 Use new setting for LMS deadline display instead TIME_ZONE 2014-02-21 10:20:06 -08:00
jsa
4c5336e809 django_comment_client: add unit test for (sub)comment deletion. 
JIRA: FOR-470
 2014-02-20 13:35:26 -05:00
Greg Price
e2d168d2fe Merge pull request #2624 from edx/gprice/test-edit-forum-comment 
Add unit test for updating forum comment
 2014-02-19 11:09:38 -05:00
Greg Price
c321ce50f6 Add unit test for updating forum comment 2014-02-18 17:37:03 -05:00
Ned Batchelder
3aff96c2e4 Add strftime to the i18n runtime service. 2014-02-18 17:35:56 -05:00
Adam
7b3376f944 Merge pull request #2575 from edx/adam/i18n-self-assessment-2 
Adam/i18n self assessment 2
 2014-02-18 09:07:24 -05:00
Alexander Kryklia
23a2177da3 Enable download_track for existing courses if self.track. 2014-02-18 12:31:06 +02:00
Adam Palay
97f5b25e2c i18n for self-assessment (ORA-314) 
make openendedchild and open_ended_module_v1 act enough like xblocks to get xblock 18n
 2014-02-14 17:27:32 -05:00
Julia Hansbrough
7d81a510bc Moved UserPreferences to common 2014-02-14 10:32:11 -05:00
polesye
faab4caeef BLD-837: Fix download transcript behavior. 2014-02-14 11:51:51 +02:00
Christina Roberts
0c74d6ac54 Merge pull request #2562 from edx/christina/lms-mixed 
Clean up of modulestore references (primarily LMS).
 2014-02-13 20:05:31 -05:00
Greg Price
9ae6bb0b73 Check for forum data errors in LMS 
Some messages generated by the comments service are not readily
translated because they come from third-party libraries. Thus, we plan
to try to avoid showing any comments service generated message to the
user. This check preempts the only end-user-visible CS-generated error
message that we are presently aware of.
 2014-02-13 15:44:57 -05:00
Julia Hansbrough
5131818153 Merge pull request #2597 from edx/release 
Release
 2014-02-13 15:17:38 -05:00
Calen Pennington
3a7b265c8a Add trailing commas to multiline lists, to prevent string concatenation bugs 2014-02-13 13:12:42 -05:00
Usman Khalid
21d8b40576 Added feature setting 'DISPLAY_HISTOGRAMS_TO_STAFF' to configure display of histograms in Staff Debug Info panel. 
Generating histograms requires scanning the courseware_studentmodule table on
each view. This can make staff access to courseware very slow on large courses.

Default is False.

LMS-1199
 2014-02-13 17:15:20 +05:00
Usman Khalid
f6d7cb5065 Renamed feature setting 'DISPLAY_HISTOGRAMS_TO_STAFF' to 'DISPLAY_DEBUG_INFO_TO_STAFF' to better communicate its purpose. 
Default is True.

LMS-1199
 2014-02-13 17:15:19 +05:00
Julia Hansbrough
d6c0ce161e Merge branch 'release' 2014-02-12 21:24:19 +00:00