Tom Giannattasio
b167e0f70a
added filter drop; tweaked sidebar coordinate settings to accommodate new post
2012-08-31 15:20:53 -04:00
John Jarvis
164dae71fb
Fixing syntax error
2012-08-31 10:09:15 -04:00
John Jarvis
66c5894e91
syntax error
2012-08-31 10:03:14 -04:00
John Jarvis
cef089f722
tracking log filename now determined by puppet, formatting cleanup
2012-08-31 09:38:13 -04:00
Carlos Andrés Rocha
20e48e6615
Merge pull request #475 from MITx/tmac/openid-provider
...
OpenID provider implementation
2012-08-31 06:23:03 -07:00
Carlos Andrés Rocha
d702082daa
[34078525] Add test settings for openid
2012-08-31 06:31:18 -04:00
Victor Shnayder
d815d50aee
Remove obsolete eager flag for xml modulestore
...
* has to be eager
2012-08-30 19:26:50 -04:00
John Jarvis
4c8ff6419e
Merge branch 'master' of github.com:MITx/mitx into jarv/add-local-logging
2012-08-30 15:37:04 -04:00
Victor Shnayder
4ce41c0111
fix course_ids for Berkeley internal courses and 3.091
2012-08-30 10:53:38 -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
John Jarvis
27725ab686
making loglevel configurable for local logging
2012-08-29 13:09:00 -04:00
John Jarvis
2e1c8666e1
adding SysLogHandler
2012-08-29 10:59:33 -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
John Jarvis
1e2406fc0c
updating logging config to allow for local logging
2012-08-29 10:05:08 -04:00
David Ormsbee
231b8c6aa4
Merge pull request #548 from MITx/kimth/limit-queue-dos
...
Kimth/limit queue dos
2012-08-28 08:03:02 -07: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
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
Bridger Maxwell
268a87442e
Added SECURE_PROXY_SSL_HEADER to env/aws.
2012-08-24 14:18:49 -04:00
Victor Shnayder
2cf612051c
turn subdomain listings off by default in dev env
2012-08-24 13:58:14 -04:00
kimth
3787307d93
Put WAITTIME_BETWEEN_REQUESTS in common rather than dev env
2012-08-24 11:23:26 -04:00
kimth
088d204d9c
Added CodeResponse tests
2012-08-24 11:09:27 -04:00
kimth
95a7a5b08b
Student must wait XQUEUE_WAITTIME_BETWEEN_REQUESTS between queueing submissions
2012-08-23 18:39:57 -04:00
ichuang
bc63b99a10
disable subdomain filtering in dev_ike (should allow non-fall2012 courses)
2012-08-23 13:13:58 -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
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
David Ormsbee
ec4858801e
read the comment service shared key from django config
2012-08-23 08:02:19 -04:00
Arjun Singh
d1a8cd3f65
Limiting depth of comments
2012-08-23 04:50:03 -07:00
Calen Pennington
f4e75f5c39
Add subdomain_branding key to aws settings
2012-08-23 06:30:43 -04: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
32403fb2a2
Put dev.py's DEBUG back to True (cough)
2012-08-23 00:21:35 -04: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
188584c77d
Allow puppet to set COURSE_LISTINGS
2012-08-21 16:21:43 -04: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
