1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 23:20:51 +00:00
Commit Graph

651 Commits

Author SHA1 Message Date
zming
5f9033b5ff sysadmin can share repo with admin permission 2018-01-30 17:38:30 +08:00
xiez
f797d2d523 Merge pull request #1985 from haiwen/fs-encrepo
Fix shared link in enc repo and update tests
2018-01-29 10:43:26 +08:00
lian
148e382425 add admin copy file/folder api 2018-01-24 13:01:19 +08:00
zhengxie
eb952e2041 Fix demo account 2018-01-22 18:30:37 +08:00
lian
c9968d59e6 update get group repo test 2018-01-20 14:38:03 +08:00
zhengxie
4315f29aa2 Fix shared link in enc repo and update tests 2018-01-20 14:13:47 +08:00
xiez
14f143fe47 Merge pull request #1968 from haiwen/groups-for-repo-share
add api for getting groups that user can share repo to
2018-01-17 19:04:14 +08:00
lian
ed8200b52a add api for getting groups that user can share repo to 2018-01-17 18:22:48 +08:00
lian
0c173a12ac use new get group repos api 2018-01-17 16:07:30 +08:00
zhengxie
2abfa3fd53 Update tests 2018-01-11 16:35:14 +08:00
zhengxie
efac7b598f Fix tests 2018-01-11 15:50:22 +08:00
zming
0affd2fc1f license file type invalid && update test 2018-01-10 18:49:55 +08:00
ilearnit
4b7ec9de27 Delete user option (#1979)
* Remove user all options

* delete space

* delete space

* debug sapce
2018-01-10 17:28:28 +08:00
xiez
f5daddfef3 Merge pull request #1965 from haiwen/guest-login-notify
[notification] Notify inviter on guest accept invitation.
2018-01-09 13:23:50 +08:00
xiez
93b131a8ab Merge pull request #1975 from haiwen/notify_admin_after_register
Notify admins after register
2018-01-09 11:43:51 +08:00
xiez
a03f3066c0 Merge pull request #1971 from haiwen/upload_invalid_type
upload with invalid type
2018-01-08 16:05:29 +08:00
zming
295b567b84 upload with invalid type 2018-01-08 16:00:55 +08:00
zhengxie
ed8a549458 Notify admins after register 2018-01-06 16:53:48 +08:00
zhengxie
2d4c3e2ce2 [sudo] Update tests 2018-01-05 11:56:47 +08:00
zhengxie
4b326ad404 [auth] Refactor login attempts 2018-01-04 17:32:30 +08:00
zhengxie
f0a60418e4 [address book] Add admin api 2018-01-04 17:25:19 +08:00
zhengxie
f4734b161a [notification] Notify inviter on guest accept invitation. 2017-12-29 14:15:20 +08:00
zhengxie
d37144ef75 Merge branch '6.2'
Conflicts:
	seahub/templates/base.html
	static/scripts/app/views/dir.js
	static/scripts/common.js
2017-12-28 15:47:18 +08:00
xiez
baeb8ccacf Merge pull request #1952 from haiwen/invite-multi
[invite people] enable to invite multiple guests at one time
2017-12-25 13:32:42 +08:00
zming
9adadb6e7d tests 2017-12-22 12:13:42 +08:00
lian
d4cf67e324 multi storage backend
1. add multi storage backend support
2. add 'storage_ids' user role
2017-12-19 15:41:36 +08:00
xiez
78cd00bd13 Merge pull request #1938 from haiwen/search-link
search link
2017-12-13 17:56:57 +08:00
zming
cd260c0718 review 2017-12-13 17:26:50 +08:00
zming
b82c141afe review again 2017-12-13 14:33:13 +08:00
zming
3ec7684d46 search link 2017-12-11 16:29:38 +08:00
lian
0500f441a8 update file history page/api
1. user with `r` and `rw` permission can view file history
2. add new file history api
2017-12-11 11:18:19 +08:00
zhengxie
0acf8254aa Merge branch '6.2' 2017-12-05 15:04:56 +08:00
xiez
43e125bbd6 Merge pull request #1915 from haiwen/sysinfo-test-update
update sysinfo test
2017-11-20 23:34:37 -06:00
zming
c9e32ce94f update sysinfo test 2017-11-21 13:14:15 +08:00
zming
b3b61667a3 fixed when get all revision tag 2017-11-21 12:22:23 +08:00
zMingGit
b91f394a43 fixed test (#1911) 2017-11-20 21:18:19 -06:00
zMingGit
b5b55b1640 revision delete by name(user) (#1903)
* revision delete by name(user)

* review
2017-11-20 16:37:09 +08:00
zming
2be35db8df del statistics by hour(user activity, total storage) 2017-11-17 17:06:29 +08:00
lian
2a680b83c6 update tests of shared repos 2017-11-14 16:01:31 +08:00
zMingGit
05caf621f1 Userinfo contactemail (#1894)
* Show contact_email on user profile

I think it would be good to have the edit functionality for that
attribute, too, but I did not implement that right now.
It's marked with TODO though.

* update api and tests

* review
2017-11-14 14:12:27 +08:00
lian
cf480de31b Merge branch '6.2' 2017-11-09 15:27:50 +08:00
zming
f2168d9602 add fileuuidmap to filecomment & del seahub signal 2017-11-06 15:58:41 +08:00
lian
c88ff295c1 add new group libraries api (#1835) 2017-11-03 12:04:07 +08:00
zMingGit
f5d1be1f59 share permission refactor (#1843)
* rebuild

* share admin

* use seafile_api

* rebase 6.2

* complete test

* api changed

* some error

* break up to two method

* review

* js review
2017-11-01 18:13:51 +08:00
zming
c1d7b588e3 update notification 2017-10-26 10:04:16 +08:00
lian
36cdff75aa add admin api for get info of a single repo 2017-10-21 04:33:48 -07:00
zMingGit
58ca1084ac comment paging (#1867)
* comment paging

* test
2017-10-19 15:24:59 +08:00
zming
c09c3d0c6b fixed test 2017-10-13 13:10:05 +08:00
zming
0f97c18558 client create enc library with disable enable_enc_library test 2017-09-27 16:58:51 +08:00
zMingGit
2feb8ae575 [api] Add users in bulk from excel, export batch add user help file, add (#1792)
* [api] Add users in bulk from excel, export batch add user help file, add
test

* remove csv feature

* review

* column width, del tip, add head

* del write_xls_sample, modify head

* review

* download text

* option->optional, trans
2017-09-26 10:33:36 +08:00