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

23143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Usman Khalid
e117957e2a Fixed module urls creation in legacy instructor dashboard. 
LMS-2327
 2014-03-11 13:40:00 -04:00
frances botsford
28382316aa Merge pull request #2867 from edx/frances/feature/lms-inst-dash-cleanup 
cleanup of instructor dash membership
 2014-03-11 13:38:36 -04:00
Greg Price
654239dc2c Merge pull request #2890 from edx/gprice/user-api-with-prefs 
Augment user API to allow easier access to user preferences
 2014-03-11 13:37:50 -04:00
Andy Armstrong
750640b6f0 Merge pull request #2902 from edx/usman/lms2136-wiki-slug-renamespacing-fix 
Do not remap the wiki_slug if reimporting into the same course.
 2014-03-11 13:08:03 -04:00
Frances Botsford
fd1014457d cleanup of instructor dash membership 2014-03-11 13:05:30 -04:00
polesye
2dad79db11 Upload files explicitly in tests. 2014-03-11 18:41:24 +02:00
Greg Price
bbd6f788ad Add endpoint to get user list for a preference 
The endpoint includes the key of the desired preference in the URL and
returns the list of users for whom the preference is set (regardless of
the value).
 2014-03-11 12:03:33 -04:00
marco
2f2ce555c1 adjusted visual styling for editing state of xblocks, html, and video components which had extra padding applied to it from the container page xblock styling 
STUD-1410
 2014-03-11 12:00:17 -04:00
Sarina Canelake
e6c9a6c9d9 Merge pull request #2889 from edx/sarina/fix-abtest-for-sequentials 
Bugfix for split test on sequential save
 2014-03-11 11:59:17 -04:00
Usman Khalid
cb2243a495 Do not remap the wiki_slug if reimporting into the same course. 
LMS-2136
 2014-03-11 20:47:21 +05:00
polesye
43c16bd093 BLD-915: Fix issues with different videoIDs. 2014-03-11 17:38:29 +02:00
Gabe Mulley
779d0aab7f Merge pull request #2827 from mulby/gabe/report-downloads 
Generalize grade report to allow display of any report
 2014-03-11 11:23:58 -04:00
Greg Price
8f01756c6c Include preferences in users returned by user API 2014-03-11 11:17:13 -04:00
Valera Rozuvan
481253d6ec Merge pull request #2893 from edx/valera/add_missing_comment 
Add a missing comment documenting the changes done in PR 2841.
 2014-03-11 17:11:53 +02:00
Mark Hoeber
1670078c29 Merge pull request #2862 from edx/markhoeber/documentation/stud-1272 
Course Image and Dates documentation changes
 2014-03-11 10:52:22 -04:00
Mark Hoeber
599183f8c6 Course Image and Dates documentation changes 
stud-1272
 2014-03-11 10:51:44 -04:00
Sarina Canelake
119ffd4677 Bugfix for split test on sequential save 
Bug would occur when comparing Groups or UserPartitions - because these types
lacked comparator methods, different objects would come up as different when
their values were equal.
 2014-03-11 10:51:39 -04:00
Sarina Canelake
1ece8f78af Merge pull request #2896 from edx/sarina/LMS-2302 
Put language modal in alphabetical order LMS-2302
 2014-03-11 10:33:32 -04:00
Don Mitchell
adb7fbcb4b Merge pull request #2849 from edx/dhm/split_course_id 
Make course_id a required arg to split.create_course
 2014-03-11 10:22:46 -04:00
Sarina Canelake
5c1c96923a Put language modal in alphabetical order LMS-2302 2014-03-11 10:20:21 -04:00
Gabe Mulley
d0b12ee3be Generalize grade report to allow display of any report 
We would like to be able to generate arbitrary reports and expose them to the instructor by simply uploading them to S3.  The existing grade download infrastructure pretty much supported that already, however, all of the internal and external structures were referring to the reports as exclusively grading related.

Fixes: AN-590
 2014-03-11 10:14:37 -04:00
Sarina Canelake
e3a70ce6df Fix for CourseFactory bug - course object not saved after setattr called 2014-03-11 10:00:42 -04:00
Waheed Ahmed
50b82a0b29 Merge pull request #2859 from edx/waheed/stud1404-accidental-click-can-lose-work-on-adding-new-update 
Don't close modal on click outside new course update modal.
 2014-03-11 18:39:28 +05:00
Dave St.Germain
be239bdbca remove old version of codemirror, to prevent confusion 2014-03-11 09:31:29 -04:00
Dave St.Germain
26b49c8b87 Merge pull request #2884 from edx/dcs/fix-update-css 
Fixed course update css to match changed tags
 2014-03-11 09:26:15 -04:00
Dave St.Germain
a6977baed0 Fixed course update css to match changed tags 2014-03-11 09:25:54 -04:00
Valera Rozuvan
fc4686b8e2 Add a missing comment documenting the changes done in PR 2841. 2014-03-11 15:20:59 +02:00
Waheed Ahmed
f16efbb285 Don't close modal on click outside new course update modal. 
STUD-1404
 2014-03-11 17:53:27 +05:00
Valera Rozuvan
2a149a8b89 Merge pull request #2841 from edx/valera/fix_firefox_youtube_default_flash_mode 
Fix Firefox YouTube default Flash mode
 2014-03-11 13:35:55 +02:00
Valera Rozuvan
1136336fc4 Converting collapsible module to JavaScript. 2014-03-11 11:28:46 +00:00
Valera Rozuvan
cf47f522c0 Fix Firefox YouTube default Flash mode 
BLD-895
 2014-03-11 10:47:47 +00:00
Usman Khalid
c85905d648 Merge pull request #2877 from edx/usman/lms2327-instructor-dashboard-problem-urls 
Fixed module urls creation in legacy instructor dashboard.
 2014-03-11 15:24:59 +05:00
Will Daly
12d32489fe Enable advanced components by default in devstack 2014-03-10 18:52:03 -04:00
Dave St.Germain
cc76690db7 Merge pull request #2874 from edx/dcs/remove-old-codemirror 
remove old version of codemirror css, to prevent confusion
 2014-03-10 17:13:16 -04:00
marcotuts
06cc9e9598 Merge pull request #2886 from edx/marco/studio-editing-styles 
adjusted visual styling for editing state of xblocks, html, and video co...
 2014-03-10 16:42:53 -04:00
marco
f50e58ad7f adjusted visual styling for editing state of xblocks, html, and video components which had extra padding applied to it from the container page xblock styling 
STUD-1410
 2014-03-10 16:39:46 -04:00
Calen Pennington
d21e68301e Merge pull request #2885 from cpennington/merge-release-2014-03-10 
Merge release from 2014-03-10
 2014-03-10 16:22:21 -04:00
Calen Pennington
31a070d480 Merge remote-tracking branch 'edx/release' into merge-release-2014-03-10 
Conflicts:
	cms/envs/common.py
	lms/envs/common.py
 2014-03-10 16:21:08 -04:00
David Baumgold
2f3d2ecac0 Fix undefined references to pytz 2014-03-10 16:19:10 -04:00
Han Su Kim
603a97fa79 Merge pull request #2880 from edx/cale/fix-crazy-items-error 
Cale/fix crazy items error
 2014-03-10 15:34:52 -04:00
Greg Price
08ed1c5439 Merge pull request #2832 from edx/gprice/create-account-lang-pref 
Save language preference on account creation
 2014-03-10 15:13:15 -04:00
Greg Price
fa29a35ab8 Save language preference on account creation 
This is necessary to allow non-browser-based services (e.g. notifier)
to know a user's preferred language even if the user has not explicitly
selected one.
 2014-03-10 13:28:12 -04:00
Sarina Canelake
a10d8d41d2 Merge pull request #2878 from edx/sarina/LMS-2302 
Put language modal in alphabetical order LMS-2302
 2014-03-10 12:51:17 -04:00
Calen Pennington
0a79b30ec4 Delay import of xmodule packages until after sys.path fixup 2014-03-10 12:04:00 -04:00
Calen Pennington
760027bd2a Normalize the representation of Scope.content data in MongoModulestore FieldData 
Without this, the new 'items' field in the course_info xmodule caused
bizarre behavior. If you added the text 'items' to a course_info
section, then the LMS would throw a 500, because the field name isn't
'data', but the stored data is a string, leading to the check of
`key.field_name in self._data`, where key.field_name is the string 'items',
and self._data is the content string.
 2014-03-10 12:01:57 -04:00
Xavier Antoviaque
73f75f23bb Update import location of prefer_xmodules 2014-03-10 12:01:56 -04:00
Xavier Antoviaque
c3ae0306f1 Only add mentoring application to INSTALLED_APPS when in virtualenv 2014-03-10 12:01:56 -04:00
Sarina Canelake
cdfb5c0c07 Put language modal in alphabetical order LMS-2302 2014-03-10 11:07:13 -04:00
ichuang
171650d253 Merge pull request #2870 from edx/bugfix/ichuang/capa-display-status 
fix capa textline display to leave "inline" alone upon status change
 2014-03-10 10:47:47 -04:00
ichuang
c543dbb695 Merge pull request #2869 from edx/bugfix/ichuang/textline-inline-for-jspre 
fix capa textline to properly use inline if specified when using math preprocessor
 2014-03-10 10:47:01 -04:00