Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
10,228 Commits 1 Branch 0 Tags
4e3e2ec707ff409ec8a2fb4a332cfc19a744a28e
Commit Graph

10228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vik Paruchuri
64b117a7c2 changed metric names, added into render page 2012-10-23 18:14:16 -04:00
Carlos Andrés Rocha
76ffbfc4a1 Increase the limit of files that can be uploaded by a student 2012-10-23 17:26:00 -04:00
David Ormsbee
4db444d5fd Merge pull request #956 from MITx/feature/rocha/user-admin-commands 
Add some extra console commands for handling user permissions
 2012-10-23 14:24:01 -07:00
Carlos Andrés Rocha
3e2cf18772 Add some extra console commands for handling user permissions 2012-10-23 16:11:07 -04:00
Louis Sobel
b1cfee4592 Add support for subtitle download link 
Add a download link to the video player. The link is defined
in the content xml using the following structure:

<video youtube="youtubestring">
    <track kind="subtitle" src="subtitle_link" />
</video>
 2012-10-23 14:50:17 -04:00
Calen Pennington
dab77e7d79 Switch to using staff group names that are only specified by org/course, rather than the full course_id 2012-10-23 13:40:50 -04:00
Calen Pennington
cac8e3453c Remove more remnants of askbot 2012-10-23 13:40:50 -04:00
Calen Pennington
0f043f35d7 Remove unused github_sync app 2012-10-23 13:40:49 -04:00
Calen Pennington
4122d8da62 Fix path to ui icon 2012-10-23 13:40:49 -04:00
Calen Pennington
ef1ba6d9f7 Remove leftover merge garbage 2012-10-23 13:40:34 -04:00
Calen Pennington
b52ed48221 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/xmodule/js/src/html/display.coffee
	lms/envs/common.py
 2012-10-23 13:38:11 -04:00
Victor Shnayder
be947770c0 Merge pull request #917 from MITx/victor/make-problemset-sequential 
Make problemset render as a sequential, not a vertical.
 2012-10-23 10:30:52 -07:00
Vik Paruchuri
51f3b7195e roll back changes to common 2012-10-23 13:20:37 -04:00
Calen Pennington
6083ba1dc3 Merge pull request #945 from MITx/feature/cas/tom/section-details 
Feature/cas/tom/section details
 2012-10-23 10:20:08 -07:00
Calen Pennington
2cd17eae6d Merge pull request #947 from MITx/bug/cas/tom/new-user-save 
changed save button to add user
 2012-10-23 10:18:37 -07:00
Vik Paruchuri
d76241e6ae prefix metrics with lms, use tags for enrollment 2012-10-23 10:56:00 -04:00
Calen Pennington
c1cebe0dc9 Merge pull request #949 from MITx/fix/cdodge/trim-section-name-edits 
trim section name strings to remove whitespace
 2012-10-23 06:27:51 -07:00
Vik Paruchuri
e02d8403e7 updated requirements 2012-10-23 09:25:08 -04:00
Vik Paruchuri
3ba45fec73 added instrumentation, including user logins,registrations,enrollment,correct answers 2012-10-22 20:01:39 -04:00
Vik Paruchuri
f296815d51 added instrumentation to count: user logins, registrations, correct answers, wrong answers, enrollment 2012-10-22 19:50:34 -04:00
Tom Giannattasio
1d40fa3360 tweaked styles for section naming 2012-10-22 16:43:45 -04:00
Tom Giannattasio
f84b603133 wrapped up section date setting; need help with already published sections 2012-10-22 16:43:44 -04:00
Tom Giannattasio
e3457fa230 started styling section date pickers 2012-10-22 16:43:44 -04:00
Chris Dodge
90a55714c2 trim section name strings to remove whitespace 2012-10-22 16:35:22 -04:00
Calen Pennington
b005587951 Merge pull request #948 from MITx/fix/cdodge/import-improvements 
have import be a bit more flexible in terms of the packaging of the cont...
 2012-10-22 13:30:46 -07:00
Tom Giannattasio
df0ca3c445 changed save button to add user 2012-10-22 16:09:13 -04:00
Chris Dodge
1530341d55 have import be a bit more flexible in terms of the packaging of the content. Allow for tar.gz names to be different from the course name. Also don't assume that the unpacking of the zip will yield a single top level root folder. 2012-10-22 16:01:57 -04:00
Calen Pennington
442516120c Merge pull request #936 from MITx/feature/cas/tomg/saving-conventions 
new saving conventions
 2012-10-22 12:58:05 -07:00
Tom Giannattasio
fb2925a28b changed nameString variable 2012-10-22 15:55:04 -04:00
Tom Giannattasio
a8aa8770bf add background to policy item being added 2012-10-22 15:55:04 -04:00
Tom Giannattasio
2541502669 added prompt on policy delete 2012-10-22 15:55:04 -04:00
Tom Giannattasio
6d595b96fb tweaked saving mechanisms on subsection page 2012-10-22 15:55:04 -04:00
Tom Giannattasio
33e6c583bf removed toast on save component 2012-10-22 15:55:04 -04:00
Tom Giannattasio
33df317d1b added spinner to unit input name 2012-10-22 15:55:04 -04:00
Tom Giannattasio
f6d046dd04 added autosaving to field inputs on unit and subsection pages 2012-10-22 15:55:04 -04:00
Tom Giannattasio
3a612a4da6 fixed reordering of subsection and units; they now save on update without error 2012-10-22 15:55:04 -04:00
Tom Giannattasio
00f3db370d whitespace trim 2012-10-22 15:55:04 -04:00
Tom Giannattasio
7655a5adfc added toast subsection save feedback 2012-10-22 15:55:04 -04:00
Tom Giannattasio
54937e4622 added delayed save after modifying display name on unit page 2012-10-22 15:55:04 -04:00
Tom Giannattasio
c34d42d8ce properties changed to settings 2012-10-22 15:55:03 -04:00
Victor Shnayder
f50519ae48 Merge pull request #906 from MITx/victor/test-speedup 
Victor/test speedup
 2012-10-22 10:45:23 -07:00
chrisndodge
35d50976de Merge pull request #946 from MITx/bug/cas/tom/password-tab-index 
fixed tabindex
 2012-10-22 10:43:53 -07:00
Tom Giannattasio
78a1743f9c fixed tabindex 2012-10-22 13:38:15 -04:00
David Ormsbee
9a4e21c010 Merge pull request #943 from MITx/feature/rocha/dashboard-software-licenses 
Add fix for users with multiple licenses
 2012-10-22 07:29:24 -07:00
Carlos Andrés Rocha
3784c3ce18 Add fix for users with multiple licenses 2012-10-22 10:27:17 -04:00
bridger
853051bcc0 Merge pull request #941 from MITx/feature/rocha/dashboard-software-licenses 
Use test database in licenses test instead of 6.002x
 2012-10-19 15:42:00 -07:00
Carlos Andrés Rocha
f890c1dccb Use test database in licenses test instead of 6.002x 2012-10-19 17:55:55 -04:00
chrisndodge
87acaab6b5 Merge pull request #940 from MITx/fix/cdodge/pre-push-tweeks 
remove cut/paste error which results in a server error.  is not defined ...
 2012-10-18 18:58:35 -07:00
Chris Dodge
424875848e remove cut/paste error which results in a server error. is not defined when there are no assets. Also fix up base.js to only register one set of handlers for file section which gets rid of the multiple file selection dialogs from appearing 2012-10-18 21:57:06 -04:00
chrisndodge
218cfe2833 Merge pull request #939 from MITx/fix/cdodge/pre-push-tweeks 
catch when users empty out a section name. don't allow them to do that.
 2012-10-18 18:30:05 -07:00