Rocky Duan
e05faef88a
fixed tag url
2012-08-01 21:26:14 -04:00
ichuang
ec78e1a126
add missing trailing slash
2012-08-01 20:19:33 -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
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
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
cdd37eeb92
Strip down sequence navigaiton and more stripping of the courseware nav
2012-08-01 17:36:10 -04:00
Rocky Duan
ce15faf6a0
Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2
2012-08-01 16:52:06 -04:00
Rocky Duan
fc31885d2e
Merge branch 'master' into discussion2
2012-08-01 16:51:54 -04:00
Rocky Duan
5d3b187540
Merge branch 'master' of github.com:MITx/mitx
2012-08-01 16:45:21 -04:00
Rocky Duan
17d11a6391
pagination
2012-08-01 16:45:08 -04:00
Brittany Cheng
845ca43ea1
inline and forum styles
2012-08-01 16:42:09 -04:00
Calen Pennington
aa215bc316
Merge remote-tracking branch 'origin/hotfix/1.0.1' into hotfix/1.0.3
2012-08-01 15:59:06 -04:00
ichuang
10ebcefd54
add openid authentication
2012-08-01 14:59:55 -04:00
Brittany Cheng
bdab90190f
trying to fix merge conflicts
2012-08-01 14:29:00 -04:00
Brittany Cheng
01623ddbfb
merge with origin master
2012-08-01 14:24:46 -04:00
Rocky Duan
f204e9888f
renamed files
2012-08-01 13:09:19 -04:00
Rocky Duan
51772c04f3
use separate templates for forum view and inline view
2012-08-01 13:02:57 -04:00
Rocky Duan
777c3ee42c
Merge branch 'master' of github.com:MITx/mitx
...
Conflicts:
lms/djangoapps/courseware/views.py
lms/templates/profile.html
2012-08-01 12:49:00 -04:00
Rocky Duan
7d9d790c5d
endorse comments
2012-08-01 12:43:57 -04:00
Victor Shnayder
05c22c4901
Prettier error display
...
* Log formatted traceback string instead of exc_info tuple itself
* display as a list
2012-08-01 11:48:19 -04:00
Victor Shnayder
32253510d1
Import error cleanup
...
* call error tracker when needed
* remove duplicate logging--just add info and re-raise
* xml modulestore uses error tracker to capture load errors
* add unstyled list of import errors to courseware homepage!
2012-08-01 11:48:19 -04:00
Victor Shnayder
bc14441a75
add template I forgot
2012-08-01 11:48:18 -04:00
Calen Pennington
ef8a211b9e
Merge pull request #329 from MITx/MITx/feature/bridger/fast_course_grading
...
Got profile page working again.
2012-08-01 08:37:16 -07:00
Bridger Maxwell
ae3da772d0
Got profile page working again. The grader for each course is now defined in the data dir as grading_policy.json.
2012-08-01 11:27:04 -04:00
Brittany Cheng
f1e07024d4
Merge branch 'master' of github.com:MITx/mitx into discussion2
2012-07-31 18:43:21 -04:00
Kyle Fiedler
9d14033f6b
Added some styles for the top navigation and for the sidebar navigation
2012-07-31 16:29:01 -04:00
Brittany Cheng
29d75057f2
fix font inheritance, update post control styles
2012-07-31 16:25:27 -04:00
Victor Shnayder
71b9dbbb2e
Remove obsolete js references
2012-07-31 16:15:33 -04:00
Brittany Cheng
c69a4728e7
Merge branch 'master' of github.com:dementrock/mitx into discussion2
2012-07-31 15:42:12 -04:00
Brittany Cheng
b12d887309
font sizing
2012-07-31 15:41:03 -04:00
Brittany Cheng
3d389c099e
new post control button and link styles
2012-07-31 15:05:07 -04:00
Rocky Duan
c46b232e19
oops missed a bracket
2012-07-31 14:32:00 -04:00
Kyle Fiedler
d30ae5389e
Added fix for videos start to zero out colors and mit styles
2012-07-31 14:18:42 -04:00
Rocky Duan
c43d5d236a
Merge branch 'discussion2' of github.com:dementrock/mitx into discussion2
...
Conflicts:
lms/static/coffee/src/discussion.coffee
2012-07-31 13:43:53 -04:00
Rocky Duan
401f57b81a
show new post form after clicking button
2012-07-31 13:40:26 -04:00
Brittany Cheng
ddce6d8cb6
Merge branch 'master' of github.com:dementrock/mitx into discussion2
2012-07-31 13:39:13 -04:00
Brittany Cheng
48674d6fa5
search button style
2012-07-31 13:23:35 -04:00
Rocky Duan
c39b2db678
retrieve inline discussion by ajax
2012-07-31 13:22:25 -04:00
Rocky Duan
701f8716f7
only show edit button when user can edit
2012-07-31 12:31:59 -04:00
Rocky Duan
e301be4a80
modify anonymity handling; display comments count
2012-07-31 11:54:02 -04:00
Rocky Duan
a08d4b808b
fix raw tag data bug
2012-07-31 10:47:42 -04:00
Rocky Duan
6f44001813
basic editing functionality
2012-07-31 10:11:51 -04:00
Rocky Duan
cef347226b
Merge branch 'master' of github.com:MITx/mitx
2012-07-30 18:35:11 -04:00
Rocky Duan
24610899cf
fix accordion
2012-07-30 18:34:47 -04: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
7ab5bbfaef
Moved files and removed files
2012-07-30 17:37:53 -04:00
Rocky Duan
5fcc12136e
fixed bug caused by rearranging stuff
2012-07-30 17:20:30 -04:00
