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

5293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
arjun810
49cffd80fd Merge pull request #566 from MITx/feature/ibrahim/fix_discussion_sorting 
Fix bug with sorting discussion forums
 2012-08-27 13:07:03 -07:00
Ibrahim Awwal
773a32e39f Fix bug with sorting discussion forums (event was not being passed into the event handler). 2012-08-27 13:00:02 -07:00
David Ormsbee
b9f929ff30 Merge pull request #564 from MITx/feature/rocha/wiki-cheatsheet 
Feature/rocha/wiki cheatsheet
 2012-08-27 11:37:54 -07:00
Tom Giannattasio
d0a8027ad3 Merge branch 'master' into feature/rocha/wiki-cheatsheet 2012-08-27 11:49:09 -04:00
Tom Giannattasio
7b3098edc0 fixed cheatsheet bug on new article page 2012-08-27 11:48:54 -04:00
Victor Shnayder
7e2e90cfa5 move comment into function re: #549 2012-08-27 11:29:13 -04:00
Calen Pennington
5bd919b5dc Merge pull request #549 from MITx/feature/victor/unique-names 
Feature/victor/unique names
 2012-08-27 08:25:31 -07:00
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
Tom Giannattasio
9b5285ad8a Merge branch 'master' into feature/rocha/wiki-cheatsheet 2012-08-27 09:08:48 -04:00
Victor Shnayder
25c83bbb5d xml format docs! 2012-08-26 21:55:55 -04:00
David Ormsbee
c6d06a3a27 Merge pull request #562 from MITx/feature/rocky/discussion 
fixed a tiny bug that loading icon sometimes doesn't appear at the right place / doesn't go away
 2012-08-26 13:02:28 -07:00
Rocky Duan
eb8ee01d21 fixed a tiny bug that loading icon sometimes doesn't appear at the right place / doesn't go away 2012-08-25 12:12:57 -07:00
jarv
c1cd075853 Merge pull request #561 from MITx/feature/change_wiki_repo 
Switch django-wiki dependency to a clone in our org
 2012-08-25 09:21:55 -07:00
David Ormsbee
e7b67d7225 Switch django-wiki dependency to a clone in our org so that local changes are easier to make 2012-08-25 12:15:03 -04: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
David Ormsbee
d042578ab5 Merge pull request #560 from MITx/rocha/master 
Important fix! Remove HTML tags from Markdown code.
 2012-08-25 08:35:22 -07:00
Carlos Andrés Rocha
1f7a1065ef Important fix! Remove HTML tags from Markdown code. 2012-08-25 10:54:43 -04:00
David Ormsbee
9734347c48 Merge pull request #556 from MITx/kimth/course-replace-in-infopage 
Do URL replacement in course info page
 2012-08-24 14:52:48 -07:00
David Ormsbee
828430d6c8 Merge pull request #557 from MITx/feature/tomg/courseware_signin 
Added a log in button to the courseware when unauthenticated
 2012-08-24 13:59:32 -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
Tom Giannattasio
4a06decafd Merge branch 'master' into feature/tomg/courseware_signin 2012-08-24 16:42:01 -04:00
Tom Giannattasio
7d14632c3a added log in button to unauthenticated courseware 2012-08-24 16:41:12 -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
Tom Giannattasio
d1760f9a22 styled markdown modal and link 2012-08-24 16:14:04 -04:00
David Ormsbee
d095b7771a Merge pull request #555 from MITx/jarv/empty-defaults-for-comments-params 
empty default for comments_service_key and comments_url because it was b...
 2012-08-24 12:12:50 -07:00
John Jarvis
4c21abc433 empty default for comments_service_key and comments_url because it was breaking configs that do not have it in env.json 2012-08-24 15:05:18 -04:00
Calen Pennington
b5c90166df Merge pull request #553 from MITx/feature/bridger/new_wiki 
Added SECURE_PROXY_SSL_HEADER to env/aws. Re-enabled wiki directories
 2012-08-24 11:47:25 -07:00
bridger
24de129900 Merge pull request #550 from MITx/rocha/master 
Fixed WikiPath regexp.
 2012-08-24 11:32:20 -07:00
Bridger Maxwell
268a87442e Added SECURE_PROXY_SSL_HEADER to env/aws. 2012-08-24 14:18:49 -04:00
David Ormsbee
718e4c24b0 Merge pull request #552 from MITx/feature/arjun/fix_inline_disc 
fix inline discussion
 2012-08-24 11:16:36 -07:00
Arjun Singh
f7e299d04e fix inline discussion 2012-08-24 11:15:06 -07:00
Carlos Andrés Rocha
2bc9d08b25 Fixed WikiPath regexp. It was incorrectly matching [Title](Link) on the same line. 2012-08-24 14:11:35 -04:00
ichuang
dc52956c28 don't list all users if too many 2012-08-24 14:09:57 -04:00
Bridger Maxwell
8e9211d2dd Re-enabling link to wiki 'see all children'. The bug for which this was disabled is already fixed. 2012-08-24 14:04:17 -04:00
Victor Shnayder
7a67fdc4ed Fix url_name loading 
- cleaned up name loading
- clear fallbacks, including hashing content if no name specified
- log errors in error tracker for content devs to see
 2012-08-24 13:58:14 -04:00
Victor Shnayder
2cf612051c turn subdomain listings off by default in dev env 2012-08-24 13:58:14 -04:00
Tom Giannattasio
9cab1d9de8 fixed merge conflict 2012-08-24 13:33:48 -04:00
Tom Giannattasio
b72ec72528 pulled temp data from gradebook 2012-08-24 13:32:16 -04: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