Commit Graph

583 Commits

Author SHA1 Message Date
Ibrahim Awwal
773a32e39f Fix bug with sorting discussion forums (event was not being passed into the event handler). 2012-08-27 13:00:02 -07:00
Matthew Mongeau
db492cc400 Add back in calculator related code. 2012-08-27 09:43:37 -04:00
Rocky Duan
eb8ee01d21 fixed a tiny bug that loading icon sometimes doesn't appear at the right place / doesn't go away 2012-08-25 12:12:57 -07:00
Tom Giannattasio
4a06decafd Merge branch 'master' into feature/tomg/courseware_signin 2012-08-24 16:42:01 -04:00
Arjun Singh
f7e299d04e fix inline discussion 2012-08-24 11:15:06 -07:00
Tom Giannattasio
9cab1d9de8 fixed merge conflict 2012-08-24 13:33:48 -04:00
Arjun Singh
eb65b95232 Removing stray return statement 2012-08-24 03:06:44 -07:00
Rocky Duan
fe74f9bc85 reconstruct after editing 2012-08-24 02:17:58 -07:00
Rocky Duan
cc5fbdd5a7 fixed appearance of loading icon near sort bar 2012-08-24 02:05:11 -07:00
Rocky Duan
80195176e9 use escape html everywhere and only send discussion data relavent 2012-08-24 01:45:55 -07:00
Rocky Duan
88a3e828f6 don't use raw html when rendering 2012-08-24 01:04:11 -07:00
Rocky Duan
3761b02ce8 hide reply button after closing thread 2012-08-23 15:12:22 -07:00
David Ormsbee
575a91e2ef Merge pull request #539 from MITx/feature/rocky/blank_slate_fix
remove blank slate after new post
2012-08-23 15:08:25 -07:00
Rocky Duan
ca09c7427b some tiny bug fixes 2012-08-23 14:33:18 -07:00
Tom Giannattasio
9a3a4f4a88 set active accordion state 2012-08-23 13:10:14 -04:00
Rocky Duan
3e6f3430b6 remove blank slate after new post 2012-08-23 10:06:27 -07:00
David Ormsbee
dc13ff81b7 Merge pull request #521 from MITx/feature/rocky/loading
added a loading icon when retrieving ajax
2012-08-23 04:31:11 -07:00
Rocky Duan
f2507d7c52 hide similar post wrapper when no results 2012-08-23 02:51:46 -07:00
Rocky Duan
0b00e3b099 make similar posts url working 2012-08-23 02:17:17 -07:00
Rocky Duan
5fb2bbbd7f make similar posts go away when submitted post 2012-08-23 02:03:50 -07:00
Rocky Duan
2b6a0928ca fixed loading for discussion module 2012-08-23 01:55:31 -07:00
Rocky Duan
16ca13f203 Merge branch 'feature/rocky/discussion' into feature/rocky/loading 2012-08-23 01:52:07 -07:00
Rocky Duan
233f817f0b include discussion js group in coursewar & removed unnecessary code 2012-08-23 01:51:51 -07:00
Rocky Duan
abe12ddd7c display loading status 2012-08-23 01:47:47 -07:00
Rocky Duan
007de179e1 add user profile page back 2012-08-22 23:44:50 -07:00
Rocky Duan
4dae36cd8e only execude code when backbone is defined 2012-08-22 23:44:50 -07:00
Rocky Duan
45431ae789 scroll to top after reloading threads 2012-08-22 23:44:50 -07:00
David Ormsbee
af079a9362 Fix coffee includes for discussion forum. 2012-08-23 00:19:55 -04:00
Rocky Duan
952c9d56cf moved some stuff 2012-08-22 15:57:04 -07:00
Rocky Duan
3cbaba1961 fixed autosubscribe 2012-08-22 14:11:19 -07:00
Rocky Duan
3b76fe16d8 make inline page working 2012-08-22 14:04:42 -07:00
Rocky Duan
9b26a20989 fixed search highlighting 2012-08-22 12:04:32 -07:00
Rocky Duan
37c78524a8 migrated threads reloading related stuff 2012-08-22 11:07:02 -07:00
Rocky Duan
4a3975c78d adjusted frontend stuff 2012-08-21 23:33:13 -07:00
Rocky Duan
a90af0c471 render permalink in backend 2012-08-21 23:26:06 -07:00
Rocky Duan
654075e03f migrated follow thread 2012-08-21 23:08:32 -07:00
Rocky Duan
11e3276e80 update comment count based on operations 2012-08-21 17:43:20 -07:00
Rocky Duan
273af4a5ba make delete work 2012-08-21 17:15:52 -07:00
Rocky Duan
de4b477649 make edit working 2012-08-21 17:02:17 -07:00
Rocky Duan
fdf92d68f6 more refactoring; enabled partial re-rendering for votes, endorse, and closed 2012-08-21 15:26:50 -07:00
Rocky Duan
07f818da5a got reply working under backbone framework 2012-08-21 02:12:21 -07:00
Rocky Duan
9dedd532c4 some progress 2012-08-20 23:43:47 -07:00
Rocky Duan
17683c43d4 attempt to migrate more code 2012-08-20 22:24:58 -07:00
Rocky Duan
a905ac9e1d updated backbone & single thread retrieval now working 2012-08-20 22:03:46 -07:00
Rocky Duan
d189a49ee5 continue working on backbone & got vote migrated and working 2012-08-20 17:32:36 -07:00
Rocky Duan
0b3e9909a4 Merge branch 'master' into refactor
Conflicts:
	lms/djangoapps/django_comment_client/tests.py
	lms/static/coffee/src/discussion/content.coffee
	requirements.txt
2012-08-20 15:35:31 -07:00
Rocky Duan
8684ae29b2 Merge branch 'master' of github.com:MITx/mitx into refactor
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/courseware.html
	requirements.txt
2012-08-20 15:31:51 -07:00
Rocky Duan
348a7b6eb7 render time ago in front end 2012-08-20 12:04:25 -07:00
Rocky Duan
ff41338cad refactor attempt 2012-08-19 21:58:36 -07:00
Rocky Duan
12d51334f8 mustache template 2012-08-19 16:03:42 -07:00