Commit Graph

14212 Commits

Author SHA1 Message Date
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
ichuang
4f33f7ffbc turn on tracking (helps with debugging) 2013-02-24 05:07:23 +00:00
ichuang
b6cf206fc7 fix latex high-level-source editor 2013-02-24 01:55:57 +00: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
Jay Zoldak
3a6f43f320 Create additional BDD spec tests for Course Advanced Settings editor 2013-02-22 16:27:05 -05:00
Brian Talbot
b1f5d67a96 studio - alerts: initial pass at alert styling and markup complete 2013-02-22 14:39:49 -05:00
Brian Talbot
60f803f369 studio - alerts: initial pass at alert styling and markup complete 2013-02-22 14:29:19 -05:00
Brian Talbot
bb24a079a1 studio - alerts: initial pass at alert styling and markup complete 2013-02-22 14:28:13 -05:00
Jay Zoldak
85b75badd7 Refactor lettuce commands for navigation to the advanced settings page 2013-02-22 14:07:22 -05:00
Brian Talbot
d7bbfbc707 studio - alerts: basic layout and general alert styling WIP 2013-02-22 13:52:24 -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
Brian Talbot
de2b05bf66 Merge branch 'master' into feature/btalbot/studio-alerts 2013-02-22 12:01:50 -05:00
Julian Arni
e5294591dc Foldit leaderboard w/o tests 2013-02-22 11:12:26 -05:00
Don Mitchell
c11d627c88 Chrome/Safari don't use keypress for backspace and delete. 2013-02-22 11:00:27 -05:00
Ned Batchelder
ff35d3e6d9 Merge in a cherry-picked commit 2013-02-22 10:54:01 -05:00
Ned Batchelder
2e21c71fc4 A script to run just one test, based on the test failure description. 2013-02-22 10:52:25 -05:00
Diana Huang
ed955df230 Merge pull request #1529 from MITx/feature/vik/oe-messages
Feature/vik/oe messages
2013-02-22 07:31:06 -08: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
Alexander Kryklia
4713c5f095 re-enable discussion service 2013-02-22 10:40:09 +02: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
Mark L. Chang
f1c8301e4f added question marks 2013-02-21 22:47:48 -05:00
David Ormsbee
215f6aeb27 Merge pull request #1505 from MITx/feature/brian/pdf_js
Feature/brian/pdf js
2013-02-21 17:28:16 -08: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
chrisndodge
7e107119b7 Merge pull request #1535 from MITx/fix/cdodge/make-jump-to-handle-lost-slash
remove empty attempts and weights from simple test course
2013-02-21 12:43:15 -08:00
Chris Dodge
103508b45d remove empty attempts and weights from simple test course 2013-02-21 15:41:59 -05:00
Brian Wilson
6d174ef029 remove dead code 2013-02-21 15:41:28 -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
Jay Zoldak
c10dc838b2 Fix tip on JSON key value pairs 2013-02-21 15:01:12 -05:00