1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-25 06:33:48 +00:00
Commit Graph

4502 Commits

Author SHA1 Message Date
llj
13ea3fcb6a show group name in path for 'group dir view'; fix updateGroups in side-nav.js 2016-01-13 14:54:46 +08:00
Daniel Pan
e669b7e7e8 Merge pull request #989 from haiwen/remove-unused-api
Remove unused APIs
2016-01-11 20:08:28 +08:00
lian
115bcfb54c [api] remove more unused group/user messages code 2016-01-11 18:23:44 +08:00
Daniel Pan
5093cd5638 Merge pull request #991 from haiwen/clean-geturl
Clean getUrl() in common.js
2016-01-11 16:35:49 +08:00
Daniel Pan
6592cfa747 Clean getUrl() in common.js 2016-01-11 16:12:30 +08:00
Daniel Pan
eb3ee08905 Merge pull request #990 from haiwen/group_settings
Group settings
2016-01-11 12:15:48 +08:00
llj
8337812bae [group manage] remove unused code and file 2016-01-11 11:58:16 +08:00
Daniel Pan
af0ab3e221 Remove unused APIs
Group messages and personal messages related API is no longer used
2016-01-11 00:02:17 +08:00
llj
0c86fb539c [group settings] complete 'import members' 2016-01-09 16:50:46 +08:00
Daniel Pan
fcfb24445e Merge pull request #985 from haiwen/update-grp-api-err-msg
update new group api err msg
2016-01-09 15:00:24 +08:00
lian
49ead4e079 update new group api err msg 2016-01-09 14:36:42 +08:00
llj
ec6679e448 add 'updateGroups' for side-nav, and other improvement 2016-01-09 14:35:16 +08:00
Daniel Pan
e1981509c6 Merge pull request #984 from haiwen/import-grp-member
ajax import group members
2016-01-08 15:49:59 +08:00
Daniel Pan
9ec433555f Merge pull request #980 from haiwen/group_settings
Group settings
2016-01-08 15:30:42 +08:00
lian
91211a683b ajax import group members 2016-01-08 15:26:15 +08:00
llj
bda85406ca [group settings] manage members: added 'add multi members once' and other improvement 2016-01-08 12:18:33 +08:00
Daniel Pan
7897bf55f6 Merge pull request #981 from haiwen/update-grp-api-test
update group api test
2016-01-06 20:15:49 +08:00
lian
44d176a45c update group api test 2016-01-06 19:12:24 +08:00
llj
e9150cf555 add 'group settings' 2016-01-06 16:46:25 +08:00
lian
0ee41ce8f3 Merge pull request #976 from haiwen/improve-error-message
Improve error message
2016-01-06 15:25:46 +08:00
lian
ed1b3204e0 Improve error message
Use 404 when repo/group not found
2016-01-06 15:25:00 +08:00
Daniel Pan
f2eae5044e Merge pull request #979 from haiwen/grp-perm-check
update perm check of group related api
2016-01-06 11:52:28 +08:00
lian
a80126c344 update perm check of group related api 2016-01-05 17:41:04 +08:00
Daniel Pan
f348dfb717 Merge pull request #977 from haiwen/update-grp-api
update grp api & add group members api
2015-12-31 15:26:24 +08:00
lian
ea963bb531 update grp api & add group members api 2015-12-31 12:58:48 +08:00
Daniel Pan
71ed6fb43c Improve error message 2015-12-31 10:13:17 +08:00
Daniel Pan
098415212f Merge pull request #929 from haiwen/force_pwd
[sysadmin] Force passwd change when add/reset user
2015-12-20 11:19:24 +08:00
Daniel Pan
9e855459eb Merge pull request #930 from haiwen/post_office
Add post_office app, and send async email to imported csv users
2015-12-20 11:17:41 +08:00
llj
800856e305 [backbone] remove unused code and files 2015-12-19 13:51:38 +08:00
llj
13486afe57 [add group] fix: modified param name according to the api 2015-12-19 10:29:05 +08:00
xiez
2c47c5c49b Merge pull request #943 from haiwen/group-members-api
[api-v2.1] update groups api & add get group members api
2015-12-15 15:09:05 +08:00
lian
5bbd92bb6d [api-v2.1] update groups api & add get group members api 2015-12-15 14:38:25 +08:00
xiez
922b4411ba Merge pull request #942 from haiwen/redesign
Redesign
2015-12-15 11:59:52 +08:00
llj
21f791ec4e Merge pull request #941 from haiwen/group_members
[group members] redesigned it
2015-12-15 11:48:48 +08:00
llj
de63d7284c [group members] removed some spaces 2015-12-15 11:33:07 +08:00
zhengxie
9404af609d Add post_office app, and send async email to imported csv users 2015-12-15 11:32:34 +08:00
llj
1f15e38752 [group members] use double size for member avatars 2015-12-15 10:59:44 +08:00
llj
03d075a00b [group members] redesigned it 2015-12-11 20:58:29 +08:00
lian
ce77796a49 Revert "[api] update search user api"
This reverts commit c33941e0e4.
2015-12-09 16:53:31 +08:00
xiez
41ff991f2b Merge pull request #939 from haiwen/search-user
[api] update search user api
2015-12-09 15:21:58 +08:00
llj
4c3e5ab067 [group] dir view: bugfix for side nav 2015-12-09 15:13:33 +08:00
lian
c33941e0e4 [api] update search user api
1. not return unregistered user
2. add arg to control if return myself
2015-12-09 15:12:48 +08:00
xiez
b67f4f7fc9 Merge pull request #936 from haiwen/groups-api
update groups api
2015-12-09 10:42:36 +08:00
lian
c31f201d5b update groups api 2015-12-08 18:43:32 +08:00
xiez
038a6122b4 Merge pull request #932 from haiwen/grps-api
[api-v2.1] update transfer group api
2015-12-08 16:58:40 +08:00
lian
46d9fea299 [api-v2.1] update transfer group api 2015-12-08 16:40:17 +08:00
Daniel Pan
30fc64d5e7 Merge pull request #933 from haiwen/group_icons
[group] modified icons
2015-12-08 16:28:37 +08:00
llj
8469c3331a [group] modified icons 2015-12-08 16:00:34 +08:00
zhengxie
054ef03687 [sysadmin] Force passwd change when add/reset user 2015-12-08 11:33:26 +08:00
xiez
7da8a3e8b2 Merge pull request #926 from haiwen/update-grps-api
[api2.1] add rename, transfer and delete group api
2015-12-07 14:07:14 +08:00