Daniel Pan
2461f86211
Merge pull request #1588 from haiwen/repos-api
...
add v2.1 repos api
2017-05-13 11:04:34 +08:00
lian
f062ed4be4
add v2.1 repos api
...
batch share repos to user/group
2017-05-13 09:43:24 +08:00
lian
52f9a6a82f
not encode utf-8 when do some file/dir operation
2017-05-13 07:38:55 +08:00
xiez
485df24f06
Merge pull request #1589 from haiwen/avatar-api
...
add api for creating user avatar
2017-05-12 19:01:30 +08:00
lian
3483783a28
add create user avatar api
2017-05-12 18:16:59 +08:00
Daniel Pan
0952a81d05
Merge pull request #1587 from haiwen/file-view
...
File view
2017-05-11 16:49:33 +08:00
llj
62341076a4
[file view] added 'open parent folder'
2017-05-11 16:39:08 +08:00
llj
667dd51015
[view_file_via_shared_dir] for image: added prev/next
2017-05-11 13:54:39 +08:00
zhengxie
efd7e7530f
Update settings
2017-05-10 18:44:25 +08:00
xiez
f1696b0127
Merge pull request #1586 from haiwen/file_revisions
...
[views] Fix file revisions page
2017-05-10 18:20:24 +08:00
llj
bafd1a6ef2
Merge pull request #1585 from haiwen/view-shared-dir
...
update view shared dir page
2017-05-10 18:05:11 +08:00
zhengxie
7d0945cb3e
[views] Fix file revisions page
2017-05-10 18:04:09 +08:00
lian
4137331397
update view shared dir page
...
1. always return is_img and is_video info of a file
1. move magnific popup css file to base.html
2017-05-10 18:01:56 +08:00
xiez
5119990e9e
Merge pull request #1582 from blaniel/onlyoffice-doc-key-fix
...
[onlyoffice] Fix document key
2017-05-10 13:37:23 +08:00
llj
1d488b44aa
Merge pull request #1584 from haiwen/img-file-view-improvement
...
[image file view] improvement(added loading-icon, and etc.)
2017-05-10 12:19:28 +08:00
llj
eeeecb1390
Merge pull request #1583 from haiwen/group-discussion-ui-fix
...
[group discussion, info-bar] fix
2017-05-10 12:14:52 +08:00
llj
34811779bc
[group discussion, info-bar] fix
2017-05-10 12:09:12 +08:00
xiez
e084480799
Merge pull request #1581 from haiwen/update-wopi
...
remove pro version check when use wopi
2017-05-10 10:18:50 +08:00
lian
13a9806d22
remove pro version check when use wopi
2017-05-09 18:13:59 +08:00
Benoît Laniel
280ab27d50
[onlyoffice] Fix document key
...
According to https://api.onlyoffice.com/editors/config/document , the key
should be changed when document is edited *and* saved. Using a different
key each time the document is opened tells document server a different version
of the file is edited and thus breaks save operations as well as collaborative
editing.
Use obj_id as key since it's a file content based uuid.
2017-05-09 12:10:42 +02:00
llj
7648efc3f3
Merge pull request #1580 from haiwen/enable-mod-fix
...
[side nav] enable modules: fix
2017-05-09 16:28:30 +08:00
llj
db405e9c33
Merge pull request #1579 from haiwen/wiki
...
disable wiki
2017-05-09 16:27:08 +08:00
llj
023a22ce23
[side nav] enable modules: fix
2017-05-09 16:24:19 +08:00
lian
352865248a
disable wiki
2017-05-09 16:22:59 +08:00
llj
552a7087d9
[image file view] improvement(added loading-icon, and etc.)
2017-05-09 15:21:50 +08:00
zhengxie
0269d5e4bb
[sql,locale] Update translations and sql
2017-05-09 14:56:32 +08:00
zhengxie
887662a16b
[sql] Update sql to 6.1
2017-05-09 14:26:04 +08:00
zhengxie
e04f83d2d0
[locale] Update source files
2017-05-09 13:14:52 +08:00
zhengxie
194f219a3c
Merge branch '6.0'
2017-05-09 13:13:36 +08:00
xiez
122fbe9ef7
Merge pull request #1571 from haiwen/fs_perm
...
[share] Add permission field to FileShare model
2017-05-09 13:13:05 +08:00
xiez
d493f8dad0
Merge pull request #1578 from haiwen/dir-share-trans
...
add trans if share repo/dir failed
2017-05-09 13:12:46 +08:00
lian
bfcaeabc11
update trans
2017-05-09 12:02:40 +08:00
llj
ae241c341f
Merge pull request #1573 from haiwen/upload-file
...
update argument when get file upload/upload link via web api
2017-05-09 11:48:26 +08:00
lian
88bea73923
add trans if share repo/dir failed
2017-05-09 11:22:43 +08:00
xiez
e86c8ec134
Merge pull request #1576 from haiwen/wopi-setting
...
add OFFICE_SERVER_TYPE for wopi app
2017-05-09 10:55:07 +08:00
xiez
570faa2185
Merge pull request #1572 from haiwen/drag-drop-fix
...
[dir view] move dir/file via drag & drop: modification, to remove the…
2017-05-08 11:01:20 +08:00
llj
3b24d20f1b
Merge pull request #1575 from haiwen/about
...
Update about
2017-05-08 11:01:16 +08:00
zhengxie
487c48db1c
Update about
2017-05-08 10:58:53 +08:00
lian
90071b9ddf
add OFFICE_SERVER_TYPE for wopi app
2017-05-08 10:49:45 +08:00
xiez
f8f947668a
Merge pull request #1574 from haiwen/top-info-fix
...
[top info] UI: fix
2017-05-08 10:40:42 +08:00
llj
45d9d5dbf8
[top info] UI: fix
2017-05-06 17:37:29 +08:00
lian
48c370c8bc
update argument when get file upload/upload link via web api
2017-05-06 17:04:40 +08:00
llj
a65499610c
[dir view] move dir/file via drag & drop: modification, to remove the effect on 'upload file/folder via drag & drop', and other 'drag & drop'
2017-05-06 15:17:31 +08:00
zhengxie
a4ead6dc38
Add more avatar size
2017-05-06 10:40:51 +08:00
zhengxie
b2b9495a35
[share] Add permission field to FileShare model
2017-05-05 15:35:56 +08:00
Daniel Pan
6cc943e43e
Merge pull request #1570 from haiwen/new
...
[dir view] new dir/file: close the dropdown menu after clicking a men…
2017-05-05 11:02:55 +08:00
llj
0169245045
[dir view] new dir/file: close the dropdown menu after clicking a menu item
2017-05-04 16:32:47 +08:00
xiez
b2da598650
Merge pull request #1569 from haiwen/lang-selector
...
[language selector] improvement
2017-05-04 15:17:47 +08:00
llj
9d407c4cab
[language selector] improvement
2017-05-04 15:06:45 +08:00
zhengxie
0c732638eb
Merge branch '6.0'
2017-05-04 10:31:49 +08:00
