llj
|
f7ed342e2d
|
Merge pull request #1593 from haiwen/custom
admin update logo/favicon
|
2017-05-27 16:50:54 +08:00 |
|
llj
|
f92fc53178
|
modified favicon; modified system logo/favicon setting
|
2017-05-27 14:18:51 +08:00 |
|
llj
|
59c494f419
|
[sysadmin] logo/favicon: improvement
|
2017-05-26 15:38:56 +08:00 |
|
xiez
|
8822e353d0
|
Merge pull request #1602 from TMHBOFH/OnlyOffice-html-template
Update view_file_via_onlyoffice.html
|
2017-05-25 17:15:30 +08:00 |
|
xiez
|
59683a5309
|
Merge pull request #1596 from TMHBOFH/OnlyOfficeLanguageSetting
add option to set language of OnlyOffice DocumentServer
|
2017-05-25 16:19:09 +08:00 |
|
lian
|
3420025b9a
|
Merge pull request #1604 from haiwen/update-admin-log
update admin log
|
2017-05-23 17:03:00 +08:00 |
|
lian
|
37dc0354d9
|
update admin create repo log
|
2017-05-23 16:49:52 +08:00 |
|
llj
|
19cedb4779
|
Merge pull request #1605 from haiwen/file-discussion-fix
[file view] discussion: fix locale for 'msg time'
|
2017-05-23 16:49:37 +08:00 |
|
llj
|
2096ebef02
|
[file view] discussion: fix locale for 'msg time'
|
2017-05-23 16:27:46 +08:00 |
|
lian
|
e1d0169e64
|
update admin log
1. add log when admin create repo
1. add log when admin batch delete user
1. update test
|
2017-05-23 16:05:51 +08:00 |
|
llj
|
42f2571da7
|
[share link] modified 'direct dl link'
|
2017-05-23 11:48:41 +08:00 |
|
zhengxie
|
f79159f9d6
|
Merge branch '6.0' into 6.1
|
2017-05-23 11:01:55 +08:00 |
|
xiez
|
df2de123ab
|
Merge pull request #1590 from haiwen/encode-utf-8
not encode utf-8 when do some file/dir operation
|
2017-05-23 11:01:15 +08:00 |
|
zhengxie
|
ecb26403ac
|
Merge branch '6.1'
|
2017-05-23 10:44:06 +08:00 |
|
zhengxie
|
1f7880ebc1
|
Merge branch '6.0' into 6.1
Conflicts:
seahub/urls.py
|
2017-05-23 10:38:49 +08:00 |
|
TMHBOFH
|
20cabcac6a
|
Update view_file_via_onlyoffice.html
|
2017-05-22 13:36:30 +02:00 |
|
TMHBOFH
|
ae5a270fbc
|
Merge pull request #1 from haiwen/master
pull
|
2017-05-22 13:17:45 +02:00 |
|
llj
|
18f0764818
|
[share link] modification about permissions
|
2017-05-22 17:20:42 +08:00 |
|
Daniel Pan
|
c734844720
|
Merge pull request #1600 from haiwen/tc
Remove t&c relation when user is deleted
|
2017-05-22 16:02:30 +08:00 |
|
Daniel Pan
|
985cf09f6b
|
Merge pull request #1599 from haiwen/movie
[thumbnail] Add setting to enable/disable movie thumbnail
|
2017-05-22 16:02:03 +08:00 |
|
llj
|
3fd4fd6bf9
|
Merge pull request #1597 from zMingGit/login-id
Login id
|
2017-05-22 15:45:38 +08:00 |
|
zming
|
1ed03f96e1
|
[API2] add login_id field, and test case
[api] update account and test
[template] increase the function of modifying logind
[review] trans
[review] trans again
|
2017-05-22 15:33:50 +08:00 |
|
zhengxie
|
a220b99b8d
|
Remove t&c relation when user is deleted
|
2017-05-22 15:07:26 +08:00 |
|
zhengxie
|
0d65a68892
|
[thumbnail] Add setting to enable/disable movie thumbnail
|
2017-05-22 12:15:38 +08:00 |
|
TMHBOFH
|
eb7ccd6068
|
Update view_file_via_onlyoffice.html
|
2017-05-19 22:33:05 +02:00 |
|
TMHBOFH
|
3cbeb78340
|
Update settings.py
|
2017-05-19 22:31:51 +02:00 |
|
TMHBOFH
|
4e9d23f8d0
|
Update file.py
|
2017-05-19 22:30:07 +02:00 |
|
xiez
|
5fef8ade52
|
Merge pull request #1591 from haiwen/update-user-avatar-api
Update user avatar api
|
2017-05-19 11:20:41 +08:00 |
|
zhengxie
|
133522487a
|
[api2] Add permissions to share link creation api
|
2017-05-18 17:32:28 +08:00 |
|
xiez
|
dda3ac0c48
|
Merge pull request #1594 from haiwen/admin-create-repo
add admin create repo api
|
2017-05-18 15:46:51 +08:00 |
|
lian
|
0ca018fcf4
|
add admin create repo api
|
2017-05-18 10:43:31 +08:00 |
|
lian
|
2b1ae5b921
|
admin update logo/favicon
|
2017-05-17 16:59:38 +08:00 |
|
lian
|
0d4bdedb37
|
update user avatar
|
2017-05-13 16:16:34 +08:00 |
|
lian
|
610d607846
|
Revert "add create user avatar api"
This reverts commit 3483783a28.
|
2017-05-13 15:51:48 +08:00 |
|
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 |
|