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

223 Commits

Author SHA1 Message Date
Valera Rozuvan
61c68b740c Set up of basic RequireJS skeleton structure. 2013-01-21 15:53:44 +02:00
David Ormsbee
0f035b7692 Remove extra RequireJS.js entry. 2013-01-18 17:03:55 -05:00
Brian Wilson
3b28e328c4 disable export of testcenter_exam from course module (and add test). 2013-01-15 17:54:10 -05:00
Brian Wilson
32b2d1b97f Perform merge from master, including renumbering of migrations in common/djangoapps/student/migrations 2013-01-15 15:42:09 -05:00
valera-rozuvan
0913e9ef69 Work on GST. 2013-01-15 12:51:55 +02:00
Vik Paruchuri
0e11deffcf Fix staff and peer grading settings to not fail catastrophically 2013-01-14 12:31:50 -05:00
Brian Wilson
8ad9bc5949 Move Pearson URL to settings. Fix Register button. Other small changes. 2013-01-09 11:26:54 -05:00
Diana Huang
bbc5cd50bc Add in default value for MOCK_PEER_GRADING 2013-01-07 15:49:48 -05:00
Diana Huang
e1ec4eec71 Get tests to pass by creating a mock peer grading service 2013-01-07 14:46:32 -05:00
Diana Huang
ad63c492be Minor updates to the page to handle showing Calibration feedback. 
Also, allow for the hiding of the Prompt and the Rubric.
 2013-01-04 12:42:38 -05:00
Diana Huang
28501ca58e Merge branch 'master' into diana/peer-grading-views 2013-01-03 16:23:14 -05:00
David Ormsbee
2daddff2ef Merge pull request #1217 from MITx/feature/zoldak/lms-acceptance-testing 
Merge the lettuce acceptance test framework to master
 2013-01-03 09:06:47 -08:00
valera-rozuvan
62271fe5c6 Added namespaced RequireJS. 2013-01-03 10:14:06 +02:00
Jay Zoldak
56d17d8a8a Improve some comments and names in the acceptance test framework 2013-01-02 10:44:21 -05:00
Diana Huang
652a8eb440 New peer grading view on the lms side 2012-12-28 15:48:06 -05:00
Diana Huang
ecf04b3e49 Refactor existing grading logic into a new app. 2012-12-28 11:29:29 -05:00
Carlos Andrés Rocha
5d85fab283 Fix django auth login redirection 
The django authentication decorator login_required, redirects to
settings.LOGIN_URL. If it is missing, it redirects to /accounts/login.

We did not have the setting enable, not a proper page where to
redirect. This cause users not logged in to see a 404 error when
accessing courseware directly, by using a link or a bookmark.

[#41499213]
 2012-12-19 18:48:30 -05:00
David Ormsbee
e3b4d78d87 IE7 compatibility: no trailing commas in arrays, including the third party json2.js lib because IE<8 has no JSON object. 2012-12-07 16:03:05 -05:00
Victor Shnayder
835f18795a Make tests pass again 2012-11-30 10:27:34 -05:00
Victor Shnayder
d28cd4f429 use a dict for backend config. Load it on aws. 2012-11-30 10:03:31 -05:00
Victor Shnayder
b48b389a56 implement login into staff grading service. 2012-11-30 10:03:31 -05:00
Victor Shnayder
ff11926570 Initial impl and basic access tests for staff grading service 2012-11-30 10:00:01 -05:00
Victor Shnayder
7d1d135c16 Wire in some initial js. 2012-11-30 09:51:34 -05: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
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
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
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
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