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

11117 Commits

Author SHA1 Message Date
Valera Rozuvan
767f0bd4b3 Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged 2013-02-25 13:28:27 +02:00
Valera Rozuvan
1ca397c5eb Testing errors. 2013-02-25 13:28:19 +02:00
Alexander Kryklia
4600155f97 add icon class support 2013-02-25 13:13:00 +02:00
Valera Rozuvan
df2335c90c Bug fixing. 2013-02-25 13:08:37 +02:00
Valera Rozuvan
6f16455e70 Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged 2013-02-25 12:57:31 +02:00
Alexander Kryklia
0f7db9e54d Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged 2013-02-25 12:55:58 +02:00
Valera Rozuvan
5a62eae726 Fixing bugs. 2013-02-25 12:55:29 +02:00
Alexander Kryklia
f5dc0afa07 fixed reset json 2013-02-25 12:54:56 +02:00
Valera Rozuvan
653154f11e UI changes. 2013-02-25 12:33:49 +02:00
Valera Rozuvan
d9ad4b5724 Merge branch 'feature/alex/poll-merged' of github.com:MITx/mitx into feature/alex/poll-merged 2013-02-25 12:13:52 +02:00
Valera Rozuvan
268e5b4bf7 Front end stuff clean up. 2013-02-25 12:13:44 +02:00
Alexander Kryklia
82a74abd65 return ok on poll_reset 2013-02-25 12:12:28 +02:00
Alexander Kryklia
9cdd271ee4 added icon class 2013-02-25 12:04:18 +02:00
Alexander Kryklia
3dae4d29bd reset part-1 2013-02-25 11:21:47 +02:00
Brian Wilson
fa00ea442e add first pass at multi-chapter support. 2013-02-25 01:26:34 -05:00
Victor Shnayder
db06efae75 Prevent scroll-to-top on clicks in cohorts views 
Have to return false from event handlers to avoid href="#"
links from sending the user to the top of the page.
 2013-02-24 19:44:41 -05:00
Victor Shnayder
01a38c29be Add auto-cohorting functionality. 
See changes in xml-format.md or wiki (dynamic cohorts v1) for spec.
 2013-02-24 18:48:01 -05:00
Victor Shnayder
8e93e0770f Merge pull request #1509 from MITx/feature/victor/capa-finished 
Add showanswer="finished" option and tests
 2013-02-24 13:24:34 -08:00
jmclaus
cfc8a37aae Fully functional Genex 2013-02-24 12:02:06 -05:00
Arthur Barrett
c3f55845c0 factoring out discussion logic (for now, anyway) 2013-02-22 18:22:32 -05:00
Arthur Barrett
66ddfa295d more refactoring and work on annotationinput (should be working now). 2013-02-22 16:33:28 -05:00
Brian Talbot
bb24a079a1 studio - alerts: initial pass at alert styling and markup complete 2013-02-22 14:28:13 -05:00
Arthur Barrett
840f7839fa added save and render functionality to annotationinput 2013-02-22 12:48:22 -05:00
Jay Zoldak
af2690fcaf Update lettuce test framework to use a course factory instead of the studio UI for creating courses 2013-02-22 12:36:27 -05:00
Julian Arni
e5294591dc Foldit leaderboard w/o tests 2013-02-22 11:12:26 -05:00
Vik Paruchuri
d5865e70b8 Merge remote-tracking branch 'origin/master' into feature/vik/oe-messages 2013-02-22 10:21:34 -05:00
Diana Huang
f9667849b8 Fix some minor bugs in event handling and add enter key support 2013-02-22 09:47:50 -05:00
Diana Huang
3ecafa9b42 Add hot keys to rubrics 2013-02-22 09:47:50 -05:00
Arthur Barrett
78bf8d5876 update annotationinput jsonv alue on tag selection or comment change 2013-02-22 00:42:12 -05:00
Arthur Barrett
3970ea33e1 return from capa problem 2013-02-21 22:54:50 -05:00
Jay Zoldak
e337292b5f Fix existing advanced settings lettuce tests. 2013-02-21 18:20:42 -05:00
Brian Wilson
d42a12da59 Merge remote-tracking branch 'origin/master' into feature/brian/pdf_js 2013-02-21 17:50:08 -05:00
Brian Wilson
8076c5b731 remove unneeded files (that break collectstatic) 2013-02-21 17:38:00 -05:00
Arthur Barrett
0e2c46a718 Clicking "reply to annotation" scrolls to the problem (specified in xml by problem=index). 2013-02-21 17:01:43 -05:00
Chris Dodge
103508b45d remove empty attempts and weights from simple test course 2013-02-21 15:41:59 -05:00
Brian Wilson
d503fe3d79 Merge remote-tracking branch 'origin/master' into feature/brian/pdf_js 2013-02-21 15:38:28 -05:00
Brian Wilson
d5e34b0a44 fix initialization of scale dropdown, and check for valid values of page number 2013-02-21 15:35:03 -05:00
Victor Shnayder
8d76556729 Merge pull request #1531 from MITx/fix/cdodge/serializing-ints-as-empty-strings 
Fix/cdodge/serializing ints as empty strings
 2013-02-21 12:12:44 -08:00
Diana Huang
76c4007449 Merge pull request #1522 from MITx/diana/click-tracking 
Add more click tracking and logging to the open ended grading interface
 2013-02-21 11:10:35 -08:00
Arthur Barrett
a8178de497 Added styling to the annotationinput capa problem. 2013-02-21 13:52:22 -05:00
Your Name
ff68853990 Merge branch 'master' into feature/victor/revert-revert-of-forums-ui 2013-02-21 13:30:24 -05:00
Chris Dodge
bb75a23101 Merge branch 'master' of github.com:MITx/mitx into fix/cdodge/serializing-ints-as-empty-strings 2013-02-21 11:58:52 -05:00
David Ormsbee
3494d58450 Merge pull request #1532 from MITx/feature/ned/clean_up_tests 
Make sure temp directories are properly cleaned up so running tests does...
 2013-02-21 08:52:09 -08:00
Ned Batchelder
c3b571bf9b Make sure temp directories are properly cleaned up so running tests doesn't leave them behind. 2013-02-21 11:38:45 -05:00
Don Mitchell
ba7959fc4d Merge pull request #1511 from MITx/feature/cdodge/metadata-inheritence-crawling 
Feature/cdodge/metadata inheritence crawling
 2013-02-21 08:29:54 -08:00
Chris Dodge
a7f6545cbc add unit test 2013-02-21 11:22:20 -05:00
Chris Dodge
68a8587ed2 don't serialize weight out as an int - use a string. The code in capa-module.py expects a string and tries to convert to a float. So this impedence mismatch is causing a crash on import when importing empty strings for 'weight' or 'attempts' 2013-02-21 11:02:47 -05:00
Diana Huang
9aac915c9f Remove unnecessary assignment 2013-02-21 10:33:48 -05:00
Brian Wilson
00e31c0116 fix toolbarViewer styling 2013-02-21 10:30:20 -05:00
Diana Huang
3a8b7156a0 Merge branch 'master' into diana/click-tracking 2013-02-21 10:19:35 -05:00