Commit Graph

15584 Commits

Author SHA1 Message Date
Vik Paruchuri
70f7185723 Make a legend 2013-02-08 23:27:45 -05:00
Vik Paruchuri
5ac6fad1f7 Properly display rubric scores at all times 2013-02-08 23:16:44 -05:00
Vik Paruchuri
8bfad8f2bd Work on properly displaying rubric icons 2013-02-08 23:11:51 -05:00
Vik Paruchuri
35babcf592 Properly show status on combined rubric 2013-02-08 22:55:20 -05:00
Vik Paruchuri
0c6ac1c743 Add in BC 2013-02-08 22:43:38 -05:00
Arthur Barrett
5fc7f1a892 Constrain comments to viewport. 2013-02-08 21:27:35 -05:00
Arthur Barrett
a9773eb888 Updated markup, styling, and tooltip behavior for displaying instructor comments. Added drag/drop to the comments so the user can organize them as they wish after clicking on the span. When the user hides the annotations, their positions on the screen are remembered so they can be restored later. Also modified the markup so that block content can be displayed. 2013-02-08 20:38:24 -05:00
Your Name
f500806247 make hide/show synchronous for cohort filters 2013-02-08 18:18:12 -05:00
Your Name
cc0a6a2da9 make hide/show synchronous for cohort filters 2013-02-08 18:03:27 -05:00
Your Name
7761f6cb04 make cohort filter visibility conditional on selected commentable cohortedness 2013-02-08 17:22:29 -05:00
cahrens
ac732f6b07 Beginnings of feedback regarding unsaved and saved changes. 2013-02-08 17:19:19 -05:00
Don Mitchell
09e8628037 add editor to new entries and when key changes 2013-02-08 16:58:50 -05:00
Your Name
bcf9dfc2b3 add css change to cohort dropdown for zoom support 2013-02-08 15:44:56 -05:00
Your Name
b980399f5f change cohort dropdown verbiage 2013-02-08 15:41:11 -05:00
Don Mitchell
5254af2918 Letting render do its thing. The wrap confused the this pointer. 2013-02-08 15:36:42 -05:00
Victor Shnayder
0e06f5f587 Merge remote-tracking branch 'origin/feature/kevin/groups_ui_changes' into feature/victor/revert-revert-of-forums-ui 2013-02-08 15:01:30 -05:00
Victor Shnayder
6d9a9ec46f Revert "Merge pull request #1452 from MITx/silly/victor/revert-forums-merge"
This reverts commit e4819a1b55, reversing
changes made to b6ec41cae0.

Now that we're ready to test again, need to revert the revert to put the filtering UI back in.
2013-02-08 15:00:25 -05:00
Your Name
df0b6aca7d inline mustache working 2013-02-08 14:41:36 -05:00
Your Name
4e9d70254f inline mustache working 2013-02-08 14:29:00 -05:00
Your Name
21c06c741b inline mustache working 2013-02-08 14:28:48 -05:00
David Ormsbee
80843c1561 Merge pull request #1463 from MITx/feature/brian/pearson-exam
Feature/brian/pearson exam
2013-02-08 11:07:15 -08:00
David Ormsbee
1e197df3c1 Merge pull request #1471 from MITx/victor/jobs-page
Posting lots of new jobs
2013-02-08 10:53:27 -08:00
chrisndodge
891e350a83 Merge pull request #1464 from MITx/bug/bug161
On first request for handouts, create the db record. (bug 160)
2013-02-08 10:49:01 -08:00
Brian Wilson
f51876da6a cosmetic changes 2013-02-08 13:42:54 -05:00
Brian Talbot
210086fed3 studio - settings: grading revamp WIP 2013-02-08 13:42:36 -05:00
Don Mitchell
2cdfed9efe Merge pull request #1472 from MITx/feature/christina/misc2
A couple minor bug fixes.
2013-02-08 10:15:11 -08:00
cahrens
98026e4325 A couple minor bug fixes.
https://edx.lighthouseapp.com/projects/102637/tickets/173
https://edx.lighthouseapp.com/projects/102637/tickets/177
2013-02-08 12:46:32 -05:00
Brian Talbot
1b679750ad studio - settings: more revamp of tabs to views WIP 2013-02-08 12:36:21 -05:00
Victor Shnayder
a68094515c fix capitalization and spacing 2013-02-08 12:33:19 -05:00
Victor Shnayder
83a4f40ac6 fix typo; fix phrasing for software engineer job 2013-02-08 12:24:07 -05:00
Victor Shnayder
61f5991885 Posting lots of new jobs 2013-02-08 12:15:09 -05:00
cahrens
4718c9a51a Forgot to define self when I moved code. 2013-02-08 11:17:02 -05:00
Jay Zoldak
0d0049ec76 Merge pull request #1465 from MITx/feature/ichuang/fix-test-conditional
fix test_conditional
2013-02-08 08:13:01 -08:00
chrisndodge
7244425996 Merge pull request #1467 from MITx/feature/cale/cms-no-collect-course-static
Make it so that cms doesn't try to run collectstatic on course content
2013-02-08 08:05:56 -08:00
ichuang
96d119965c limit staff debug verbosity to locations of specific categories 2013-02-08 10:52:03 -05:00
Calen Pennington
33a3d5dbb7 Make it so that cms doesn't try to run collectstatic on course content 2013-02-08 10:49:43 -05:00
ichuang
04cc257bdd fix module staff accesss - by has_access, not by user.is_staff 2013-02-08 10:46:17 -05:00
Calen Pennington
dd4db0601f Remove generated files 2013-02-08 10:45:59 -05:00
Calen Pennington
bda46c423d Fix some issues that were prevent lms start 2013-02-08 10:41:02 -05:00
Kevin Chugh
727843d32e added cohorted mustache template for inline 2013-02-08 10:39:59 -05:00
Brian Talbot
dc07e7375f studio - settings: revamp of tabs to views WIP 2013-02-08 09:36:18 -05:00
ichuang
ad0d304e67 fix instructor dashboard datadump error message to be useful 2013-02-08 09:21:36 -05:00
Kevin Chugh
c6bece8620 more updates 2013-02-08 09:11:41 -05:00
cahrens
950f5de3ca Move getSession() call out of render method to avoid crash on Chrome. 2013-02-08 08:26:24 -05:00
Brian Wilson
ab6f383be1 support for Pearson test user 2013-02-08 03:05:28 -05:00
Brian Wilson
f1198b5f5f for starting pearson exam, just call jump_to() instead of reverse(jump_to...) 2013-02-08 02:15:45 -05:00
Arthur Barrett
7ea87793c2 Modified annotatable to retrieve and display instructor comments from span elements. Instructor commentaries are displayed in tooltips with a reply link when the highlighted area is clicked. The commentaries are connected to inline discussion forums by anchors (for now). 2013-02-07 19:51:22 -05:00
Vik Paruchuri
17cc6b4dff Fix minor display issue 2013-02-07 19:26:21 -05:00
Vik Paruchuri
a49f740e87 Fix rubric and make images display with tooltips 2013-02-07 19:22:54 -05:00
Kevin Chugh
3cfc5c4545 cohort filter wokorking 2013-02-07 19:18:21 -05:00