1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-14 15:35:35 +00:00
Commit Graph

13877 Commits

Author SHA1 Message Date
xiez
24b3f6d359 Merge branch 'lj_grpmsg' into groupmsg-rebase
Conflicts:
	group/models.py
	group/templates/group/group_info.html
	group/views.py
	media/css/seahub.css
2012-06-26 19:35:07 +08:00
xiez
5be0aa3175 Modify group msg notification to make index friendly. 2012-06-26 19:23:33 +08:00
xiez
df4ac6ab02 Add index 2012-06-26 19:23:32 +08:00
xiez
5b39f73488 Modify group msg notification 2012-06-26 19:23:32 +08:00
xiez
29eb8ad6c9 Fix rebase bug 2012-06-26 19:23:32 +08:00
xiez
9717f9a7ec Add user notification 2012-06-26 19:23:32 +08:00
xiez
83c0242d78 Add group message feature 2012-06-26 19:23:32 +08:00
llj
1c28e63761 improved group-msg 2012-06-26 17:41:28 +08:00
xiez
da57141684 Add group message feature 2012-06-26 17:41:28 +08:00
llj
e03c3205f7 add jquery-jtemplates.js 2012-06-26 17:40:56 +08:00
xiez
b6c80ac9bc Modify ccnet_rpc 2012-06-25 21:12:56 +08:00
killing
e86aa244c7 Use threaded rpc. 2012-06-25 20:52:57 +08:00
xiez
d342f92758 Merge branch 'lj_profile' 2012-06-25 16:18:40 +08:00
llj
7b57fbbaaa show user-profile in popup 2012-06-23 16:12:54 +08:00
xiez
7a0a5509b7 Fix bug in seafile_access_check 2012-06-23 10:26:37 +08:00
xiez
c6146ef370 Modify avatar radius 2012-06-22 19:09:54 +08:00
xiez
4862910132 Modify avatar border-radius 2012-06-22 17:24:07 +08:00
xiez
9841f2c478 Merge branch 'lj_profile' 2012-06-22 17:22:52 +08:00
llj
9c486f1a07 fix merge bug in set_profile 2012-06-22 16:07:17 +08:00
llj
329e7f4b97 Merge branch 'xiez_profile' into lj
Conflicts:
	profile/templates/profile/set_profile.html
	profile/templates/profile/user_ids.html
	profile/views.py
2012-06-22 15:51:32 +08:00
llj
9a7fa79a17 improved set_profile 2012-06-22 11:51:26 +08:00
xiez
68d63efcb4 Modify form 2012-06-21 22:48:06 +08:00
xiez
d477e543e7 Modify profile 2012-06-21 20:53:13 +08:00
llj
d8c5604687 improved home-profile 2012-06-21 15:26:03 +08:00
llj
c4bac01f1b modified default avatar 2012-06-21 13:43:59 +08:00
llj
5f021a5624 add 'user-profile' 2012-06-21 13:27:23 +08:00
llj
473cf33b97 show 'profile' in home;add profile-modify in setting 2012-06-21 13:27:23 +08:00
xiez
bd54b31a0a Don't use sub domain in default. 2012-06-21 13:19:38 +08:00
xiez
05f709a1a2 Modify share link view 2012-06-20 21:38:07 +08:00
xiez
9c4a54931f Add org account feature 2012-06-20 19:39:21 +08:00
xiez
5b96dc2ab2 Merge branch 'xjq' 2012-06-15 10:12:25 +08:00
killing
556d9b6a81 Modified file access URL. 2012-06-14 20:24:11 +08:00
llj
3f39de1c3c improved seafile_access_check 2012-06-14 16:27:24 +08:00
xiez
795db175ec Fix bug in rpc calls with bool args 2012-06-14 16:20:19 +08:00
xiez
0443d88a0e Fix get_diff bug 2012-06-13 19:57:06 +08:00
llj
491ba973d0 modified css for ff 2012-06-12 10:56:12 +08:00
xiez
e4c2899124 Merge branch 'lj' 2012-06-12 10:18:41 +08:00
xiez
705f86e68d Add anonymous share feature 2012-06-12 10:15:47 +08:00
xiez
82263b6787 Remove web access setting on repo page 2012-06-11 19:58:53 +08:00
llj
0f6c96680b modified css for narrow-panel h2 2012-06-11 14:13:14 +08:00
llj
d97b51d8ce modification for ff 2012-06-11 13:22:22 +08:00
lins05
2e134f92d5 [server-setup] use port 13420 in seafile_access_check 2012-06-07 11:46:48 +08:00
xiez
1967697025 Merge branch 'xjq' 2012-06-06 20:03:27 +08:00
killing
a6dcdda71c Allow viewing encrypted repo directory/file. 2012-06-06 19:32:27 +08:00
llj
01f65e4f22 modification for ie 2012-06-06 17:34:42 +08:00
xiez
7abacb8b6a Disable notification cache 2012-06-06 13:55:55 +08:00
xiez
c5daf3879a Fix bug in HTTP_REFERER 2012-06-05 19:38:28 +08:00
xiez
07e74346f3 Add missing icon 2012-06-05 09:56:53 +08:00
xiez
f9c72b57a4 Add notification at info-bar, and fix bug in visiting register/login page when user is already logged in. 2012-06-04 21:27:32 +08:00
plt
28dbc2ad73 Improve repo and repo_history_dir 2012-06-01 02:20:35 +08:00