Rocky Duan
|
d183e91f3f
|
Merge branch 'master' into discussion2
|
2012-08-02 17:08:24 -04:00 |
|
Rocky Duan
|
6a23e910c2
|
small fic
|
2012-08-02 17:08:05 -04:00 |
|
Brittany Cheng
|
f649084ab2
|
rocky's coffee edits
|
2012-08-02 17:05:00 -04:00 |
|
Rocky Duan
|
88a98ef548
|
refactored discussion.coffee into separate files
|
2012-08-02 17:03:10 -04:00 |
|
Rocky Duan
|
bad84669b7
|
Merge branch 'master' into discussion2
|
2012-08-02 16:01:41 -04:00 |
|
Rocky Duan
|
0375710d22
|
i meant sort before...this time it's search ajax
|
2012-08-02 16:01:27 -04:00 |
|
Brittany Cheng
|
55ce53f984
|
reply styles
|
2012-08-02 15:50:14 -04:00 |
|
Brittany Cheng
|
4a605ab9c8
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-08-02 15:43:51 -04:00 |
|
Brittany Cheng
|
7f0282a222
|
paginator styles
|
2012-08-02 15:43:05 -04:00 |
|
Rocky Duan
|
7b65663e2b
|
ajax search in inline view
|
2012-08-02 15:34:29 -04:00 |
|
Brittany Cheng
|
fffad764b3
|
styles
|
2012-08-02 15:31:04 -04:00 |
|
Rocky Duan
|
1da86a782f
|
oops
|
2012-08-02 15:16:59 -04:00 |
|
Rocky Duan
|
2811f50466
|
hide the annoying staff info for now
|
2012-08-02 15:15:35 -04:00 |
|
Rocky Duan
|
381fe9514b
|
make cancel/submit work and hide watch discussion
|
2012-08-02 15:12:55 -04:00 |
|
Rocky Duan
|
7b66cae380
|
Merge branch 'discussion2' of github.com:dementrock/mitx
|
2012-08-02 15:02:20 -04:00 |
|
Rocky Duan
|
fd1e91aef2
|
display show comments button
|
2012-08-02 15:02:10 -04:00 |
|
Brittany Cheng
|
10c1366510
|
reply styles
|
2012-08-02 14:56:00 -04:00 |
|
Rocky Duan
|
1e7e2f25ad
|
Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2
|
2012-08-02 14:42:12 -04:00 |
|
Rocky Duan
|
380c6f86e7
|
random fixes
|
2012-08-02 14:41:45 -04:00 |
|
Brittany Cheng
|
7d414346d6
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-08-02 14:21:15 -04:00 |
|
Brittany Cheng
|
b47edaa9c9
|
styles
|
2012-08-02 14:21:09 -04:00 |
|
Rocky Duan
|
de2f48b3bf
|
Merge branch 'master' of github.com:MITx/mitx into discussion2
|
2012-08-02 12:55:09 -04:00 |
|
Rocky Duan
|
0f3f5de66f
|
Merge branch 'master' into discussion2
|
2012-08-02 12:54:38 -04:00 |
|
Rocky Duan
|
f1b3f69656
|
retrieve threads by ajax
|
2012-08-02 12:54:09 -04:00 |
|
Brittany Cheng
|
2d54aa07f3
|
Merge branch 'master' of github.com:MITx/mitx into discussion2
|
2012-08-02 11:55:28 -04:00 |
|
Brittany Cheng
|
907e763606
|
sort styles
|
2012-08-02 11:55:21 -04:00 |
|
David Ormsbee
|
73fb8f5464
|
Merge branch 'hotfix/1.0.3'
Conflicts:
lms/urls.py
|
2012-08-02 11:51:50 -04:00 |
|
Rocky Duan
|
aa29b77715
|
Merge branch 'master' of github.com:MITx/mitx
|
2012-08-02 11:05:58 -04:00 |
|
Brittany Cheng
|
8febbf249f
|
Merge branch 'master' of github.com:MITx/mitx into discussion2
|
2012-08-02 10:06:43 -04:00 |
|
Calen Pennington
|
a7ae7905ea
|
Merge pull request #334 from MITx/feature/victor/metadata-inherit
Feature/victor/metadata inherit
|
2012-08-02 06:25:09 -07:00 |
|
Rocky Duan
|
efc0cc7ca7
|
oops
|
2012-08-01 21:31:06 -04:00 |
|
Rocky Duan
|
e05faef88a
|
fixed tag url
|
2012-08-01 21:26:14 -04:00 |
|
Rocky Duan
|
a8e23dcc53
|
Merge branch 'master' into discussion2
Conflicts:
lms/templates/discussion/_forum.html
lms/templates/discussion/_inline.html
|
2012-08-01 19:46:52 -04:00 |
|
Rocky Duan
|
9a31d7a9b4
|
basic sorting
|
2012-08-01 19:44:07 -04:00 |
|
Victor Shnayder
|
e2ce54612c
|
remove debugging assert from test
|
2012-08-01 19:25:47 -04:00 |
|
Victor Shnayder
|
652e2aa24c
|
fix for inheriting metadata bug
* problem was on import to json--got all the metadata,
but didn't preserve the _inherited_metadata
* added own_metadata property, use it instead
|
2012-08-01 19:25:47 -04:00 |
|
Victor Shnayder
|
b63f05b651
|
update clean_xml script to use error trackers properly
|
2012-08-01 19:25:47 -04:00 |
|
Victor Shnayder
|
82899323e8
|
Add metadata inherit test
* also make a placeholder roundtrip export test
|
2012-08-01 19:25:47 -04:00 |
|
Victor Shnayder
|
2f4bf5f606
|
Minor fixes to cms
* make logging work properly in cms, dev
* fix a comment
|
2012-08-01 19:25:47 -04:00 |
|
Brittany Cheng
|
b2ddef99be
|
padding and margins of discussion containers
|
2012-08-01 18:14:59 -04:00 |
|
Brittany Cheng
|
03d9b7a928
|
merge kyle's style fixes
|
2012-08-01 18:09:27 -04:00 |
|
Brittany Cheng
|
ae89aac6ce
|
Merge branch 'master' of github.com:MITx/mitx into discussion2
|
2012-08-01 18:07:52 -04:00 |
|
Brittany Cheng
|
6c214fc4bd
|
basic paginator styles
|
2012-08-01 18:03:36 -04:00 |
|
David Ormsbee
|
eedf62a1a9
|
Merge pull request #333 from MITx/feature/kfiedler/courseware-style
Strip down sequence nav, start to use ems for font size instead of pixels and started to strip down the info page
|
2012-08-01 14:58:02 -07:00 |
|
Kyle Fiedler
|
b90aa2e2db
|
Added more styles for the info page and added headers for the updates and handouts so they will be consistant for every class
|
2012-08-01 17:36:11 -04:00 |
|
Kyle Fiedler
|
6c3ec99f9e
|
Start to change to ems and remove all of cream
|
2012-08-01 17:36:10 -04:00 |
|
Kyle Fiedler
|
cdd37eeb92
|
Strip down sequence navigaiton and more stripping of the courseware nav
|
2012-08-01 17:36:10 -04:00 |
|
Brittany Cheng
|
dac66a998e
|
Merge branch 'master' of github.com:dementrock/mitx into discussion2
|
2012-08-01 17:06:37 -04:00 |
|
Brittany Cheng
|
01ac251c2b
|
styles and staff
|
2012-08-01 17:06:32 -04:00 |
|
jarv
|
0e7ce4a6be
|
Merge pull request #332 from MITx/jarv/prod-requirements
Jarv/prod requirements
|
2012-08-01 13:58:33 -07:00 |
|