haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-06-27 07:28:42 +00:00
Code Issues Releases Wiki Activity
1,689 Commits 133 Branches 451 Tags 2.1 GiB
bfd6b51a71
Commit Graph

312 Commits

Author SHA1 Message Date
xiez
32f7463a1d Added innpub messages 2012-09-14 22:15:14 +08:00
xiez
c8d708980c Fix recommend in org context 2012-09-14 11:39:33 +08:00
xiez
51da061d8e Clean code 2012-09-12 11:35:43 +08:00
xiez
3610e94ebb Translate group error messages 2012-09-07 16:14:36 +08:00
xiez
066618c6f9 Modify org repo share tips 2012-09-06 17:38:29 +08:00
xiez
05b492dff8 Using ajax in add group member 2012-09-06 17:20:15 +08:00
xiez
4bf9851c65 Modify org msg 2012-09-06 16:57:54 +08:00
xiez
131dc40f32 Show group add error msg in ajax 2012-09-06 13:22:16 +08:00
llj
ba7d40e2be Merge branch 'lj_public' 2012-09-06 10:50:27 +08:00
xiez
69dde60743 Change op button 2012-09-04 17:15:19 +08:00
llj
5eba73832a [user_profile]extracted user_profile popup code and included them in grp_info,org_info,public_home 2012-09-04 16:13:06 +08:00
plt
cc5cb86704 Improve several page 2012-09-04 11:27:15 +08:00
xiez
1e8014839f Added share src in inner pub page 2012-09-03 19:36:47 +08:00
xiez
d138bee164 Fixed bug in org repo share, and clean code 2012-09-03 16:14:15 +08:00
xiez
29c9ff11df Added org repo share 2012-09-03 12:04:14 +08:00
xiez
12a6e0a87f Fixed a few bugs related to org. Using with tag to wrap template include 2012-09-01 17:48:26 +08:00
llj
f016c1e226 [msg-reply]improved cursor pos set of reply-at 2012-09-01 15:15:56 +08:00
llj
0c0da9f7b4 Merge branch 'lj_reply' 2012-09-01 14:44:17 +08:00
llj
7e534e4631 [msg-reply]when reply_cnt is 0, click 'reply' makes no ajax request 2012-09-01 14:33:05 +08:00
xiez
4bb8375191 Fixed function param bug 2012-09-01 11:55:38 +08:00
llj
69821fc12f Merge branch 'lj' 2012-09-01 11:16:13 +08:00
llj
7025d8b3c7 [@]fix line-height bug for ie 2012-08-31 21:22:31 +08:00
xiez
f26bfb5727 Fix bug in render error 2012-08-31 19:37:22 +08:00
xiez
5ad09999c7 Add context switch decorator 2012-08-31 17:28:50 +08:00
llj
9ef3d6158f modified msg-reply;modified atAutocomplete member_list js 2012-08-31 16:12:41 +08:00
xiez
1e4d831f46 Remove session storage in context switch 2012-08-30 20:27:28 +08:00
llj
01bd71713e [@]improved menu position 2012-08-30 11:44:51 +08:00
llj
6724835be1 [group]enable group member profile cache 2012-08-27 11:32:32 +08:00
plt
6d9854eb8a Fix bug 2012-08-26 17:29:29 +08:00
xiez
37c0f934bc Add file comment feature 2012-08-26 11:50:57 +08:00
xiez
b40d65fcb9 Show nickname in group page 2012-08-25 10:48:00 +08:00
plt
080f8783e0 Encode recommend file path 2012-08-21 23:16:16 +08:00
xiez
1107f7035b Add pinyin autocomplete in group message 2012-08-20 16:51:23 +08:00
xiez
12b63f3e7a Add basic autocomplete for @ 2012-08-19 13:37:10 +08:00
xiez
871580ae0b Add repo create related js to sigle file 2012-08-18 18:02:31 +08:00
lins05
3d9e6ba46e create a shared repo in group page 2012-08-18 17:25:42 +08:00
plt
3d167a58d0 Put linebreaker after urlize in display message 2012-08-18 11:47:09 +08:00
llj
59589db5e7 [msg-reply]set cursor position of reply-input;improved reply js 2012-08-17 14:56:59 +08:00
llj
8072882960 modified group msg reply 2012-08-16 20:20:41 +08:00
xiez
7d4f7a0b75 Modify group unittest 2012-08-16 19:19:08 +08:00
xiez
abba5069b0 Modify group message 2012-08-16 19:11:28 +08:00
xiez
7cb4834e9e Modify group reply nickname 2012-08-16 18:04:35 +08:00
xiez
7f055aa307 Modify new msg reply 2012-08-16 17:54:21 +08:00
llj
fd416e356e modified new_msg_reply & msg_reply 2012-08-16 17:13:53 +08:00
xiez
31bc49b464 Change message reply counting 2012-08-15 17:39:59 +08:00
xiez
9fe2d9c28f Change message attachment querying 2012-08-15 17:25:46 +08:00
llj
432c2473cc modified msg-reply 2012-08-15 10:29:34 +08:00
xiez
c9e37ac5c4 Modify group recommend. 
* Get all groups a repo shared, then find out groups that user joined.
 2012-08-14 17:53:58 +08:00
plt
efe69478d4 Change foreign key querying 2012-08-14 14:50:25 +08:00
xiez
5219347ef8 Modify recommend message and fix profile cache bug 2012-08-14 13:27:27 +08:00
xiez
b9f2678220 Enable avatar cache, and fix recommend bug 2012-08-14 10:44:28 +08:00
xiez
76c9398522 Modify recommend message 2012-08-13 21:43:34 +08:00
xiez
4f64802e22 Modify group recommend 2012-08-13 21:26:58 +08:00
llj
8655880d0e fixed rebase bug 2012-08-13 16:38:32 +08:00
llj
e89f2ff67a modified recommend 2012-08-13 16:30:21 +08:00
xiez
38af45911e Fix bug 2012-08-13 16:26:22 +08:00
xiez
339445cf5e Recommend directory to group 2012-08-13 15:58:54 +08:00
xiez
01b355a0f6 Merge branch 'recommend' 
Conflicts:
	media/css/seahub.css
	views.py
 2012-08-13 10:46:07 +08:00
xiez
acf221aece Update group unit test 2012-08-11 00:03:59 +08:00
xiez
f15fecdcf1 Fix bug 2012-08-10 21:20:01 +08:00
xiez
bfefa7df70 Add basic recommend feature 2012-08-10 21:17:28 +08:00
llj
09d42ff13c modified msg-reply, msg 2012-08-10 16:31:39 +08:00
xiez
62949c84da Add basic group unit test 2012-08-09 23:30:10 +08:00
xiez
a8ff4ef7bc Update and fix typo 2012-08-09 17:13:34 +08:00
xiez
63279afeea Change group reply ajax, and modify reply 2012-08-09 16:50:39 +08:00
xiez
f58addfa68 Modify message reply notification 2012-08-09 16:50:39 +08:00
xiez
0305c3245f Add message reply notification 2012-08-09 16:50:39 +08:00
xiez
94b1d26409 Make avatar test pass, ans add some other basic tests. 2012-08-08 10:09:02 +08:00
xiez
85fb879c74 Refactor auth and rename CcnetUser to User 2012-08-07 16:48:26 +08:00
xiez
09a0640481 Fix bug in orgadmin remove group 2012-08-04 11:00:49 +08:00
xiez
b187acdb13 Add autocomplete when send file shared link 2012-08-03 14:01:24 +08:00
xiez
bde88e09b6 Modify group 2012-08-03 11:33:23 +08:00
xiez
574a7a7da8 Fix org bug and clean code 2012-08-02 21:49:17 +08:00
xiez
edbc6de917 Wrap get_group rpc 2012-08-01 22:45:58 +08:00
llj
9ae6fa9653 added 'reminding';modified team-account, new_msg_reply, group_info 2012-08-01 17:54:08 +08:00
xiez
7a850c7953 Modify repo share. 
* Email unregistered user when sharing repo.
* Add email to contacts when share repo/file and add group user.
* Remove org repo share link.
 2012-07-31 15:02:18 +08:00
plt
1779ecfa3d Improve at_find tag and urlize tag 2012-07-31 12:30:09 +08:00
xiez
391c25fa40 Fix new line bug in leaving message and escape message replies to show <br /> 2012-07-31 10:51:50 +08:00
xiez
220f9c9c24 Change error function names 2012-07-30 20:44:32 +08:00
xiez
ad6dfbab7b Add index to groupmessage and fix typo. 2012-07-30 20:19:17 +08:00
xiez
862723e1d8 Modify org user add 2012-07-27 23:35:35 +08:00
xiez
0132e4e85d Modify org 2012-07-27 23:35:35 +08:00
plt
a9129c9e1f Find '@<name>' in group messages 2012-07-24 14:00:27 +08:00
llj
65a1b667dd improved ui of group avatar;added link to user avatar 2012-07-23 17:36:07 +08:00
plt
0b02cec341 Change download to sync 2012-07-20 14:22:39 +08:00
llj
692b548290 [group_info]improved contact_add & ajax post 2012-07-19 21:18:14 +08:00
llj
ef95e145d4 modified grp member-add & repo-op 2012-07-19 14:06:18 +08:00
xiez
9c71c002a0 Move group_avatar from group to avatar. 2012-07-14 20:17:40 +08:00
llj
75b724a169 added func: set group avatar 2012-07-14 20:17:40 +08:00
llj
774b9a3bc6 [group_info]show contact_add result in the current page 2012-07-12 16:11:29 +08:00
xiez
4543be8649 Fix org related bugs 2012-07-09 14:24:20 +08:00
xiez
402b9ab0ce Fix bugs 
* Only repo owner or person who shared this repo can view repo page.
* Remove group user even when user is deleted by admin.
* Paginator link on admin page.
 2012-07-09 10:37:42 +08:00
xiez
d6c0963589 Clean code and fix bug in org 2012-07-05 11:52:12 +08:00
xiez
21f502ee0b Merge branch 'lj' 2012-07-04 10:56:18 +08:00
xiez
e173920670 Add url_target_blank filter 2012-07-03 23:05:35 +08:00
llj
5ae730524d modified groups 2012-07-03 17:29:27 +08:00
xiez
a94bfe0c84 Add link in group message 2012-07-03 17:06:10 +08:00
xiez
3c5399eda6 Fix bug 2012-06-29 10:21:24 +08:00
xiez
89eb1714d7 Modify page 2012-06-29 10:16:10 +08:00
xiez
6f7860c183 Fix bug 2012-06-28 20:07:39 +08:00
xiez
6a77ab10b0 Sort repos im myhome and group page 2012-06-28 20:02:17 +08:00
xiez
05a4cc9d0a Add repo last modify time 2012-06-28 19:28:23 +08:00
xiez
c824155ac7 Modify group message time format 2012-06-27 20:22:42 +08:00
xiez
1be271353e Mofigy group msg reply notification 2012-06-27 19:56:11 +08:00
xiez
8cd03c94cb Notify group message reply 2012-06-27 16:39:49 +08:00
xiez
2373c8c24c Merge branch 'lj' 2012-06-27 13:43:39 +08:00
llj
dd3b28c70a improved grp msg 2012-06-27 13:41:27 +08:00
llj
544cc7fb00 improved popup profile 2012-06-27 11:39:19 +08:00
xiez
7779940b98 Modify group message length to 500 2012-06-27 11:27:00 +08:00
xiez
e407679287 Fix bug in show popup avatar in group-info page 2012-06-26 23:39:45 +08:00
xiez
c32e4e84b9 Fix bug in nickname link showed in group msg reply 2012-06-26 22:01:36 +08:00
xiez
4ea4425783 Show nickname in reply in group-info page 2012-06-26 20:48:46 +08:00
xiez
5d2c90f122 clean code 2012-06-26 20:03:24 +08:00
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
killing
e86aa244c7 Use threaded rpc. 2012-06-25 20:52:57 +08:00
llj
7b57fbbaaa show user-profile in popup 2012-06-23 16:12:54 +08:00
xiez
d477e543e7 Modify profile 2012-06-21 20:53:13 +08:00
llj
5f021a5624 add 'user-profile' 2012-06-21 13:27:23 +08:00
xiez
9c4a54931f Add org account feature 2012-06-20 19:39:21 +08:00
xiez
c5daf3879a Fix bug in HTTP_REFERER 2012-06-05 19:38:28 +08:00
llj
17f2cf1c40 modified layout of group_info & group_manage 2012-05-31 20:03:02 +08:00
llj
5f4c50e141 modified column width of tables 2012-05-31 19:21:07 +08:00
llj
03da1d073e [repo_history]modified td width;[group_info]changed op-link to icon 2012-05-30 20:23:46 +08:00
llj
54025bdecc modified group_info & group_manage 2012-05-30 20:23:46 +08:00
xiez
a4ff981110 Merge branch 'group_admin' 
Conflicts:
	group/views.py
 2012-05-28 16:40:37 +08:00
xiez
a75e3b699d Add groupadmin feature 2012-05-26 20:52:53 +08:00
xiez
cacebb25c5 Fix bug in remove shared repo in group, and clean code. 2012-05-26 15:31:35 +08:00
xiez
5cce21353d Add permission control in remove shared repo. 2012-05-26 14:49:38 +08:00
llj
6b5c2fef4e modified avatar related pages-base, group_info, avatar_change 2012-05-25 17:15:15 +08:00
xiez
4c20e49613 Make basic avatar operations work. 2012-05-24 20:20:08 +08:00
xiez
6108b8c276 Fix bug in remove group member 2012-05-23 11:19:37 +08:00
xiez
8c0b3ca8dd Refactor group urls 2012-05-23 11:16:39 +08:00
llj
fbe3a65e70 [group]fixed bug for group-rm 2012-05-23 11:14:44 +08:00
llj
2ac9c9b7f6 [group-member-add]enable add more than one at one time 2012-05-22 16:18:34 +08:00
xiez
2d3f38397c Translate repo history page and formate modual import 2012-05-20 20:32:21 +08:00
llj
b97b98261b fix bug in autocomplete 2012-05-19 22:55:43 +08:00
llj
539e324ccc modified style of h2, group-member-add 2012-05-19 22:55:43 +08:00
llj
b395acf9a1 add 'addAutocomplete' func; add autocomplete to add-group-member; modified repo-share 2012-05-19 22:55:43 +08:00
llj
b004f6df92 modifed group-member-icon;rewrite confirm dialog;add confirm to rm group 2012-05-19 22:55:43 +08:00
xiez
2ba76b485c Modify group page 2012-05-18 13:54:30 +08:00
llj
43d5089057 modified repo, group_info 2012-05-18 11:47:59 +08:00
xiez
db2419c598 Modify group page 2012-05-17 23:50:04 +08:00
plt
af96c3085e Improve group css 2012-05-17 23:59:16 +08:00
llj
24a760758c modified top-bar, repo, contact_list, user admin pages 2012-05-17 20:40:40 +08:00
llj
a054f4a3f5 modified base ui, repo, group, contact 2012-05-17 14:16:46 +08:00
llj
3912e0d20c modified group related code; modified repo & contact 2012-05-17 13:14:29 +08:00
xiez
e04d6fab06 Modify group manage page 2012-05-17 11:53:48 +08:00
xiez
91dbc381f4 Add group management, and modify repo download link 2012-05-16 21:32:49 +08:00
xiez
3beb36982c Modify group info page 2012-05-15 14:43:52 +08:00
xiez
479a7605de Modify page and clean code 2012-05-15 14:29:37 +08:00
xiez
1de93aa036 Show groups on myhome.html 2012-05-15 11:23:28 +08:00
xiez
d63b068b2d Add group feature 2012-05-15 11:01:32 +08:00
plt
67e0ce2fb6 Add contact and share app 2012-02-11 11:12:54 +08:00
plt
29b7e1d334 Add group app 2011-09-10 20:14:08 +08:00