shanshuirenjia
f0fe76f4da
repair share bug
2018-10-17 11:28:01 +08:00
山水人家
55f8277d43
repair share bug ( #2449 )
2018-10-15 16:11:37 +08:00
zhengxie
62f0cfbbcd
Update travis pipeline
2018-10-15 13:28:29 +08:00
zhengxie
1de3e35b77
[locale] Update .po files
2018-10-15 11:39:17 +08:00
zheng xie
a9b4f9e66f
Merge pull request #2446 from haiwen/online-office-update
...
update OOS/OnlineOffice update file
2018-10-15 11:02:55 +08:00
lian
60caf9e345
update OOS/OnlineOffice update file
...
transfer online_office_update to seafile api when get fileserver access token
2018-10-15 10:38:43 +08:00
zheng xie
1be37ab3c9
Merge pull request #2444 from haiwen/6.3-fix_postoffice
...
Fix post office connection and handle invitation error
2018-10-13 15:16:22 +08:00
zhengxie
a306737700
Fix post office connection and handle invitation error
2018-10-13 15:08:35 +08:00
lian
eb2d38c8f8
Revert "update onlyoffice edit file ( #2338 )" ( #2443 )
...
This reverts commit f6a12786d1
2018-10-13 11:40:51 +08:00
C_Q
db3e2ead71
fix wiki bug ( #2440 )
2018-10-11 12:08:32 +08:00
lian
b1b91fa59e
update get_repo_owner func ( #2436 )
...
administrator may get org repo's owner at admin panel
2018-10-11 11:26:15 +08:00
llj
11a0f4fd2a
[file view] removed 'share' ( #2435 )
2018-10-10 13:51:09 +08:00
zheng xie
7beb852811
Merge pull request #2431 from haiwen/oos-cache
...
add more log when set cache value for OOS
2018-10-09 14:21:58 +08:00
lian
d424848be7
add more log when set cache value for OOS
2018-10-09 14:03:58 +08:00
llj
a0e62bfacb
[system admin] statistic: modified text for 'Storage' ( #2426 )
2018-10-08 17:01:10 +08:00
lian
2569768471
update shared repos api ( #2424 )
...
add 'encrypted' field
2018-10-08 13:49:53 +08:00
zheng xie
0fd0399c36
Merge pull request #2423 from haiwen/6.3-fix_restframework
...
Upgrade rest_framework to 3.3.3 to fix html render error in web api
2018-10-08 11:17:35 +08:00
zhengxie
ddcd19a4a6
Upgrade rest_framework to 3.3.3 to fix html render error in web api
...
ref: https://forum.seafile.com/t/6-3-6-pro-api-broken-user-feedback-as-i-go/7356/5
2018-10-08 10:58:50 +08:00
zheng xie
834ee91033
Merge pull request #2404 from haiwen/6.3-traffic_stats
...
6.3 traffic stats
2018-09-30 11:45:21 +08:00
zhengxie
b6abdd6132
[sys] Update traffic admin and user_traffic_over_limit func
2018-09-30 11:31:22 +08:00
llj
0620273992
[system admin] user/org monthly traffic: modification
...
Conflicts:
seahub/templates/sysadmin/sys_trafficadmin.html
2018-09-28 14:04:36 +08:00
zhengxie
d9dd62e4b2
[sysadmin] refactor traffic stats
2018-09-28 14:04:36 +08:00
zhengxie
604af74579
Update zh_CN lang
2018-09-28 14:03:49 +08:00
zhengxie
1cdb57e6f9
Remove cache check during init which will cause cache errors after restart
2018-09-28 11:28:44 +08:00
zhengxie
9164b3df36
Fix tests
2018-09-27 17:07:23 +08:00
zhengxie
7de83202f8
Fix download link empty username in statistic
2018-09-27 12:06:22 +08:00
llj
4d97d37a6c
[file view] office file: added 'open via client' ( #2376 )
2018-09-25 13:33:43 +08:00
lian
daad7c33e1
update lock file ( #2396 )
...
user has rw permission can unlock file locked by OnlineLock
2018-09-25 13:32:49 +08:00
llj
28cc3762b0
Shared with me ( #2393 )
...
* update api of shared with me
return 'group_name' field if current library is a group owned library
* add api for delete shared in group owned repo
* [shared with me] modification for 'group owned repo'
2018-09-21 15:43:16 +08:00
lian
c51da1c832
update api of shared with me ( #2383 )
...
* update api of shared with me
return 'group_name' field if current library is a group owned library
* add api for delete shared in group owned repo
2018-09-21 15:42:59 +08:00
lian
577e814ae7
fix bug of folder share link
2018-09-21 15:21:15 +08:00
lian
07d243d927
update view shared file/folder ( #2391 )
...
use SHARE_LINK_LOGIN_REQUIRED to control both preview and edit share link
2018-09-20 16:44:49 +08:00
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
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
llj
3fa4a88a96
[invitation] delete: modification ( #2379 )
2018-09-19 10:08:51 +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
zhengxie
c4538e716f
[tests] Fix shibboleth middleware
2018-09-15 16:37:20 +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
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
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
