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

216 Commits

Author SHA1 Message Date
Calen Pennington
0fff578e7d Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	.gitmodules
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/course.scss
	lms/urls.py
 2012-11-16 09:03:15 -05:00
chrisndodge
e3d65a0c08 Merge pull request #997 from MITx/feature/cale/js-tests 
Feature/cale/js tests
 2012-11-08 06:44:49 -08:00
Calen Pennington
0bfa443520 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 2012-11-02 11:09:19 -04:00
Victor Shnayder
8c27e3a249 Revert overly aggressive killing. 
(don't worry--askbot is still dead)
 2012-10-30 20:49:10 -04:00
Victor Shnayder
793354a0dc remove (almost) all references to askbot. 2012-10-30 18:23:07 -04:00
Calen Pennington
cd9fbaeb02 Add timeout so that jasmine tests eventually fail if the server doesn't start 2012-10-30 15:51:21 -04:00
Calen Pennington
e8be6b3111 Get jasmine tests running on cms 2012-10-30 11:33:21 -04:00
Calen Pennington
6d5a1264b9 Move jasmine tests to their own environment 2012-10-30 10:58:38 -04:00
Calen Pennington
f19ec64659 Point Studio forgot password at corresponding lms forgot password. There is no place for a reset password link in Studio at the moment 2012-10-25 10:47:41 -04:00
Carlos Andrés Rocha
76ffbfc4a1 Increase the limit of files that can be uploaded by a student 2012-10-23 17:26:00 -04:00
Calen Pennington
ef1ba6d9f7 Remove leftover merge garbage 2012-10-23 13:40:34 -04:00
Calen Pennington
b52ed48221 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/xmodule/js/src/html/display.coffee
	lms/envs/common.py
 2012-10-23 13:38:11 -04:00
Carlos Andrés Rocha
24d5c9162c Created Django App with commands to import software license numbers per class. 2012-10-15 18:46:31 -04:00
Calen Pennington
d21c5761df Minor bug fixes from edge-configs merge 2012-10-11 12:49:48 -04:00
Calen Pennington
284f0d6a22 Make the lms running alongside the CAS in dev point to the same contentstore, and server up static content 2012-10-11 12:31:52 -04:00
Calen Pennington
eece835d9b Put in an empty contentstore for the LMS by default 2012-10-11 12:31:52 -04:00
Calen Pennington
0162e4c031 Remove more askbot remnants 2012-10-11 12:31:51 -04:00
Calen Pennington
f5a63f7375 Remove all askbot common settings 2012-10-11 12:31:51 -04:00
Victor Shnayder
9e43664498 Add support for per-course site status. 
Now looks for a status_message.json file, looks for 'global' and ${course.id} keys. Return any global message and any course-specific message, joined by <br>.

fab files need to be updated to use this new format (new filename, possibly also help manage per-course messages, or at least test for valid json)
 2012-10-07 23:09:26 -04:00
David Ormsbee
13c8cbf5af Merge pull request #807 from MITx/feature/victor/status-banner 
Feature/victor/status banner
 2012-10-02 14:19:36 -07:00
Victor Shnayder
f4623bf155 address comments on #807 2012-10-02 17:17:15 -04:00
Victor Shnayder
8ad1e7fba1 Add framework for a site status banner. 
- still needs style
- will cache for 10 seconds
 2012-10-02 11:48:16 -04:00
Calen Pennington
258a210556 Don't ignore .py files in static files dirs 2012-10-02 11:04:43 -04:00
Calen Pennington
05b9e6cab2 Standardize more of css between lms and cms 2012-10-01 15:17:40 -04:00
Calen Pennington
44805ca383 Make discussion js work for cms as well as lms so that inline discussion xmodules load 2012-10-01 15:16:54 -04:00
Calen Pennington
2554413291 Hook up link to create modules from templates 2012-09-25 10:10:44 -04:00
Victor Shnayder
a8aced9bba Also make the actual ?next redirection work with caching 
- use js instead of django to do the redirection
 2012-09-24 09:15:06 -04: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
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