Arjun Singh
|
f7e299d04e
|
fix inline discussion
|
2012-08-24 11:15:06 -07:00 |
|
David Ormsbee
|
d0f2f31063
|
Merge pull request #547 from MITx/feature/rocky/discussion
fixed profiled user id (toggle moderator status)
|
2012-08-24 08:25:42 -07:00 |
|
Tom Giannattasio
|
10c953e8a4
|
Merge pull request #534 from MITx/feature/kfiedler/wiki
fix wiki falsh message
|
2012-08-24 08:03:37 -07:00 |
|
Calen Pennington
|
2ac5b0a3bd
|
Merge pull request #542 from MITx/feature/ichuang/fix-admin-page-url-load
admin page should be loaded based on settings.DEBUG not askbot
|
2012-08-24 08:01:56 -07:00 |
|
Arjun Singh
|
eb4068cc11
|
Make profile page look reasonable
|
2012-08-24 03:14:42 -07:00 |
|
Arjun Singh
|
eb65b95232
|
Removing stray return statement
|
2012-08-24 03:06:44 -07:00 |
|
Rocky Duan
|
fe74f9bc85
|
reconstruct after editing
|
2012-08-24 02:17:58 -07:00 |
|
Rocky Duan
|
cc5fbdd5a7
|
fixed appearance of loading icon near sort bar
|
2012-08-24 02:05:11 -07:00 |
|
Rocky Duan
|
80195176e9
|
use escape html everywhere and only send discussion data relavent
|
2012-08-24 01:45:55 -07:00 |
|
Rocky Duan
|
88a3e828f6
|
don't use raw html when rendering
|
2012-08-24 01:04:11 -07:00 |
|
Rocky Duan
|
7e6656f2df
|
fixed profiled user id (toggle moderator status)
|
2012-08-23 15:22:11 -07:00 |
|
David Ormsbee
|
5a1c792723
|
Merge pull request #546 from MITx/feature/rocky/discussion
hide reply button after closing thread
|
2012-08-23 15:17:13 -07:00 |
|
Rocky Duan
|
3761b02ce8
|
hide reply button after closing thread
|
2012-08-23 15:12:22 -07:00 |
|
David Ormsbee
|
575a91e2ef
|
Merge pull request #539 from MITx/feature/rocky/blank_slate_fix
remove blank slate after new post
|
2012-08-23 15:08:25 -07:00 |
|
David Ormsbee
|
9cf9165b04
|
Merge pull request #545 from MITx/feature/rocky/discussion
some tiny bug fixes (delete & update follow)
|
2012-08-23 15:03:02 -07:00 |
|
Rocky Duan
|
ca09c7427b
|
some tiny bug fixes
|
2012-08-23 14:33:18 -07: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 |
|
ichuang
|
bc63b99a10
|
disable subdomain filtering in dev_ike (should allow non-fall2012 courses)
|
2012-08-23 13:13:58 -04:00 |
|
ichuang
|
8274aa112f
|
the admin page should be loaded based on settings.DEBUG, not askbot
|
2012-08-23 13:12:46 -04: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 |
|
Rocky Duan
|
3e6f3430b6
|
remove blank slate after new post
|
2012-08-23 10:06:27 -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 |
|
Kyle Fiedler
|
773055cf54
|
fix wiki falsh message
|
2012-08-23 10:28:31 -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 |
|