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

66833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Giannattasio
d5302a0bd0 thread updates: follow/unfollow, grid tweaks 2012-08-07 12:00:17 -04:00
Kyle Fiedler
dd6ec19e80 Make the modal window work in the courseware 2012-08-07 11:59:49 -04:00
Brittany Cheng
4b9358fb72 similar posts styles 2012-08-07 11:55:31 -04:00
kimth
05646fbed7 Provide default xqueue in ModuleSystem 2012-08-07 11:54:09 -04:00
kimth
a9a19f40c3 Merge master 2012-08-07 11:51:44 -04:00
ichuang
c79da58175 add documentation on rake + unit tests 2012-08-07 11:48:01 -04:00
kimth
b6dc622e42 Remove temporary datetime 2012-08-07 11:43:00 -04:00
Rocky Duan
0863e34619 display actual username 2012-08-07 11:40:58 -04:00
kimth
c39edb650b StudentModule lookups in queue callback use target user, rather than request.user 2012-08-07 11:38:04 -04:00
Brittany Cheng
5bec964606 Merge branch 'master' of github.com:dementrock/mitx into discussion3 2012-08-07 11:36:34 -04:00
Rocky Duan
547114a823 Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into ccp0101/moderation 2012-08-07 11:31:26 -04:00
kimth
501f2ccf14 CodeResponse uses 'is_file' helper function 2012-08-07 11:30:21 -04:00
Rocky Duan
6c2f53a495 to make it appear at least normal.. 2012-08-07 11:28:52 -04:00
Tom Giannattasio
00a72cf86a updated thread styles: voting, actions, comments, sort 2012-08-07 11:27:13 -04:00
Rocky Duan
25c05e702e Merge branch 'brittany' of github.com:dementrock/mitx 2012-08-07 11:23:19 -04:00
Rocky Duan
0c311b8f13 search for similar posts without any styling.. 2012-08-07 11:22:41 -04:00
kimth
f6202e5631 Tests provide xqueue params, rather than ModuleSystem.__init__ 2012-08-07 11:16:48 -04:00
Brittany Cheng
1fb0e352b4 blank slate 2012-08-07 11:10:24 -04:00
Calen Pennington
e847bae267 Merge pull request #344 from MITx/feature/victor/file-per-descriptor 
Feature/victor/file per descriptor
 2012-08-07 08:09:59 -07:00
Victor Shnayder
b4e400ba56 Make tests pass again again 
* Move lazyproperty decorator into xmodule so it's accessible during tests
* add default xqueue to test system
 2012-08-07 11:08:56 -04:00
Victor Shnayder
932a9be747 Make tests pass again 
* test enrolls in course before testing pages
* support github edit links with new file structure
* Some pep8 cleanups
 2012-08-07 11:06:47 -04:00
Victor Shnayder
55edb1ef32 always export metadata in alphabetical order 2012-08-07 11:06:47 -04:00
Victor Shnayder
47b9441af5 a few pep8 cleanups 2012-08-07 11:06:47 -04:00
Victor Shnayder
5523c2883e Generate error module url_names using sha1 
* means we get the same url_name on each import of the same data.
 2012-08-07 11:06:47 -04:00
Victor Shnayder
ecf432ad78 Make the simple course pass roundtrip test: 
- add 'type' and 'points' to capa_module metadata
- replace old 'title' tag with display_name
 2012-08-07 11:06:47 -04:00
Victor Shnayder
79e0bc25f8 Make url_names on error descriptors unique 2012-08-07 11:06:47 -04:00
Victor Shnayder
e6e290f525 Make initial import-export tests pass. 
TODO:
* need unique slugs for errors so they don't overwrite each other on export.
  - try to preserve origin slug.  If not possible, generate random one.

* figure out what metadata to strip.  e.g.
 ({'data': '<problem><p><h1>Finger Exercise 1...'},
    {'data': '<problem points="1" type="lecture"><p><h1>Finger Exercise 1...'},
    False)
  - where did points and type come from?  Do we want them there?


* separate broken and non-broken test courses
 2012-08-07 11:06:47 -04:00
Victor Shnayder
b091dcabe0 metadata and file format cleanups 
* course.xml is special--has org and course attributes in addition to url_name
* strip data_dir from metadata on export
* more asserts
* work on roundtrip import-export test
 2012-08-07 11:06:47 -04:00
Victor Shnayder
6ed9052755 minor cleanups 2012-08-07 11:06:46 -04:00
Victor Shnayder
b285f50d92 Make unknown metadata persist accross import-export 
* +improve test.
 2012-08-07 11:06:46 -04:00
Victor Shnayder
d09e2261f3 New file structure--everything in own file 
* needed for CMS performance (can now save just an item, not whole tree)
* remove split_to_file methods
* simplified AttrMap logic
* write each descriptor to a separate file
* detect format on import and adjust appropriately.
* update tests
 2012-08-07 11:06:46 -04:00
ichuang
ca177570fa Merge pull request #356 from MITx/kimth/lms-coderesponse 
Kimth/lms coderesponse
 2012-08-07 07:56:23 -07:00
ichuang
4c25baee43 Merge pull request #355 from MITx/arjun/choicegroup_text 
Removing the <text> wrapper around choice text for radiogroup and checkboxgroup
 2012-08-07 07:55:01 -07:00
Tom Giannattasio
2135ed5015 added vote arrows 2012-08-07 10:16:08 -04:00
ichuang
462d75936a Merge pull request #357 from MITx/hotfix-registration 
fix typo in registration button jquery
 2012-08-07 07:11:53 -07:00
ichuang
4b2091b173 fix typo in registration button jquery 2012-08-07 10:09:55 -04:00
Brittany Cheng
87019c4bcb Merge branch 'master' of github.com:dementrock/mitx into discussion3 2012-08-07 10:07:30 -04:00
kimth
cb2fbfa54c Added test for answers file-to-filename conversion 2012-08-07 09:38:36 -04:00
kimth
ceeea66417 Fix overrzealous file_to_filename conversion and fix CapaProblem unit tests 2012-08-07 09:24:17 -04:00
Calen Pennington
c5fa6bac89 Merge pull request #353 from MITx/ichuang/showhide-staff-debug 
make the staff debug information appear in a show/hide span
 2012-08-07 05:43:14 -07:00
Bridger Maxwell
3dffcaca1c Fixed capitalization in gradebook css. 2012-08-07 08:42:08 -04:00
Calen Pennington
e14ebaafc3 Merge pull request #345 from MITx/MITx/feature/bridger/fast_course_grading 
Fast grading
 2012-08-07 05:39:18 -07:00
Bridger Maxwell
3a52e86a87 Fixed weighting of individual problems. Unmodified problems have weight None, not 1. 2012-08-07 08:00:06 -04:00
Bridger Maxwell
8287e5a13f Fixed grading bug where list comprehension variable overrode local variable. 2012-08-07 07:33:35 -04:00
Arjun Singh
0c4ad3b152 Converting seed to str to allow for using Mock objects as a seed during tests. 2012-08-07 04:30:19 -04:00
Arjun Singh
332dd8c99e Adding tests for javascript response; required copying files that would exist in other places in the main LMS to test_files because the test environment is fragile. This tests the code, but not the environment. 2012-08-07 04:29:45 -04:00
Arjun Singh
7cd8ffff3d Cleans up node calls and (barely) improves security as subprocess.Popen will escape arguments properly. This means that instructors cannot set the grader/generator to ;/bin/rm -rf *; however, the python and node environments are not sandboxed at all and so instructors can still run arbitrarily malicious code. 2012-08-07 03:55:01 -04:00
Arjun Singh
fb6dbb120e Fixing dependency system for javascriptresponses. In particular, adding a location for node-only packages (that are never sent to the client) in lms/lib/node_modules and adding lms/static/js, lms/static/coffee/* to the NODE_PATH, along with the course's data directory. 2012-08-07 03:28:35 -04:00
Arjun Singh
19fa50a882 Removing the <text> wrapper around choice text for radiogroup and checkboxgroup. 2012-08-07 02:38:23 -04:00
kimth
49b1678bf4 Merge pull request #354 from MITx/arjun/grading_fix 
arjun/grading fix
 2012-08-06 22:28:57 -07:00