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 |
|
llj
|
0ef2a4def0
|
Merge pull request #1944 from haiwen/file-view-comment
[file view] enable 'click icon button to show/hide comment panel'
|
2017-12-14 15:06:23 +08:00 |
|
llj
|
3e2895eb60
|
[file view] enable 'click icon button to show/hide comment panel'
|
2017-12-14 14:59:24 +08:00 |
|
llj
|
b04205a8da
|
Merge pull request #1943 from haiwen/sysadmin-links
[system admin] links: added 'token'
|
2017-12-14 11:54:05 +08:00 |
|
llj
|
9729bdca5c
|
[system admin] links: added 'token'
|
2017-12-14 11:34:10 +08:00 |
|
llj
|
e0880c65f6
|
Merge pull request #1942 from haiwen/sysadmin-search
[system admin] UI: modified library/user/group/link search
|
2017-12-13 18:28:53 +08:00 |
|
llj
|
025ace5f55
|
[system admin] UI: modified library/user/group/link search
|
2017-12-13 18:18:22 +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 |
|
xiez
|
78cd00bd13
|
Merge pull request #1938 from haiwen/search-link
search link
|
2017-12-13 17:56:57 +08:00 |
|
zming
|
cd260c0718
|
review
|
2017-12-13 17:26:50 +08:00 |
|
zming
|
b82c141afe
|
review again
|
2017-12-13 14:33:13 +08:00 |
|
zming
|
d246ce70d0
|
review
|
2017-12-13 12:06:31 +08:00 |
|
llj
|
b16a829ead
|
added transition to show/hide of feedback messages
|
2017-12-12 17:13:01 +08:00 |
|
Daniel Pan
|
dcdfa35584
|
Merge pull request #1940 from haiwen/mvcp-multi-fix
[dir view] mv/cp multi dirents: add feedback msg
|
2017-12-12 14:10:43 +08:00 |
|
zhengxie
|
ac4a49096b
|
[locale] Update translations
|
2017-12-11 16:55:35 +08:00 |
|
llj
|
6b31bae382
|
[dir view] mv/cp multi dirents: add feedback msg
|
2017-12-11 16:55:21 +08:00 |
|
zhengxie
|
de33642185
|
[locale] Update source strings
|
2017-12-11 16:47:14 +08:00 |
|
zming
|
3ec7684d46
|
search link
|
2017-12-11 16:29:38 +08:00 |
|
xiez
|
ee61087e0c
|
Merge pull request #1939 from haiwen/org-group
check if group exists before list group shared repo/folder
|
2017-12-11 16:04:26 +08:00 |
|
lian
|
51765be514
|
check if group exists before list group shared repo/folder
|
2017-12-11 15:59:42 +08:00 |
|
llj
|
aa37a077b3
|
Merge pull request #1937 from haiwen/file-history-update
update file history
|
2017-12-11 13:57:16 +08:00 |
|
lian
|
ff99469500
|
update file history
|
2017-12-11 13:52:02 +08:00 |
|
Daniel Pan
|
1e41087a1d
|
Merge pull request #1834 from haiwen/file-history
update file history page
|
2017-12-11 11:24:24 +08:00 |
|
lian
|
0500f441a8
|
update file history page/api
1. user with `r` and `rw` permission can view file history
2. add new file history api
|
2017-12-11 11:18:19 +08:00 |
|
zhengxie
|
cec5c9bacf
|
[fab] Update locale
|
2017-12-09 15:16:17 +08:00 |
|
xiez
|
acc4a3a451
|
Merge pull request #1932 from haiwen/demo-user
Create demo user if not exists
|
2017-12-09 14:34:47 +08:00 |
|
lian
|
e6881c4701
|
Create demo user if not exists
|
2017-12-09 14:26:39 +08:00 |
|
xiez
|
7b806b5bc5
|
Merge pull request #1933 from haiwen/group-shared-repos
check if group exists when list repos shared to group
|
2017-12-09 14:22:47 +08:00 |
|
xiez
|
3c6c4876d2
|
Merge pull request #1935 from haiwen/virtual-repo
update get_unencry_rw_repos_by_user
|
2017-12-09 14:21:27 +08:00 |
|
lian
|
43c17c0b69
|
update get_unencry_rw_repos_by_user
1. remove virtual repo owned by me.
2. add virtual repo shared to me.
|
2017-12-09 11:38:50 +08:00 |
|
lian
|
8e19f142ff
|
check if group exists when list repos shared to group
|
2017-12-07 17:49:17 +08:00 |
|
zMingGit
|
97fa8bf774
|
clear invalid repo data by commond (#1928)
|
2017-12-05 21:37:02 -06:00 |
|
llj
|
7694ecd819
|
Merge pull request #1930 from haiwen/spreadsheet-convert
file shared link
|
2017-11-28 15:57:34 +08:00 |
|
lian
|
15fcc1a446
|
file shared link
fix bug when file name contains '&'
|
2017-11-28 15:49:04 +08:00 |
|
llj
|
4943d50b78
|
Merge pull request #1929 from haiwen/fix
[base.html] fix
|
2017-11-27 18:40:47 +08:00 |
|
llj
|
4e75ad3e64
|
[base.html] fix
|
2017-11-27 18:32:39 +08:00 |
|
xiez
|
68049b00a9
|
Merge pull request #1925 from haiwen/oauth-add-user
OAuth should not overwrite public registrations settings.
|
2017-11-26 20:28:34 -06:00 |
|
llj
|
ee1fd9b91f
|
Merge pull request #1926 from haiwen/improvement
[misc] modification
|
2017-11-25 15:15:03 +08:00 |
|
llj
|
3142684afd
|
[misc] modification
|
2017-11-25 15:10:57 +08:00 |
|
lian
|
0b65d70969
|
OAuth should not overwrite public registrations settings.
|
2017-11-25 11:17:58 +08:00 |
|
Daniel Pan
|
d4cd756adf
|
Merge pull request #1918 from haiwen/clear-invalid-repo-data
clear invalid repo data by commond
|
2017-11-24 17:55:42 +08:00 |
|
xiez
|
81912e6b94
|
Merge pull request #1924 from haiwen/onlyoffice-audit-log
send file access msg when view file via OnlyOffice
|
2017-11-24 02:21:08 -06:00 |
|
lian
|
77208ab67d
|
send file access msg when view file via OnlyOffice
|
2017-11-24 16:16:36 +08:00 |
|
xiez
|
409905b46b
|
Merge pull request #1923 from haiwen/rm-group-member
update admin group memeber api
|
2017-11-24 02:13:03 -06:00 |
|
lian
|
2e1b5f32e0
|
update admin group memeber api
Not check if user exist when remove a group member
|
2017-11-24 16:08:28 +08:00 |
|
llj
|
704835c1cd
|
Merge pull request #1921 from haiwen/fix
[misc] fix
|
2017-11-24 16:04:46 +08:00 |
|
llj
|
785097a5c4
|
Merge pull request #1922 from haiwen/onlyoffice-template
add new style for onlyoffice template
|
2017-11-24 16:00:01 +08:00 |
|
llj
|
17d2e2f9c7
|
[misc] fix
|
2017-11-24 15:49:06 +08:00 |
|
zming
|
e08a9bc847
|
clear invalid repo data by commond
|
2017-11-23 17:27:34 +08:00 |
|
Daniel Pan
|
b26d705ea9
|
Merge pull request #1910 from haiwen/rm-search
[system admin] remove 'file search'
|
2017-11-23 09:51:11 +08:00 |
|