Brittany Cheng
|
48674d6fa5
|
search button style
|
2012-07-31 13:23:35 -04:00 |
|
Brittany Cheng
|
607bc6b50b
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-07-31 12:51:17 -04:00 |
|
Rocky Duan
|
701f8716f7
|
only show edit button when user can edit
|
2012-07-31 12:31:59 -04:00 |
|
Brittany Cheng
|
cf92f356c0
|
edit styles for tags, discussion votes, etc
|
2012-07-31 12:03:45 -04:00 |
|
Brittany Cheng
|
32cf7c6f66
|
Merge branch 'master' of github.com:MITx/mitx into discussion2
|
2012-07-31 11:26:17 -04:00 |
|
Kyle Fiedler
|
2bbb19790d
|
Fixed jquery ui image problem and added a base style sheet for lms to override fonts
|
2012-07-31 11:06:39 -04:00 |
|
Brittany Cheng
|
278483371b
|
fix merge conflicts
|
2012-07-31 10:30:26 -04:00 |
|
Brittany Cheng
|
6285f2a2be
|
discussion styles
|
2012-07-31 10:27:14 -04:00 |
|
Rocky Duan
|
6f44001813
|
basic editing functionality
|
2012-07-31 10:11:51 -04:00 |
|
Brittany Cheng
|
bba8e29733
|
Merge branch 'master' of github.com:MITx/mitx into discussion2
|
2012-07-30 18:36:23 -04:00 |
|
Brittany Cheng
|
a98c505ba8
|
fix merge conflicts
|
2012-07-30 18:36:06 -04:00 |
|
Rocky Duan
|
cef347226b
|
Merge branch 'master' of github.com:MITx/mitx
|
2012-07-30 18:35:11 -04:00 |
|
Brittany Cheng
|
92cfded595
|
added color to error msg and borders to threads
|
2012-07-30 18:34:07 -04:00 |
|
David Ormsbee
|
e5fd92630d
|
Merge pull request #316 from MITx/feature/halogenandtoast/form-field-errors
Added styles for errors
|
2012-07-30 15:24:12 -07:00 |
|
Rocky Duan
|
d6b7707725
|
refactored reply rendering by using mustache
|
2012-07-30 18:19:04 -04:00 |
|
Kyle Fiedler
|
c611bd9228
|
added treeview
|
2012-07-30 17:39:44 -04:00 |
|
Kyle Fiedler
|
257ce0430f
|
Moved vendor sass files to css folder and included them in
|
2012-07-30 17:39:19 -04:00 |
|
Kyle Fiedler
|
7ab5bbfaef
|
Moved files and removed files
|
2012-07-30 17:37:53 -04:00 |
|
Kyle Fiedler
|
6cad5459b3
|
Start to refactor courseware scss
|
2012-07-30 17:37:11 -04:00 |
|
Brittany Cheng
|
2ad854abb7
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-07-30 17:28:05 -04:00 |
|
Rocky Duan
|
e6776682df
|
..and fix again bug caused by changing id
|
2012-07-30 17:25:14 -04:00 |
|
Brittany Cheng
|
554fc827f4
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-07-30 17:22:12 -04:00 |
|
Rocky Duan
|
6c8214051f
|
Merge branch 'discussion2' of github.com:dementrock/mitx
|
2012-07-30 17:17:32 -04:00 |
|
Rocky Duan
|
941ae0f068
|
basic error handling
|
2012-07-30 17:16:44 -04:00 |
|
Brittany Cheng
|
91cb814ee0
|
merging with origin master
|
2012-07-30 16:28:49 -04:00 |
|
Kyle Fiedler
|
3bb82c41d2
|
Remove couse css file
|
2012-07-30 16:21:03 -04:00 |
|
Brittany Cheng
|
1b7e2b356e
|
edit layout of search box
|
2012-07-30 15:22:40 -04:00 |
|
Calen Pennington
|
c9e637d719
|
Make cms and lms tests run independently (they had been colliding on collectstatic)
|
2012-07-30 12:58:45 -04:00 |
|
Kyle Fiedler
|
a040f4346e
|
Added styles for errors
|
2012-07-30 11:57:31 -04:00 |
|
Brittany Cheng
|
65730c2268
|
Merge branch 'master' of github.com:dementrock/mitx into discussion
|
2012-07-30 10:45:04 -04:00 |
|
Kyle Fiedler
|
84272f3f8c
|
Added Gemfile.lock to ignore
|
2012-07-30 09:51:50 -04:00 |
|
Kyle Fiedler
|
d94fd1542d
|
Added Gemfile.lock to ignore
|
2012-07-30 09:50:24 -04:00 |
|
Rocky Duan
|
3ad309c2fd
|
forgot to include files & tiny styling fix
|
2012-07-29 17:40:11 -04:00 |
|
Rocky Duan
|
8e3251c915
|
basic tag autocomplete
|
2012-07-29 17:32:00 -04:00 |
|
Rocky Duan
|
b92a180d25
|
add tags to threads & view threads by tags
|
2012-07-29 15:24:15 -04:00 |
|
Brittany Cheng
|
f6a3842fd8
|
merging inline html
|
2012-07-28 18:18:47 -04:00 |
|
Rocky Duan
|
0790a3add4
|
image uploading & render markdown
|
2012-07-27 17:50:38 -04:00 |
|
Brittany Cheng
|
148d499bfe
|
Merge branch 'master' of github.com:dementrock/mitx into discussion
|
2012-07-27 14:43:43 -04:00 |
|
Brittany Cheng
|
aff57bf855
|
mostly font edits
|
2012-07-27 14:43:33 -04:00 |
|
Brittany Cheng
|
c5aa22ed65
|
Merge branch 'master' of github.com:MITx/mitx into discussion
|
2012-07-27 14:42:39 -04:00 |
|
Rocky Duan
|
7a53bc52ae
|
Merge branch 'master' of github.com:MITx/mitx
|
2012-07-27 12:30:54 -04:00 |
|
Rocky Duan
|
fc4e21d4c4
|
use wmd editor for comments
|
2012-07-26 17:35:09 -04:00 |
|
Rocky Duan
|
2e26f84e9b
|
improve for multiple editor on page
|
2012-07-26 16:20:26 -04:00 |
|
Rocky Duan
|
dbad9338e1
|
removed unnecessary/commented out lines
|
2012-07-26 16:01:57 -04:00 |
|
Rocky Duan
|
f0ce33c951
|
make mathjax working with the editor
|
2012-07-26 15:34:22 -04:00 |
|
Rocky Duan
|
b04a645685
|
make indentation the same
|
2012-07-26 11:11:45 -04:00 |
|
Rocky Duan
|
eb0a9bc9e8
|
only run customwmd when where's markdown
|
2012-07-26 11:11:30 -04:00 |
|
kimth
|
6631848b53
|
CodeMirror fix in the new scss org
|
2012-07-26 10:49:10 -04:00 |
|
Rocky Duan
|
9d2bccbee7
|
Merge branch 'master' of github.com:MITx/mitx
|
2012-07-26 10:43:42 -04:00 |
|
Calen Pennington
|
73d6565fac
|
Merge remote-tracking branch 'origin/hotfix/1.0.1'
Conflicts:
common/djangoapps/student/views.py
|
2012-07-26 09:05:57 -04:00 |
|