1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-07-30 22:34:53 +00:00
Commit Graph

8262 Commits

Author SHA1 Message Date
lian
3eaa8e0b61 update role permission (#2390)
set custom(not default and guest) role's permission to False
if not configured in seahub_settings.py
2018-09-20 16:42:29 +08:00
lian
9286266150 update file history api (#2389)
remove unused paginator links header
2018-09-20 16:12:50 +08:00
lian
dddf7aee24 add utc_datetime_to_isoformat_timestr func (#2387) 2018-09-20 15:09:52 +08:00
WangJianhui666
d18dea8c0b modify-files-activities (#2386) 2018-09-20 13:23:24 +08:00
shanshuirenjia
ba583d6efd Draft dashboard optimized (#2384)
* create a common toolbar component

* optimized code

* combine side-panel

* add change state
2018-09-20 10:19:11 +08:00
zhengxie
9db3957030 [ajax] Fix upload link token 2018-09-19 16:09:23 +08:00
zheng xie
60bcb153df
Merge pull request #2382 from haiwen/copy-dirent
update ajax multi copy dirents
2018-09-19 14:32:33 +08:00
lian
50ec9f7bdc update ajax multi copy dirents
fix bug when copy directory its subdirectory
2018-09-19 14:25:58 +08:00
lian
f2ec69c043
Merge pull request #2374 from haiwen/6.3-admin-rename-lib
admin-rename-lib
2018-09-19 14:12:13 +08:00
plt
7a17e908b0 Small style fixes 2018-09-19 11:24:54 +08:00
ilearnit
0e6bacac9b [dist] frontend 2018-09-19 10:48:48 +08:00
ilearnit
d0b0f664aa add getDraftKey 2018-09-19 10:47:56 +08:00
llj
3fa4a88a96 [invitation] delete: modification (#2379) 2018-09-19 10:08:51 +08:00
shanshuirenjia
db47fb34a7 Wiki coding style improve (#2380) 2018-09-19 09:57:17 +08:00
C_Q
3d165ec733 Update tmp (#2373)
* fix file history time

* change activities url to dashboard

* remove serverRoot from dashboard

* fix api name

* Repair some components are not display

* fix code style

* rename file

* init seafileAPI

* update search

* update seafile-editor seafile-js

* debug rebase

* fix activities loading

* fix drafts css

* add permission
2018-09-18 10:11:37 +08:00
zhengxie
4227689c9d [locales] Update 2018-09-17 15:14:59 +08:00
zhengxie
e39bf2267b [locale] Update strings 2018-09-17 13:42:19 +08:00
zheng xie
f4f72e7321
Merge pull request #2378 from haiwen/deleted-repo-expire
update common user's deleted libraries page
2018-09-17 13:09:55 +08:00
lian
9dd9941430 update common user's deleted libraries page
show expire days according to seafile.conf configuration
2018-09-17 12:37:21 +08:00
shanshuirenjia
180f388af1 Clean css (#2377) 2018-09-15 17:47:09 +08:00
zhengxie
c4538e716f [tests] Fix shibboleth middleware 2018-09-15 16:37:20 +08:00
zhengxie
e5a85cc054 [drafts] Add missing migration 2018-09-15 16:25:25 +08:00
shanshuirenjia
e793730939 Drafts module (#2375) 2018-09-15 16:14:17 +08:00
zhengxie
a45e6b5cdd [shibboleth] Only apply middleware to certain url 2018-09-15 16:13:07 +08:00
wangjianhui
06c9fb65cc admin-rename-lib 2018-09-15 13:21:40 +08:00
zhengxie
70ff50b30f [shibboleth] Fix multiple emails sending issue.
issue: https://forum.seafile.com/t/seahub-not-sending-mail-invitations/7150/6
2018-09-15 11:32:06 +08:00
C_Q
0a3296d304 update repo wiki mode (#2364) 2018-09-15 10:55:55 +08:00
llj
ffce0e0778 [system admin, org admin] file access/update, permission: modified ui (#2370) 2018-09-15 08:14:15 +08:00
lian
8d196077bf update can_preview_file func
use PREVIEW_FILEEXT.keys() instead of FILEEXT_TYPE_MAP
2018-09-14 18:38:50 +08:00
lian
c1d8b9024b Preview edit file (#2369)
* Revert "update share link permission (#2328)"

This reverts commit 6313e54dd7.

* update share link related UI

Download link(s) to Share link(s)

* update file api

add 'can_preview' and 'can_edit' fields

* update view file page

'invalid extension' to 'File preview unsupported'

* update share popup

1. send file detail request to check if can preview/edit file
2. show or hide share link permission according to api response
3. add tests for can_preview/edit_file func

* use FILEEXT_TYPE_MAP to check if can preview file
2018-09-14 18:13:25 +08:00
lian
122254905d Share link auth (#2358)
* rm view_raw_shared_file

* add SHARE_LINK_LOGIN_REQUIRE setting

to force user login when view preview file/folder share link
2018-09-14 12:05:46 +08:00
shanshuirenjia
d6d037afbc change font style lib (#2366) 2018-09-13 14:26:39 +08:00
zheng xie
f1e98549e5
Merge pull request #2365 from haiwen/6.3-fix_tests
[tests] Fix tests
2018-09-13 11:26:05 +08:00
zhengxie
1548fb1ee5 [tests] Fix tests 2018-09-12 18:26:49 +08:00
ilearnit
1fcd03d5ad [dist] frontend 2018-09-12 18:25:19 +08:00
ilearnit
04a3d71ae0 update webpack config 2018-09-12 18:25:00 +08:00
ilearnit
5a4df40b92 Merge branch '6.3' 2018-09-12 18:04:30 +08:00
llj
b14ddfeb31 Traffic fe (#2363)
* Refactor seafevents msg and add traffic stats API

Squashed commit of the following:

commit 85fe5369f711e1514762d93008f9ebb3c5d49041
Author: zhengxie <xiez1989@gmail.com>
Date:   Mon Aug 6 15:48:55 2018 +0800

    Add '-link' to access_token op type when generate download/upload link

commit 1817833fc3374f54030e16f3a1283ff6f34ddbf5
Author: zhengxie <xiez1989@gmail.com>
Date:   Mon Aug 6 15:28:38 2018 +0800

    Refactor file/dir events

    1. Remove traffic related msg
    2. Rename seahub.stats to seahub.audit for audit related msg

* Fix share link zip task traffic owner

* [admin api] Add org traffic

* [system admin] statistic: added 'traffic', fixed 'storage'

* [system admin] statistic: added 3 more charts for 'traffic', and modified the top nav

* [system admin] statistic: added 'traffic' for org; added a traffic nav, improved chart dot title
2018-09-12 17:41:59 +08:00
llj
e19a147154 [dir view] getMore: fixup for some cases 2018-09-12 17:05:58 +08:00
shanshuirenjia
ca0110e996 New file history (#2359) 2018-09-12 17:01:48 +08:00
zheng xie
e14c5a93ff
Merge pull request #2355 from haiwen/get-related-users
update get releated users by repo
2018-09-12 16:56:57 +08:00
ilearnit
5924c65d08 [dist] frontend 2018-09-12 15:02:51 +08:00
ilearnit
6c17169e42 fix utils 2018-09-12 14:57:23 +08:00
ilearnit
0fc103e9b9 update repo wiki mode 2018-09-12 14:15:27 +08:00
ilearnit
15b5be489d Merge branch '6.3'
Conflicts:
	frontend/build/frontend/js/main.js
	frontend/build/frontend/js/main.js.map
	frontend/build/frontend/js/wiki.js
	frontend/build/frontend/js/wiki.js.map
	frontend/src/components/constance.js
	frontend/src/pages/wiki/main-panel.js
	frontend/src/pages/wiki/side-panel.js
	frontend/src/wiki.js
2018-09-12 12:03:07 +08:00
shanshuirenjia
e0e5d4fec9 wiki optimized (#2348) 2018-09-12 11:50:41 +08:00
C_Q
7bd50ad009 view repo via wiki (#2354)
* view repo via wiki

* Modify details

* add list/grid mode

* [dist]
2018-09-12 10:32:31 +08:00
llj
76489d2ca4 [system/org admin] rm 'email' for group member; modified 'Info' icon for org admin side nav 2018-09-11 15:16:02 +08:00
C_Q
dcf35018c1 add notification (#2353) 2018-09-10 18:24:49 +08:00
lian
2006447849 update get releated users by repo 2018-09-10 15:22:47 +08:00