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

189 Commits

Author SHA1 Message Date
Bridger Maxwell
5ef6a42c8f Disabled pipeline wrapper for compressed CSS. It now works more like dev environment. 2012-09-18 13:28:54 -04:00
David Ormsbee
5fbbd0ddbd Merge pull request #646 from MITx/feature/dave/disable_query_count 
Move QueryCountDebugMiddleware inclusion to dev.py instead of common.py ...
 2012-09-17 06:42:32 -07:00
Arjun Singh
46d830df13 Merge branch 'master' into feature/arjun/new-discussions 2012-09-14 15:15:21 -07:00
Carlos A. Rocha
67cbf50b83 Fix swfobject and django-pipeline - Cosmetic fix for youtube player 2012-09-13 01:08:59 -04:00
Arjun Singh
7ad9b39b98 Merge master 2012-09-10 15:33:59 -07:00
Carlos Andrés Rocha
e55e1a99cb Fix django pipeline configuration for discussion forum coffescript includes 2012-09-10 12:12:31 -07:00
ichuang
ab0a58fb7a add psychometrics - grade histograms, check time diffs, and IRT plots 2012-09-08 22:31:45 -04:00
Calen Pennington
b27802b319 Merge pull request #604 from MITx/feature/cale/content-static-dir 
Set the course static file dir to /static directories in course repos if...
 2012-09-07 13:50:21 -07:00
David Ormsbee
994102b16e Move QueryCountDebugMiddleware inclusion to dev.py instead of common.py -- it was too chatty in the logs 2012-09-07 16:02:00 -04:00
Calen Pennington
4088ac5428 Isolate manual git reload behind a feature flag 2012-09-05 15:16:40 -04:00
Calen Pennington
54e8819fb1 Merge pull request #615 from MITx/feature/ichuang/instructor-dashboard-upgrade 
Upgrade to instructor dashboard
 2012-09-05 08:03:55 -07:00
ichuang
0c3d054253 fix: university domain should not be determined by HTTP_HOST for dev or behind proxy 2012-09-04 18:36:26 -04:00
David Ormsbee
bce4e0f1bc Merge pull request #595 from MITx/feature/ibrahim/discussion_sort_preferences 
Feature/ibrahim/discussion sort preferences
 2012-09-03 10:25:04 -07:00
ichuang
2efe481237 move instructor dashboard into its own lms djangoapp; add new 
functionality - grade dump and download as csv, manage staff list,
force reload of course from xml
 2012-09-02 19:05:34 -04:00
Ibrahim Awwal
f6ee08271d Ensure that js files are returned in alphabetical order by django-pipeline. 
On most systems this seems to be the default behavior, but glob2.glob's order isn't guaranteed and on my machine the order seems to be random, which causes javascript which depends on include order to fail.
 2012-08-31 15:25:07 -07:00
David Ormsbee
69ea7aa873 Merge pull request #597 from MITx/feature/victor/nested-links 
Feature/victor/nested links
 2012-08-31 13:48:05 -07:00
Victor Shnayder
d815d50aee Remove obsolete eager flag for xml modulestore 
* has to be eager
 2012-08-30 19:26:50 -04:00
Ibrahim Awwal
7655e9eea0 Ensure that js files are returned in alphabetical order by django-pipeline. 
On most systems this seems to be the default behavior, but glob2.glob's order isn't guaranteed and on my machine the order seems to be random, which causes javascript which depends on include order to fail.
 2012-08-29 22:13:37 -07:00
Carlos Andrés Rocha
cd4aab13fb [34078525] Added OPENID_PROVIDER_TRUSTED_ROOTS django setting 
Added OPENID_PROVIDER_TRUSTED_ROOTS django setting. It should be a
list of glob matching patterns: ['*.cs50.net', '*.other.net']

Also did some minor refactoring and cleanup.
 2012-08-29 18:40:12 -04:00
Calen Pennington
99d6296b99 Set the course static file dir to /static directories in course repos if the folder exists, and fall back to including the whole course folder otherwise 2012-08-29 15:39:36 -04:00
Tommy MacWilliam
6de28fc592 feature flag, consumer displayed, logging 
- provider placed behind separate feature flag
- domain of openid consumer displayed in login page
- added logging for successful login, changed log messages to include
  "OpenID"
 2012-08-29 10:37:02 -04:00
kimth
3787307d93 Put WAITTIME_BETWEEN_REQUESTS in common rather than dev env 2012-08-24 11:23:26 -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
Bridger Maxwell
07eead2349 Updated django-wiki to better handle relative wiki links. 2012-08-23 10:11:31 -04:00
Arjun Singh
d1a8cd3f65 Limiting depth of comments 2012-08-23 04:50:03 -07:00
David Ormsbee
8e560688ae Merge pull request #516 from MITx/feature/fix_backbone_js 
Feature/fix backbone js
 2012-08-22 21:21:59 -07:00
David Ormsbee
af079a9362 Fix coffee includes for discussion forum. 2012-08-23 00:19:55 -04:00
David Ormsbee
cdc8e02aeb Add discussion coffee scripts to courseware js so we don't add a dependency on Backbone to non-courseware JS 2012-08-22 23:34:03 -04: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
9cd69e6ccd Added ability for staff users to moderate an article. 2012-08-22 20:03:30 -04: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
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
kimth
f46607710f Merge master 2012-08-22 15:25:07 -04:00
kimth
64788a73aa Remove ENABLE_SYLLABUS flag from envs/common 2012-08-22 15:22:58 -04:00
Calen Pennington
82bab71ccf First pass at branding the header logo on subdomains 2012-08-22 14:05:19 -04:00
Bridger Maxwell
9162bdb1b9 Changed wiki setting so article owners can't change permissions. 2012-08-21 23:06:45 -04:00
Bridger Maxwell
214fb9185d Disabling anonymous wiki access until styling supports it. 2012-08-21 18:42:20 -04:00
Bridger Maxwell
1e068b6a4a Disabled wiki attachments. 2012-08-21 18:01:51 -04:00
Victor Shnayder
2c19d01441 Merge pull request #479 from MITx/feature/arjun/syllabus 
Adding a syllabus page (accessible via course navigation)
 2012-08-21 14:33:07 -07:00
Arjun Singh
b86fbdbd10 Adding comments about removing the syllabus tab ASAP. 2012-08-21 13:23:00 -07:00
Calen Pennington
dca434ad34 Merge pull request #448 from MITx/feature/ichuang/add-gitreload-to-migrate 
add gitreload to lms-migration code
 2012-08-21 12:52:52 -07:00
Arjun Singh
99703761b0 Merge master 2012-08-21 12:01:09 -07:00
David Ormsbee
b31722bcff Merge branch 'master' into feature/bk_forum_int 2012-08-21 12:05:06 -04:00
Arjun Singh
1cfed46d06 Adding a syllabus page (accessible via course navigation) 2012-08-21 05:47:26 -07:00
ichuang
65ea54f7e2 typo in common.py ALLOWED_GITRELOAD_IPS fixed 2012-08-20 19:23:15 -04:00
David Ormsbee
eb96497cff Merge branch 'master' into feature/bk_forum_int 
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/courseware.html
	requirements.txt
 2012-08-20 18:57:46 -04:00
ichuang
e3ecd22fa0 github IPs in lms.envs.common; made create_user, create_groups, 
manage_course_groups management commands (in lms_migration)
 2012-08-20 18:38:05 -04:00
Bridger Maxwell
6d30a98f0f Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 2012-08-20 13:08:35 -04:00
David Ormsbee
6a05a812c3 Merge pull request #460 from MITx/kimth/multiple-fileupload 
Kimth/multiple fileupload
 2012-08-19 18:08:40 -07:00