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

205 Commits

Author SHA1 Message Date
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
Brian Wilson
8076c5b731 remove unneeded files (that break collectstatic) 2013-02-21 17:38:00 -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
Brian Wilson
00e31c0116 fix toolbarViewer styling 2013-02-21 10:30:20 -05:00
Brian Wilson
731f4abd8a fix bug with nav to a page, and add pdfviewer.css. 2013-02-21 03:15:08 -05:00
Brian Wilson
1850528a99 add contents of pdfjs to common/static/js/vendor, after fixing CR/LF issues in localization files 2013-02-20 18:49:59 -05:00
Brian Wilson
50cae69945 define pdfviewer.js, and use from static_pdfbook.html 2013-02-20 18:37:17 -05:00
Brian Wilson
c234f3625e add full version of pdf.js, and main files for jquery-pdfdoc 2013-02-19 18:05:36 -05:00
Diana Huang
f4addddf42 Merge pull request #1484 from MITx/feature/vik/improve-oe-ui 
Feature/vik/improve oe ui
 2013-02-19 07:27:29 -08:00
Brian Talbot
6c95460761 studio - resolving merge from master 2013-02-15 09:15:06 -05:00
Brian Wilson
0d3b566dd8 finish piping URL through to pdf.js 2013-02-14 15:47:53 -05:00
Victor Shnayder
e352226df5 Merge remote-tracking branch 'origin/master' into 700x-sandbox 2013-02-14 09:19:25 -05:00
John Hess
259bd8817f Moved onclick to 'fold' button instead of to courseware's button 2013-02-13 15:10:32 -05:00
Brian Talbot
f1ad05059c studio - correcting an image-replacement Sass mixin 2013-02-13 09:18:23 -05:00
jmclaus
9dbe911907 Back to last version of Protex 2013-02-13 09:45:44 +01:00
Don Mitchell
d569c559ca Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding 
Conflicts:
	cms/djangoapps/contentstore/views.py
	cms/static/js/views/settings/main_settings_view.js
	cms/templates/index.html
	cms/templates/settings.html
 2013-02-12 16:57:00 -05:00
Kevin Chugh
21f4616080 spread less than and greater than fix to responses and comments, and profile view 2013-02-12 09:18:46 -05:00
Kevin Chugh
d57c78f9d9 fix showing less than and greater than in code 2013-02-11 20:01:09 -05:00
Vik Paruchuri
46da4cf241 Add in a better notification icon 2013-02-09 10:15:11 -05:00
Vik Paruchuri
0feb8f66bc Fix colors on legend, add random assessment 2013-02-08 23:59:39 -05:00
Brian Talbot
1b679750ad studio - settings: more revamp of tabs to views WIP 2013-02-08 12:36:21 -05:00
Vik Paruchuri
4973363353 Attach images to rubric to indicate which graders scored what 2013-02-07 18:35:09 -05:00
John Hess
f39a98f9ba Revert "Protex now loads correctly in every scenario" --- actually breaks grading, though it did fix loading 
This reverts commit 2627a2f12c.
 2013-02-07 16:14:42 -05:00
Victor Shnayder
18ddd1ee56 Merge pull request #1453 from MITx/victor/protex 
Victor/protex
 2013-02-06 18:03:53 -08:00
jmclaus
2627a2f12c Protex now loads correctly in every scenario 2013-02-06 20:49:23 -05:00
jmclaus
98865bb7c0 Loading bug fixed by ugly hack 2013-02-06 20:49:16 -05:00
jmclaus
85b92f30de GWT now does no set any target shape in onModuleLoad() 2013-02-06 20:49:06 -05:00
jmclaus
e27b1e04a7 Fixed small alighment pb, decreased font size of text box 2013-02-06 20:48:57 -05:00
jmclaus
3bd7e1b703 Crisper AA letters, canvases non-selectable 2013-02-06 20:48:48 -05:00
jmclaus
ef232c5976 Few bug fixes 2013-02-06 20:48:40 -05:00
jmclaus
f6dacff41e Fixed layout, increased size of markers on proteins 2013-02-06 20:48:32 -05:00
jmclaus
5737f58b95 Added GWT Protex - reads target shape from xml writes answer to hidden input field 2013-02-06 20:48:25 -05:00
Victor Shnayder
2af06ef1d4 Revert "Merge pull request #1402 from MITx/feature/kevin/groups_ui_changes" 
This reverts commit 66889b8724, reversing
changes made to 0dd9c24e74.

This was merged too early--it's still missing the filtering and display-your-cohort changes.
Will need to revert this revert later.
 2013-02-06 20:29:17 -05:00
Victor Shnayder
edf96036c8 Merge remote-tracking branch 'origin/master' into 7012x-clean 2013-02-06 18:53:14 -05:00
Carlos Andrés Rocha
536333cbb5 Refactor how editamolecule displays messages 2013-02-06 18:31:00 -05:00
Carlos Andrés Rocha
d4afa02b12 Modify editamolecule to load GWT scripts dynamically 2013-02-06 17:40:44 -05:00
Kevin Chugh
55c205b9b4 merged master 2013-02-06 17:13:52 -05:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Victor Shnayder
31b8f0ce7f Have errors go through jsmolcalc's getInfo 2013-02-05 23:27:52 -05:00
Kevin Chugh
c7a133470d inline discussions working 2013-02-05 22:43:09 -05:00
Julian Arni
222c01b20b Removed console logs 2013-02-05 20:15:51 -05:00
John Hess
adb77ea699 hack to fix validation issues 2013-02-05 20:15:51 -05:00
Julian Arni
05e25dadcf Added validation warnings 2013-02-05 20:15:51 -05:00
Victor Shnayder
02eb55a913 Compiled version of Carlos' merge 2013-02-05 20:15:50 -05:00
Carlos Andrés Rocha
9bc25ff372 Replace editamolecule input type applet with GWT version 2013-02-05 20:15:50 -05:00
Victor Shnayder
ab9bd4b805 Have errors go through jsmolcalc's getInfo 2013-02-05 20:15:50 -05:00
jmclaus
d74b21e444 Added edit a gene 2013-02-05 20:15:50 -05:00
Carlos Andrés Rocha
752a455257 Fixed design-a-protein input type to save the value of output 2013-02-05 20:15:50 -05:00
jmclaus
bc3f373edf Added design protein 2D 2013-02-05 20:15:49 -05:00