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

677 Commits

Author SHA1 Message Date
Calen Pennington
3480665602 Merge pull request #541 from MITx/feature/ichuang/add-manage-course-groups-command 
add manage_course_groups command to lms_migration
 2012-08-27 08:16:42 -07:00
David Ormsbee
955dc94711 Merge pull request #554 from MITx/feature/victor/fix-staff-profile-view 
Set request.user = student when impersonating a student
 2012-08-25 08:39:46 -07:00
Victor Shnayder
7a6fa1dd41 Fix access control for impersonation case 
- only relevant in tests due to start dates
- still irritatingly intricate logic...
 2012-08-24 16:52:19 -04:00
kimth
115eebdb76 Use reverse for course_info url replacement 2012-08-24 16:47:50 -04:00
Victor Shnayder
b8659e084c Set request.user = student when impersonating a student 
* currently only in the staff view of student progress page

[Fix #34379687]
 2012-08-24 16:30:16 -04:00
kimth
31216ccd9f Do URL replacement in course info page 2012-08-24 16:16:26 -04:00
ichuang
dc52956c28 don't list all users if too many 2012-08-24 14:09:57 -04:00
Rocky Duan
fe74f9bc85 reconstruct after editing 2012-08-24 02:17:58 -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
3761b02ce8 hide reply button after closing thread 2012-08-23 15:12:22 -07:00
ichuang
8e7eef24a2 add manage_course_groups command to lms_migration 2012-08-23 13:10:08 -04: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
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
David Ormsbee
0b309ea40a Can't return Http404, have to raise it. 2012-08-23 11:27:54 -04: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
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
Arjun Singh
d1a8cd3f65 Limiting depth of comments 2012-08-23 04:50:03 -07:00
Rocky Duan
e4890a8bff fixed pluralize 2012-08-23 02:52:51 -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
007de179e1 add user profile page back 2012-08-22 23:44:50 -07:00
David Ormsbee
e3cdad0d2b change url regexp to handle discussions in coursenames with dashes 2012-08-23 01:17:49 -04:00
Rocky Duan
0e21ed030c removed new post button & added recent threads to single thread page 2012-08-22 19:22:35 -07:00
Rocky Duan
43ef4f6482 fixed recent threads & tags links 2012-08-22 19:09:58 -07:00
David Ormsbee
baa6eadfb5 Merge branch 'master' into feature/dave/forum_fixes 2012-08-22 20:30:49 -04:00
Victor Shnayder
1b25433a39 Allow error-template-rendering errors to propagate to top-level 500 handler 
* hopefully won't come up, but if they do, our 500 page
  should be better than  HttpResponse("There was an unrecoverable error")
 2012-08-22 20:21:10 -04:00
Rocky Duan
908a5c5d59 Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-22 14:11:44 -07:00
Rocky Duan
3b76fe16d8 make inline page working 2012-08-22 14:04:42 -07: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
David Ormsbee
fafbe41644 Merge pull request #502 from MITx/pmitros/berkeley_enrollment_hack 
Enrollment hack for allowing Berkeley to add their students.
 2012-08-22 13:59:07 -07:00
Piotr Mitros
69a3ea63bc Fixed minor issues (removed two unnecessary lines) 2012-08-22 16:32:14 -04:00
David Ormsbee
c86ee73bd8 Merge pull request #504 from MITx/feature/bridger/new_wiki 
Feature/bridger/new wiki
 2012-08-22 13:13:33 -07:00
Bridger Maxwell
a694d1034e We use django-wiki's built-in wikilinks markdown extension. They were clashing. 2012-08-22 15:57:44 -04:00
Piotr Mitros
a301abd5ad Enrollment hack for allowing Berkeley to add their students. 2012-08-22 15:49:48 -04:00
Rocky Duan
9b26a20989 fixed search highlighting 2012-08-22 12:04:32 -07: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
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
Rocky Duan
37c78524a8 migrated threads reloading related stuff 2012-08-22 11:07:02 -07:00
Calen Pennington
82bab71ccf First pass at branding the header logo on subdomains 2012-08-22 14:05:19 -04:00
Bridger Maxwell
14382702bc Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 
Conflicts:
	lms/templates/wiki/settings.html
 2012-08-22 13:09:42 -04: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
Bridger Maxwell
3796bb4a12 Changed title of default root wiki page to just be Wiki. 2012-08-22 12:42:03 -04:00
Bridger Maxwell
96f0f7cbde Changed default contents of new course wiki. 2012-08-22 11:36:06 -04:00
Rocky Duan
a90af0c471 render permalink in backend 2012-08-21 23:26:06 -07:00
Bridger Maxwell
9e81ea3981 Added instructor tabs to wiki course nav. 2012-08-21 22:31:13 -04:00
Rocky Duan
11e3276e80 update comment count based on operations 2012-08-21 17:43:20 -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