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

3531 Commits

Author SHA1 Message Date
Ibrahim Awwal
91de5633b5 DjDT redirect intercept is annoying, especially for tests, so disable it 2012-09-21 00:15:12 -07:00
Bridger Maxwell
5ef6a42c8f Disabled pipeline wrapper for compressed CSS. It now works more like dev environment. 2012-09-18 13:28:54 -04:00
Victor Shnayder
ba92bdc2dc Merge pull request #708 from MITx/feature/cale/cms-bug-fixes 
Feature/cale/cms bug fixes
 2012-09-18 06:20:15 -07:00
Calen Pennington
0a55e1eae1 Add sub-environments for the lms that is running alongside the lms for debugging 2012-09-17 13:51:33 -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
David Ormsbee
3ee0f39b18 Merge pull request #696 from MITx/feature/dave/new-discussions 
Add AWS storage bucket name for S3 to make file uploads work
 2012-09-14 16:56:31 -07:00
David Ormsbee
239e6e8cc5 Add AWS storage bucket name for S3 to make file uploads work 2012-09-14 19:55:13 -04: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
Victor Shnayder
e47134bd10 turn off psychometrics in dev.py--the necessary migration is not present 2012-09-12 13:20:15 -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
8500a1b300 Make tests not use syslog when they're running 2012-09-07 14:38:53 -04:00
David Ormsbee
8312ddf01d Merge pull request #629 from MITx/feature/victor/save-course-position 
Feature/victor/save course position
 2012-09-07 06:42:48 -07:00
Victor Shnayder
8b7390c966 Turn of discussion service in test env 
- add a check for the feature flag before trying to save user info to the service
 2012-09-06 17:11:21 -04:00
David Ormsbee
3a40a55c76 Merge pull request #620 from MITx/jarv/add-local-logging 
Jarv/add local logging
 2012-09-06 08:25:17 -07:00
Calen Pennington
4088ac5428 Isolate manual git reload behind a feature flag 2012-09-05 15:16:40 -04:00
John Jarvis
f7baa0d8f0 * By default local dev environments will be setup to send tracking 
logs and application logs (DEBUG) to ENV_ROOT/log. Logs are rotated
  using the RotatingFileHandler
* For non dev environments logging will continue to be handled by
  rsyslogd
 2012-09-05 11:25:33 -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
John Jarvis
54f5e30992 * Removed tracking log comment 
* Additional PEP8 format cleanup
* Removed imports that are no longer necessary.
 2012-09-04 09:39:54 -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
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