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

312 Commits

Author SHA1 Message Date
plt
4bb5cb2582 Make color of msg relay buttons lighter 2012-10-20 10:41:38 +08:00
zhengxie
aaf614b6eb Fixed bug in hide reply messages 2012-10-19 09:59:05 +08:00
zhengxie
ff1aa89f35 Added role control when removing group msg 2012-10-18 13:55:24 +08:00
zhengxie
faba380ebe Modify msg delete button 2012-10-18 13:22:38 +08:00
zhengxie
7429045c0f Added group msg remove feature 2012-10-18 10:57:54 +08:00
zhengxie
6cd0df1a1d Disable button when perform ajax post 2012-10-12 21:12:18 +08:00
zhengxie
7088daf7c3 Added pubinfo page 2012-10-11 14:34:08 +08:00
zhengxie
7fe8376866 Modify org groups 2012-10-11 12:59:38 +08:00
llj
11220f2ce5 [group]modified avatar of msg-form; modified basic-info 2012-10-10 19:43:58 +08:00
llj
be89036fcb Merge branch 'lj_group' 2012-10-10 18:20:19 +08:00
llj
4f67c85694 [group]added basic-info 2012-10-10 18:11:13 +08:00
llj
ece34c58fa [group]added avatar to msg-form 2012-10-10 17:09:39 +08:00
zhengxie
d02200f67c Remove bulb tips 2012-10-10 16:01:48 +08:00
llj
0c6c2b1d2a [groups]clean code 2012-10-10 15:54:17 +08:00
llj
8b44047240 [group_info]modified right panel with 'info-item' 2012-10-10 15:13:48 +08:00
zhengxie
3de1d68209 Add bulb-tips 2012-10-10 11:38:33 +08:00
llj
3637ee4c4e [groups]modified right panel 2012-10-10 11:16:49 +08:00
zhengxie
b98fe8b0ac Fixed autocomplete bug 2012-10-10 10:45:10 +08:00
zhengxie
2d22e92dd5 Change tips style 2012-10-09 22:24:40 +08:00
zhengxie
05bf9ea8e6 Modify empty tips 2012-10-09 21:47:54 +08:00
ZhengXie
41d0b33b77 Changed repo name 2012-10-09 14:38:13 +08:00
ZhengXie
1c6a40636c Modified at_pattern, disable adding link to email in seahub_urlize; Fixed repo create bug 2012-10-09 10:22:37 +08:00
ZhengXie
75ac577fea Use ajax in group message autocomplete 2012-09-28 22:43:25 +08:00
llj
45e46b8dd1 Merge branch 'lj' 2012-09-28 11:59:03 +08:00
xiez
db2e9c228f Modify group management page 2012-09-28 10:47:51 +08:00
llj
4efed862ee modified repo icons and added title to them 2012-09-27 19:15:55 +08:00
llj
8791da008f modified repo page:interaction & file-rename popup; modified 'r' repos icon 2012-09-27 16:43:45 +08:00
xiez
64bd2247bb Disable add unregistered user to group 2012-09-26 20:22:09 +08:00
xiez
91d3d78dda Add group public page 2012-09-26 20:04:34 +08:00
xiez
5b4468ea7c Modify org groups 2012-09-26 20:03:59 +08:00
killing
d30f7c4bbb Clean up shared repo listing code and add permission for public repos. 2012-09-26 19:20:21 +08:00
llj
895725b9fc add icon for repos;added op icon back in repo page;modified css of title-panel 2012-09-26 15:15:08 +08:00
llj
a447c03ae7 modified layout & ui of some pages 2012-09-25 20:49:58 +08:00
plt
ba936001b5 Modify groups tip 2012-09-24 17:36:54 +08:00
xiez
2a4ac3a601 Modify groups page 2012-09-24 16:30:23 +08:00
xiez
7f24c337c7 Change group label name 2012-09-24 10:10:01 +08:00
xiez
8fed1fa766 Change sync repo to download repo 2012-09-22 19:50:40 +08:00
xiez
db365fc35d Modify home page 2012-09-22 19:17:22 +08:00
xiez
b16b7ece18 Allow share repo to unjoined group 2012-09-22 17:46:56 +08:00
xiez
bde9b0fc3b Fixed bug when unshare repo in group, and view groups in org. 2012-09-21 19:38:53 +08:00
killing
803780ea39 Add read/write permission to share. 
Also check permission in various operations.
 2012-09-21 11:38:05 +08:00
llj
876155cb12 Merge branch 'lj_fileview' 2012-09-20 11:58:53 +08:00
llj
83e430efdb [file_comment]show comments when enter file-view from link in grp msg 2012-09-20 10:45:09 +08:00
xiez
de4cc456ea Add unregistered user to group 2012-09-19 19:52:35 +08:00
xiez
9c93e1a740 Clean business group add 2012-09-18 14:06:20 +08:00
xiez
00460468cb Add business groups 2012-09-18 10:43:50 +08:00
llj
dcc65b7fe8 [msg-reply]changed textarea into input 2012-09-17 16:36:49 +08:00
xiez
874d375de5 Merge branch 'feature/public_msg' 
Conflicts:
	base/models.py
	views.py
 2012-09-15 13:18:13 +08:00
lins05
5f1eccbec5 add file contributor list when view file 2012-09-15 12:00:59 +08:00
xiez
35137b75f4 Clean code 2012-09-15 10:57:32 +08:00
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