llj
|
1b6a8479da
|
[user panel] added 'group owned library' function
|
2018-05-04 14:43:17 +08:00 |
|
llj
|
b87f0312d7
|
[js] use uncompressed js.cookie.js, for the sake of 'dist'
|
2018-04-28 15:11:33 +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
|
0ed1dd4c58
|
Merge pull request #1973 from haiwen/address-book
Address book
|
2018-04-25 16:26:12 +08:00 |
|
llj
|
5e5813072c
|
[address book] modification
|
2018-04-25 16:19:15 +08:00 |
|
llj
|
f1a24470ad
|
[address book] add 'show/set group quota', 'list/create/delete group libraries' functions
|
2018-04-24 20:08:20 +08:00 |
|
llj
|
30c0636791
|
[address book] modification: nav icon, group owner
|
2018-04-20 12:04:48 +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 |
|
xiez
|
2ade5eb2de
|
Merge pull request #2049 from haiwen/stop-zip-process
cancel zip task
|
2018-03-30 15:19:37 +08:00 |
|
llj
|
26dd0baff4
|
[cancel zip task] fixup & improvement; also added it for 'shared dir view' page
|
2018-03-30 14:53:20 +08:00 |
|
ilearnit
|
d29ab8a9ac
|
if close query zip window then stop zip process
|
2018-03-30 12:24:40 +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 |
|
zming
|
5f9033b5ff
|
sysadmin can share repo with admin permission
|
2018-01-30 17:38:30 +08:00 |
|
lian
|
ed8200b52a
|
add api for getting groups that user can share repo to
|
2018-01-17 18:22:48 +08:00 |
|
llj
|
5d2aa8af05
|
[system admin] added 'address book'
|
2018-01-04 18:06:05 +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 |
|
Daniel Pan
|
0dac3d38ca
|
Merge pull request #1941 from haiwen/feedback
added transition to show/hide of feedback messages
|
2017-12-13 18:15:47 +08:00 |
|
llj
|
b16a829ead
|
added transition to show/hide of feedback messages
|
2017-12-12 17:13: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 |
|
xiez
|
d56e107613
|
Merge pull request #1812 from haiwen/master-limit-ip
limit ip
|
2017-09-18 17:17:02 +08:00 |
|
zhengxie
|
4b37a8afe3
|
Update translation and refactor
|
2017-09-18 17:07:30 +08:00 |
|