llj
f4ac204594
Merge pull request #2342 from haiwen/timestamp
...
added timestamp for base.js
2018-09-05 14:12:39 +08:00
llj
cbbd7a7a4d
added timestamp for base.js
2018-09-05 14:10:12 +08:00
lian
9f38ceb4e1
update water mark ( #2340 )
...
add site name before user name when show water mark
2018-09-05 12:09:14 +08:00
lian
f6a12786d1
update onlyoffice edit file ( #2338 )
...
add ONLYOFFICE_FORCE_SAVE setting
if True, file will be saved when user click save btn on file editing page
2018-09-05 11:22:27 +08:00
shanshuirenjia
cece038dec
Wiki show dir bug ( #2337 )
2018-09-05 10:44:58 +08:00
zheng xie
7015929a33
[ADFS] Fix client login issue.
...
Redirect to default url `/saml2/complete/`, otherwise user will not finish login in client app.
2018-09-04 17:52:29 +08:00
shanshuirenjia
681a4235a4
[Wiki] Support show folder ( #2334 )
2018-09-04 17:16:50 +08:00
shanshuirenjia
b8662376a1
repair menu bug for floder bug ( #2335 )
2018-09-04 16:19:56 +08:00
zhengxie
d5017f7901
[locale] Update .po files
2018-09-04 15:31:37 +08:00
zhengxie
eda79048df
[i18n] Update source strings
2018-09-04 14:41:10 +08:00
llj
0ce5286fa2
[trans] added new js string
2018-09-04 14:35:31 +08:00
llj
1d3d28d2d5
Merge pull request #2333 from haiwen/share-link-ui
...
[share popup] share link: new design
2018-09-04 13:54:28 +08:00
llj
094871b45f
[share popup] share link: new design
2018-09-03 18:51:54 +08:00
lian
fbddd5f48d
add new custom trans string
2018-09-03 16:39:57 +08:00
zheng xie
d84bd79d1a
Merge pull request #2331 from haiwen/share-link-trans
...
update trans bug of checking share link expire days
2018-09-03 11:00:30 +08:00
lian
3995294bfb
update trans bug of checking share link expire days
2018-09-03 10:57:48 +08:00
lian
230fe12fb3
update smart link api ( #2322 )
...
return file/folder name field
2018-09-01 21:42:03 +08:00
zhengxie
ff17c5ef71
[locale] Update
2018-09-01 17:32:36 +08:00
lian
2df72fecd9
add some new trans string
...
1. Co-Owner
2. Edit-on-Cloud
3. View-on-Cloud
2018-09-01 17:23:22 +08:00
zhengxie
5fe99b30a0
[locale] Update
2018-09-01 16:31:54 +08:00
zheng xie
6902c237dc
Merge pull request #2329 from haiwen/share-link-can-edit
...
update view shared file
2018-09-01 16:21:22 +08:00
lian
d122fab57e
update view shared file
...
only authenticated user can edit shared file
2018-09-01 16:16:05 +08:00
lian
6313e54dd7
update share link permission ( #2328 )
...
1, download Link -> Share link
2, add can_preview field for file when ajax list lib dir
3, hide preview-only permission if a file can not preview
2018-09-01 16:07:01 +08:00
lian
145d4f266c
Merge pull request #2327 from haiwen/share-ui
...
[share popup] modified UI
2018-09-01 15:26:08 +08:00
C_Q
126f7fece3
[web UI] change wiki to wikis ( #2326 )
2018-09-01 15:03:16 +08:00
llj
0aeab05ecf
[share popup] modified UI
2018-09-01 14:22:12 +08:00
ilearnit
f00b40024f
[dist] frontend
2018-09-01 14:01:57 +08:00
shanshuirenjia
18b3b68ae5
wiki-init-bug ( #2325 )
...
* wiki-init-bug
* repair wiki init load bug
* add wiki file
2018-09-01 13:48:20 +08:00
C_Q
4b97e41be2
[wiki] remove duplicate repo ( #2319 )
2018-09-01 13:24:24 +08:00
ilearnit
2909b78ae9
add mtime_relative
2018-09-01 12:20:41 +08:00
ilearnit
1d2d59c091
[dist] frontend
2018-09-01 11:42:25 +08:00
shanshuirenjia
31461b0040
repair wiki-list rename bug ( #2324 )
2018-09-01 11:34:47 +08:00
shanshuirenjia
99e9c8b1c0
Wiki sidebar bug ( #2321 )
...
* repair rename bug
* modify rename module and search module
* add hight-light style for tree-node
2018-09-01 11:34:27 +08:00
zhengxie
285fa43387
[api2] Update zip tasks access token
2018-08-31 14:25:57 +08:00
zheng xie
6f51aec1cc
[tests] Update view_lib_file
2018-08-31 14:05:17 +08:00
zhengxie
d6bd2e9bab
[locale] Update .po files
2018-08-31 13:51:19 +08:00
zhengxie
8d5b80ca0f
[locale] Update source files
2018-08-31 13:21:14 +08:00
zheng xie
808453ad95
Merge pull request #2323 from haiwen/view-file-desc
...
update file view page
2018-08-31 13:06:38 +08:00
lian
6cac4e1fe4
update file view page
...
always show error msg if can NOT view file online
2018-08-31 12:39:30 +08:00
zheng xie
99d6f3b797
Merge pull request #2316 from haiwen/6.3-fileserver_token
...
Add FILESERVER_TOKEN_ONCE_ONLY setting
2018-08-31 11:41:58 +08:00
zhengxie
9227e743f5
Add FILESERVER_TOKEN_ONCE_ONLY setting
2018-08-31 11:41:33 +08:00
zheng xie
35482633f7
Merge pull request #2170 from haiwen/preview-file
...
Preview file
2018-08-31 11:27:40 +08:00
lian
06a81c64c1
update view/edit office file
...
use OOS/OnlyOffice to view/edit file at
1, file download share link page
2, file in folder download share link page
3, file-history/repo(folder)-trash/repo-snapshot page
2018-08-31 11:23:56 +08:00
lian
1629ce0fd5
Merge pull request #2310 from haiwen/water-mark
...
Water mark
2018-08-30 19:08:53 +08:00
lian
0249bbbb8a
add water mark
...
show username as water mark when user view(not edit) file
2018-08-30 19:07:51 +08:00
zheng xie
e68193c965
Merge pull request #2317 from haiwen/6.3-csrf_cookie
...
Use custom csrf cookie name to avoid name conflict
2018-08-30 18:52:24 +08:00
llj
20c33de178
[csrf cookie] modification
2018-08-30 18:19:03 +08:00
zheng xie
1b804484fd
Merge pull request #2308 from haiwen/share-link-edit-only
...
Share link edit only
2018-08-30 17:24:18 +08:00
llj
37875256de
Squashed commit of the following:
...
commit 8ac4cd167993b4be4249fa28368b0c869852585b
Author: llj <lingjun.li1@gmail.com >
Date: Thu Aug 30 16:38:15 2018 +0800
[share link] fixup & improvement for 'permission & copy'; added 'copy' for upload link
commit f318353797d6479bb8c5bc2c3d20b05ca2ac5b70
Author: lian <imwhatiam123@gmail.com >
Date: Wed Aug 29 13:44:23 2018 +0800
update
commit bcadd6c3b708f1c672df3873b22816be1eea195d
Author: lian <imwhatiam123@gmail.com >
Date: Wed Aug 29 11:49:49 2018 +0800
add can_edit permission when generate share link
2018-08-30 16:44:34 +08:00
zheng xie
fbb7bcdc9e
Merge pull request #2318 from haiwen/file-lock
...
rm ENABLE_FOLDER_PERM check when get file lock info
2018-08-30 15:17:04 +08:00
