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

180 Commits

Author SHA1 Message Date
marco
27045de758 adding jquery.tabs file missing previously 2013-02-13 16:33:18 -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
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
Carlos Andrés Rocha
a52bf81846 WIP Support multiple edit-a-molecule applets 2013-02-05 20:15:49 -05:00
Carlos Andrés Rocha
11db1190e6 WIP Save edit-a-molecule state in input field 
Also add reset button and fix run condition from the GWT loader in Firefox
 2013-02-05 20:15:49 -05:00
Carlos Andrés Rocha
41cce2d84f WIP Rename edit-a-molecule files to be more consistent 2013-02-05 20:15:49 -05:00
Carlos Andrés Rocha
f68f023e35 WIP integration of edit-a-molecule 2013-02-05 20:15:48 -05:00
Carlos Andrés Rocha
d0d15c0dc2 Import edit-a-molecule resources 2013-02-05 20:15:48 -05:00
Your Name
d5b70d7bfc inline cohorting working 2013-02-05 18:38:06 -05:00
Your Name
837f54c055 inline cohorting almost done 2013-02-04 20:10:08 -05:00
Your Name
3fa67c1425 allow moderators and students to select cohort on post creation 2013-01-31 17:05:15 -05:00
Don Mitchell
b3d7dc779d Merge branch 'feature/dhm/drag' of github.com:MITx/mitx into feature/dhm/drag 2013-01-29 13:17:15 -05:00
Don Mitchell
ba95cf2385 Auto expand on hover of drag&drop unit 2013-01-29 13:10:23 -05:00
Victor Shnayder
39a9c47512 make links look like links 2013-01-29 11:33:26 -05:00
Victor Shnayder
6847779f22 Merge remote-tracking branch 'origin/master' into feature/victor/cohorts 
Conflicts:
	common/djangoapps/student/models.py
 2013-01-26 12:37:26 -05:00
Don Mitchell
e58193f87f Updated comment 2013-01-25 13:03:54 -05:00
Don Mitchell
5ef3f3ee66 Update jquery ui. Overrode draggable w/ an in place fix for scroll 
racing condition.
 2013-01-25 12:44:58 -05:00
Victor Shnayder
103db8aaf3 add conflict detection--users should be in at most one cohort per course 2013-01-24 15:14:34 -05:00
Victor Shnayder
de02721158 Add removing students from cohorts. 2013-01-24 15:14:33 -05:00
Victor Shnayder
7bdb5c23e1 Allow listing of users in cohorts and adding users 
- still needs style, more features, but basic functionality works
 2013-01-24 15:12:53 -05:00
Victor Shnayder
bab3b0c39e Add initial set of views for managing cohorts 
- lets user see and add cohorts
- needs styling
- needs to allow them to actually manage membership!
 2013-01-24 15:12:53 -05:00
cahrens
2609ba4093 Delete unused icon, reorder dropdown. 2013-01-23 11:02:16 -05:00
Brian Talbot
5e7726079e studio html editor - styled <pre> and <code> elements, revised code tinyMCE icon 2013-01-22 23:32:51 -05:00
cahrens
731fb209de Merge branch 'feature/cale/cms-master' into feature/christina/tiny-mce 
Conflicts:
	cms/static/css/tiny-mce.css
 2013-01-22 16:15:27 -05:00