haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-01 23:38:37 +00:00
Code Issues Releases Wiki Activity
6,937 Commits 136 Branches 455 Tags 2.5 GiB
fde748909e
Commit Graph

542 Commits

Author SHA1 Message Date
zMingGit
e387c92b99 can set sub-path permission with admin (#1962) 
* can set sub-path permission with admin

* fixup after rebase
 2018-05-18 13:46:43 +08:00
llj
8bf23d9e88 [address book] added 'rename', 'set perm', 'details' for group owned library, and etc. 
* added feedback for invalid quota input
    * modified empty tips for group
    * added 'New Department Library'
    * [group owned repo] added 'rename', 'set permission', 'details'
 2018-05-18 12:12:01 +08:00
llj
8ae359afbe [address book] fixup & improvement 2018-05-18 12:12:01 +08:00
llj
b0df96a948 [user panel] group owned library: enable group admin to set folder perm 2018-05-18 12:12:01 +08:00
llj
c0c449db48 [group] removed arrows in 'group setting' & 'group members' popups 2018-05-09 11:24:08 +08:00
llj
4a761aac0f added 'invite people' link to 'share' & 'group manage members' popup 2018-05-08 16:12:04 +08:00
Daniel Pan
38a902b22d
Merge pull request #2099 from haiwen/address-book-group-lj0507 
Address book group
 2018-05-08 10:39:36 +08:00
lian
1fd1f43177 filter out address book group when: (#2092) 
1. share library/folder
2. set folder permission
 2018-05-08 10:24:58 +08:00
llj
bed8636724 [address book] modification for UI 2018-05-07 19:55:41 +08:00
llj
1b6a8479da [user panel] added 'group owned library' function 2018-05-04 14:43:17 +08:00
zhengxie
8d10466ce9 Merge branch '6.2' 
Conflicts:
	media/css/seahub.css
	seahub/notifications/management/commands/send_notices.py
	seahub/notifications/models.py
	seahub/templates/js/templates.html
	seahub/views/__init__.py
	seahub/views/file.py
	tests/seahub/notifications/management/commands/test_send_notices.py
	tests/seahub/notifications/test_models.py
 2018-04-27 11:00:43 +08:00
llj
b383846e87 [group discussion] fixup for 'enable' option 2018-04-18 16:39:20 +08:00
llj
9306c4762f [wiki] modification 2018-04-17 16:57:59 +08:00
haiwen
3a82e7694e Merge branch '6.2' 2018-04-14 03:00:03 +00:00
lian
488c8802a3 update multi storages backend 
1. use $.isEmptyObject() check if app.pageOptions.storages is empty
2. return [] if no storage_ids setting for user role
 2018-04-13 13:27:05 +08:00
llj
cd0c7a1170 [wiki] added 'wiki list' and 'wiki' pages 
Conflicts:
	seahub/wiki/urls.py
	static/scripts/app/views/side-nav.js
 2018-03-26 13:31:41 +08:00
llj
a6026628fb [my libs] fixed js 2018-03-16 14:55:00 +08:00
llj
1182a80989 Merge branch '6.2' 2018-03-15 11:26:02 +08:00
zming
f870a6d556 trash event 2018-03-13 18:31:01 +08:00
llj
6d4000fc20 [fileupload] show error message when failed to get upload url 2018-03-02 16:11:27 +08:00
llj
88478dee1d [upgrade jquery] modifications, & cleaned up code & files 2018-02-05 16:47:56 +08:00
llj
4fd7b7acd7 [share] fix 2018-01-30 18:04:50 +08:00
lian
ed8200b52a add api for getting groups that user can share repo to 2018-01-17 18:22:48 +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
llj
32019fe305
Merge pull request #1963 from haiwen/mv-multi-fix 
[dir view] mv multi: fix
 2017-12-27 16:53:18 +08:00
llj
f88c9c5f74 [dir view] mv multi: fix 2017-12-27 16:49:11 +08:00
lian
2fe5db8c76 update lock feature 
Don't allow delete/rename/move a file when it is locked
 2017-12-27 15:03:47 +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
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
llj
d621e79bba [invite people] enable to invite multiple guests at one time 2017-12-19 12:05:51 +08:00
llj
a3600ff488 [fileupload] improvement: always full show the popup when upload files; close the popup when navigate away from a 'dir view' page 2017-12-14 17:23:01 +08:00
llj
6b31bae382 [dir view] mv/cp multi dirents: add feedback msg 2017-12-11 16:55:21 +08:00
llj
07dea7eca4 new design 2017-12-05 17:53:45 +08:00
Daniel Pan
c35ca85e1f
Merge pull request #1895 from haiwen/click-to-select 
[share.js] download/upload link: added 'click to select' feature
 2017-11-14 10:29:58 +08:00
llj
fbbfebe09a [group] fix 2017-11-13 14:28:21 +08:00
llj
ac18d5ee85 [share.js] download/upload link: added 'click to select' feature 2017-11-13 13:45:40 +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
llj
1577275095 small fix 2017-11-01 15:42:03 +08:00
llj
946002b5c6 [dir view] file comment: fix 2017-10-13 18:00:37 +08:00
llj
b772a62b1a [my libs] repo 'folder perm': fix 2017-10-13 16:08:43 +08:00
llj
101872d5c4 [my libs] repo 'share links': fixed 'icon url' 2017-10-13 14:53:26 +08:00
llj
6ac3f5ae6e [devices] fix 2017-10-10 16:16:37 +08:00
Daniel Pan
5c095ee516 Merge pull request #1842 from haiwen/file-comment 
[dir view] added 'file comment'
 2017-09-26 02:06:09 -05:00
llj
b55446551b [dir view] added 'file comment' 2017-09-26 10:35:16 +08:00
llj
c66a0bf6a7 [fileupload] fixed error msg 2017-09-25 15:29:27 +08:00
llj
2b5b811ec3 [favourites] modified file icon 2017-09-18 15:38:26 +08:00
llj
45e053a2f2 [file tags] add translation 2017-09-13 16:58:34 +08:00
llj
dafedd5f7f modified 'group-repo' 2017-09-06 16:14:27 +08:00
llj
667afb6a59 [share] share repo to group with 'admin' perm: fix 2017-09-06 16:02:12 +08:00
zming
dd7f5d5417 [API] share to groups, add test 2017-09-06 16:02:12 +08:00