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

1025 Commits

Author SHA1 Message Date
kimth
fdecaef7ef Fix datetime name conflict 2012-08-24 08:23:46 -04:00
kimth
95a7a5b08b Student must wait XQUEUE_WAITTIME_BETWEEN_REQUESTS between queueing submissions 2012-08-23 18:39:57 -04:00
kimth
673cc2bbb3 Keep queueuing time 2012-08-23 17:43:38 -04:00
kimth
77f928d118 Queuestate records both secret key and time of queue request 2012-08-23 17:24:59 -04:00
David Ormsbee
f9616c6ed3 Merge pull request #544 from MITx/feature/arjun/fix_password_reset_domain 
making password reset email link have the current site's domain rather than edx.org hardcoded.
 2012-08-23 11:58:09 -07:00
Arjun Singh
202edb0ecb making password reset email link have the current site's domain rather than edx.org hardcoded. 2012-08-23 11:47:30 -07:00
Arjun Singh
a7f1e7c147 use the request's hostname rather than settings.SITE_NAME for activation emails 2012-08-23 11:37:46 -07:00
David Ormsbee
afa67599ea Merge pull request #540 from MITx/feature/arjun/fix_discussion_syncing 
getting rid of terrible hack in favor of re enabling the dispatcher to sync w/ the comment service
 2012-08-23 10:09:02 -07:00
Arjun Singh
ed6317f37c getting rid of terrible hack in favor of re enabling the dispatcher to sync w/ the comment service 2012-08-23 10:03:36 -07:00
Arjun Singh
48e7966ef2 partial credit for an inputfield 2012-08-23 09:11:13 -07:00
Arjun Singh
7f3a4889b8 make discussions work for new users 2012-08-23 06:48:37 -07:00
Carlos Andrés Rocha
ad2fff2900 Retrieving video information from YouTube using https instead of http. 2012-08-23 09:24:51 -04:00
Arjun Singh
0757712e4b Get rid of inline flag for choicegroup, radiogroup, and checkboxgroup. This should be done via CSS. This change only affects radiogroup and checkboxgroup as far as changing the behavior goes 2012-08-22 23:11:51 -07:00
Arjun Singh
cd1bc95efe adding the ability to override the sidebar name 2012-08-22 20:40:59 -07:00
David Ormsbee
4e7ba6e651 Merge pull request #513 from MITx/feature/bridger/new_wiki 
Feature/bridger/new wiki
 2012-08-22 20:18:36 -07:00
Bridger Maxwell
82ebc14bd6 Fixed inline circuit editing to only work if 'circuit-schematic' is at the beginning of a line. 2012-08-22 21:15:52 -04:00
David Ormsbee
baa6eadfb5 Merge branch 'master' into feature/dave/forum_fixes 2012-08-22 20:30:49 -04:00
Victor Shnayder
44ee0200a5 Fix undefined variables if LMS_MIGRATION was off 2012-08-22 20:19:58 -04:00
Rocky Duan
908a5c5d59 Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-22 14:11:44 -07:00
Tom Giannattasio
c1befd5fd4 Merge branch 'master' into feature/tomg/fall-design 2012-08-22 17:06:03 -04:00
Tom Giannattasio
1a7b5b8564 fixed tutorial sequence nav bug 2012-08-22 17:05:42 -04:00
Rocky Duan
951fb06341 Merge branch 'master' of github.com:MITx/mitx into merge 
Conflicts:
	lms/envs/dev.py
 2012-08-22 14:04:34 -07:00
Calen Pennington
e206bf2ffc Merge pull request #505 from MITx/feature/tomg/fall-design 
Feature/tomg/fall design
 2012-08-22 13:34:39 -07:00
David Ormsbee
3b24ae1068 Merge pull request #501 from MITx/kimth/autodisable-syllabus 
Dynamically disable syllabus per-course
 2012-08-22 13:15:24 -07:00
Tom Giannattasio
a05cf05462 Merge branch 'master' into feature/tomg/fall-design 2012-08-22 16:09:30 -04:00
Tom Giannattasio
2c827c46f9 fixed firefox outline bugs 2012-08-22 16:09:09 -04:00
ike
7c242939f2 fix staff debug view, and also add new source_link 2012-08-22 15:51:08 -04:00
kimth
f46607710f Merge master 2012-08-22 15:25:07 -04:00
kimth
960cf5792b Dynamically disable syllabus per-course 2012-08-22 15:12:49 -04:00
David Ormsbee
8b8ee9f434 Merge pull request #500 from MITx/feature/cale/university-branding 
Feature/cale/university branding
 2012-08-22 12:02:19 -07:00
Calen Pennington
2eb0de99eb Merge pull request #494 from MITx/feature/arjun/course_specific_css 
Feature/arjun/course specific css
 2012-08-22 11:55:20 -07:00
Calen Pennington
d735190570 Merge pull request #499 from MITx/feature/bridger/new_wiki 
Added optional <wiki> tag to course to specify an alternative wiki page.
 2012-08-22 11:54:39 -07:00
Arjun Singh
23e3d371ef adding more details about the state of course.css_class 2012-08-22 11:49:26 -07:00
Calen Pennington
5ca636e606 Use the university profile page for courses and index if we are in a branded subdomain. N.B. THIS DOESN'T WORK WITH MIT_SSL_AUTH 2012-08-22 14:43:49 -04:00
Bridger Maxwell
788c74e07a Added optional <wiki> tag to course to specify an alternative wiki page. 2012-08-22 14:25:05 -04:00
Calen Pennington
2eb3f37681 Merge pull request #498 from MITx/feature/victor/domain-specific-caching 
Separate caches per-domain-name
 2012-08-22 10:25:25 -07:00
Victor Shnayder
ce0bc1f782 Separate caches per-domain-name 2012-08-22 13:18:33 -04:00
Calen Pennington
f580bafdfe Merge pull request #496 from MITx/kimth/fix-choiceresponse 
Fix for 500 on showanswer for choiceresponse
 2012-08-22 10:07:42 -07:00
Calen Pennington
aa933cb38f Merge pull request #497 from MITx/feature/victor/catch-module-errors 
Catch errors in module load
 2012-08-22 10:05:08 -07:00
Victor Shnayder
365495521e Catch errors in module load 
* if error is in xmodule_constructor(), catch and return an ErrorModule
* if error is somewhere else in get_module(), return None
 2012-08-22 12:58:46 -04:00
kimth
edefa04de1 Workaround for 500 on showanswer for choiceresponse 2012-08-22 12:41:30 -04:00
Arjun Singh
9a21c5d4a8 Adding reasoning for adding a new metadata field 2012-08-22 05:00:39 -07:00
Arjun Singh
0b6bf77373 Adding a course-specific css class to body so that we can have course-targeted styles as a last resort 2012-08-22 05:00:39 -07:00
Rocky Duan
fd0eff46e7 Merge branch 'feature/rocky/discussion_api_key' into refactor 
Conflicts:
	lms/djangoapps/django_comment_client/tests.py
	lms/lib/comment_client/utils.py
	lms/templates/courseware/courseware.html
 2012-08-21 17:14:25 -07:00
Tom Giannattasio
bbc95cb589 fixed accordion nav glitch 2012-08-21 19:25:32 -04:00
Tom Giannattasio
bd536f8aec Merge branch 'master' into feature/tomg/fall-design 2012-08-21 18:13:40 -04:00
Tom Giannattasio
e762844c35 new sequence nav functionality - accommodates an infinite number of items 2012-08-21 18:12:59 -04:00
Victor Shnayder
a7a9abab44 add a course to test start dates 2012-08-21 16:21:01 -04:00
Victor Shnayder
d3f1f0f8b6 comment out debug messages 2012-08-21 16:09:48 -04:00
Victor Shnayder
1dc31ceb8b fix toylab html 2012-08-21 16:09:35 -04:00