haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-30 13:23:14 +00:00
Code Issues Releases Wiki Activity
6,588 Commits 142 Branches 460 Tags 2.8 GiB
30f098a5c0
Commit Graph

529 Commits

Author SHA1 Message Date
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
zhengxie
3bd12e7ad2 Merge branch '6.1' 
Conflicts:
	tests/api/test_repo.py
 2017-09-19 13:58:36 +08:00
zming
cd516a889c update test,del share_to_all_group config,del modify name 2017-09-19 11:02:37 +08:00
zming
15d5f354f7 serach-repo 2017-09-19 10:47:49 +08:00
xiez
45950be55c Merge pull request #1824 from haiwen/search-repo 
serach-repo
 2017-09-19 10:39:40 +08:00
zming
a141f2beac serach-repo 2017-09-18 17:31:47 +08:00
zMingGit
12ba328119 limit ip 2017-09-18 14:21:11 +08:00
zming
07fe7a1d23 update profile test 2017-09-12 16:07:08 +08:00
zhengxie
f364946310 Merge branch '6.1' 
Conflicts:
	seahub/api2/endpoints/admin/two_factor_auth.py
	seahub/profile/views.py
	seahub/views/sysadmin.py
 2017-09-12 14:14:15 +08:00
lian
222ffc8121 update test of user permission 2017-09-11 14:48:14 +08:00
lian
9bdbb1671a Add ENABLE_ADDRESSBOOK_OPT_IN setting 
Enable user to choose if show himself in global address book
 2017-09-11 11:13:59 +08:00
zming
74673d92b1 add unique reference and test 2017-09-09 18:00:22 +08:00
llj
45fb407368 Merge pull request #1784 from haiwen/admin-role-log 
add admin role/login feature
 2017-09-09 16:19:38 +08:00
lian
bc492b9010 add admin role/log feature 2017-09-09 15:27:04 +08:00
zMingGit
f9c16e95e1 performance, funciton name (#1795) 
* performance, funciton name

* middle

* depend with_repos, modify test
 2017-09-09 11:10:34 +08:00
xiez
0b973d854d Merge pull request #1789 from haiwen/ReferenceID 
[API] add user reference id
 2017-09-07 17:49:43 +08:00
zming
669beb936e add unique reference and test 2017-09-07 17:38:41 +08:00
zming
1044f11aea [API] add user reference id 2017-09-07 15:22:15 +08:00
zming
dd7f5d5417 [API] share to groups, add test 2017-09-06 16:02:12 +08:00
zMingGit
24232c85f7 Profile default (#1793) 
* profile -> institution test

* fix
 2017-09-06 15:35:23 +08:00
zhengxie
c004100a8a Merge branch '6.1' 
Conflicts:
	seahub/urls.py
 2017-09-04 17:07:02 +08:00
lian
6ebbce5b76 use custom logo when send email 2017-08-31 14:43:25 +08:00
lian
1266e1b237 add admin users api 2017-08-28 14:52:28 +08:00