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

5225 Commits

This Branch
This Branch
All Branches
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
David Ormsbee
65c5a21a7f Merge pull request #543 from MITx/feature/arjun/fix_activation_domain 
use the request's hostname rather than settings.SITE_NAME for activation emails
 2012-08-23 11:57:55 -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
ichuang
ef3ec494ea Merge pull request #538 from MITx/feature/arjun/fix_partial_credit 
partial credit for an inputfield

May want to couple this (in the future) with some UI feedback to indicate partial credit was awarded.
 2012-08-23 10:04:51 -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
Calen Pennington
4e3d821178 Merge pull request #537 from MITx/feature/cale/xqueue_callback_url_proto 
Pull the http or https from the forwarded proto for the xqueue callback ...
 2012-08-23 08:51:54 -07:00
Calen Pennington
f2c5a064aa Pull the http or https from the forwarded proto for the xqueue callback url 2012-08-23 11:49:23 -04:00
Calen Pennington
9a68d902aa Merge pull request #536 from MITx/feature/fix_404 
Can't return Http404, have to raise it.
 2012-08-23 08:29:17 -07:00
David Ormsbee
0b309ea40a Can't return Http404, have to raise it. 2012-08-23 11:27:54 -04:00
David Ormsbee
50f4fae955 Merge pull request #532 from MITx/feature/bridger/new_wiki 
Updated django-wiki to better handle relative wiki links.
 2012-08-23 07:39:33 -07:00
David Ormsbee
d05b3de018 Merge pull request #535 from MITx/feature/forum_unicode 
fix unicode error on forum profile view page
 2012-08-23 07:36:59 -07:00
David Ormsbee
2feda8467e fix unicode error on forum profile view page 2012-08-23 10:32:27 -04:00
Bridger Maxwell
07eead2349 Updated django-wiki to better handle relative wiki links. 2012-08-23 10:11:31 -04:00
David Ormsbee
7d7b5be95a Merge pull request #531 from MITx/feature/arjun/fix_discussion_sync 
Feature/arjun/fix discussion sync
 2012-08-23 07:04:02 -07:00
Arjun Singh
a075cc79fd remove stray import 2012-08-23 06:50:16 -07:00
Arjun Singh
7f3a4889b8 make discussions work for new users 2012-08-23 06:48:37 -07:00
David Ormsbee
0a6f5567e1 Merge pull request #530 from MITx/rocha/fix-for-https-video-player 
Retrieving video information from YouTube using https instead of http.
 2012-08-23 06:30:41 -07:00
jarv
ba3df747cc Merge pull request #529 from MITx/feature/cale/heartbeat-waits-for-courses 
Make heartbeat url wait for courses to be loaded
 2012-08-23 06:25:31 -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
Calen Pennington
5af67c1bf2 Put course location urls in heartbeat page, rather than lists 2012-08-23 09:19:26 -04:00
Calen Pennington
57444bdd25 Make heartbeat url wait for courses to be loaded 2012-08-23 09:16:40 -04:00
Calen Pennington
410335edb8 Merge pull request #528 from MITx/jarv/maintenance 
adding maintenance static data
 2012-08-23 05:40:01 -07:00
John Jarvis
f0b60fed10 adding maintenance static data 2012-08-23 08:30:04 -04:00
David Ormsbee
d084506d38 Merge pull request #525 from MITx/feature/arjun/comment_depth 
Limiting depth of comments
 2012-08-23 05:21:02 -07:00
arjun810
ec94d75106 Merge pull request #526 from MITx/feature/forum_config 
Feature/forum config
 2012-08-23 05:07:11 -07:00
David Ormsbee
ec4858801e read the comment service shared key from django config 2012-08-23 08:02:19 -04:00
David Ormsbee
c52dd5faea another unicode fix for forums 2012-08-23 07:59:53 -04:00
Victor Shnayder
d8342255be Merge pull request #519 from MITx/feature/arjun/cs188_css 
cs188 styling
 2012-08-23 04:58:24 -07:00
kimth
b0e418a390 Merge pull request #518 from MITx/feature/arjun/fix_choicegroup 
Get rid of inline flag for choicegroup, radiogroup, and checkboxgroup.
 2012-08-23 04:56:59 -07:00
Arjun Singh
d1a8cd3f65 Limiting depth of comments 2012-08-23 04:50:03 -07:00
David Ormsbee
27347fbc87 Merge pull request #524 from MITx/feature/forum_unicode 
Fix error when unicode string is in message viewed in single-thread
 2012-08-23 04:40:59 -07:00
David Ormsbee
a24fd328d9 Fix error when unicode string is in message viewed in single-thread template 2012-08-23 07:40:18 -04:00
David Ormsbee
dc13ff81b7 Merge pull request #521 from MITx/feature/rocky/loading 
added a loading icon when retrieving ajax
 2012-08-23 04:31:11 -07:00
David Ormsbee
2653690205 Merge pull request #520 from MITx/feature/rocky/discussion 
add user profile and fixed edit
 2012-08-23 04:28:51 -07:00
David Ormsbee
6de0599731 Merge branch 'master' into feature/rocky/discussion 2012-08-23 07:22:49 -04:00
Calen Pennington
22cbc1bdf8 Merge pull request #523 from MITx/feature/cale/aws-subdomain-branding 
Add subdomain_branding key to aws settings
 2012-08-23 03:31:53 -07:00
Calen Pennington
f4e75f5c39 Add subdomain_branding key to aws settings 2012-08-23 06:30:43 -04:00
Rocky Duan
e4890a8bff fixed pluralize 2012-08-23 02:52:51 -07:00
Rocky Duan
f2507d7c52 hide similar post wrapper when no results 2012-08-23 02:51:46 -07:00
Rocky Duan
5d90366917 fixed file uploading 2012-08-23 02:50:26 -07:00
Rocky Duan
0b00e3b099 make similar posts url working 2012-08-23 02:17:17 -07:00
Rocky Duan
5fb2bbbd7f make similar posts go away when submitted post 2012-08-23 02:03:50 -07:00
Rocky Duan
2b6a0928ca fixed loading for discussion module 2012-08-23 01:55:31 -07:00