haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-19 10:26:17 +00:00
Code Issues Releases Wiki Activity
6,744 Commits 148 Branches 463 Tags
a3e9dd23b41ee6aea5fb95101db8bd78fa9cf11c
Commit Graph

6744 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
llj
e0b13dc147 [notices] fix 2018-01-30 14:44:54 +08:00
zhengxie
6fdb7f3544 [logging] Combine seahub.log and seahub_django_request.log, and enable existing loggers 2018-01-30 12:07:30 +08:00
xiez
f797d2d523 Merge pull request #1985 from haiwen/fs-encrepo 
Fix shared link in enc repo and update tests
 2018-01-29 10:43:26 +08:00
xiez
650e1d6041 Merge pull request #1995 from haiwen/file_preview 
File preview
 2018-01-29 10:39:16 +08:00
zhengxie
90d4cafd5b [requirements] Update pillow to 4.3.0 2018-01-29 10:37:44 +08:00
llj
55e5bc734d [file view] added online view for SVG files 2018-01-25 12:23:40 +08:00
llj
a8a0f12f3c [onlyoffice] HTML: fix 2018-01-24 14:41:34 +08:00
xiez
760002ee17 Merge pull request #1991 from haiwen/admin-copy-file 
add admin copy file/folder api
 2018-01-24 13:31:39 +08:00
lian
148e382425 add admin copy file/folder api 2018-01-24 13:01:19 +08:00
lian
c11d0787af add some log for view office file via OOS 
add log for HTTP_X_WOPI_OVERRIDE
add log for HTTP_X_WOPI_LOCK
add log for HTTP_X_WOPI_OLDLOCK
 2018-01-23 18:32:44 +08:00
lian
7b2d7f089e Merge pull request #1987 from haiwen/demo_user 
Fix demo account
 2018-01-22 18:35:01 +08:00
zhengxie
eb952e2041 Fix demo account 2018-01-22 18:30:37 +08:00
Daniel Pan
9e370167e6 Merge pull request #1986 from haiwen/cloud-mode 
add CLOUD_MODE to settings.py
 2018-01-22 10:12:28 +08:00
lian
08b83039de add CLOUD_MODE to settings.py 2018-01-22 10:09:50 +08:00
xiez
246269ba55 Merge pull request #1984 from haiwen/group-repo-test 
update get group repo test
 2018-01-20 14:49:36 +08:00
lian
c9968d59e6 update get group repo test 2018-01-20 14:38:03 +08:00
zhengxie
4315f29aa2 Fix shared link in enc repo and update tests 2018-01-20 14:13:47 +08:00
zhengxie
cb5f04fbac [locale] Update translations 2018-01-19 11:02:22 +08:00
zhengxie
912cc83356 [file preview] Support .tif and .eps file 2018-01-18 17:25:39 +08:00
xiez
14f143fe47 Merge pull request #1968 from haiwen/groups-for-repo-share 
add api for getting groups that user can share repo to
 2018-01-17 19:04:14 +08:00
lian
ed8200b52a add api for getting groups that user can share repo to 2018-01-17 18:22:48 +08:00
xiez
37c6e51c6d Merge pull request #1978 from haiwen/get-group-repos 
update get user's (org) group repos
 2018-01-17 18:08:51 +08:00
lian
0c173a12ac use new get group repos api 2018-01-17 16:07:30 +08:00
xiez
ea9c1801d2 Merge pull request #1981 from haiwen/oauth-fix 
[oauth] Fix oauth state issue in multiple processes
 2018-01-17 14:55:05 +08:00
zhengxie
60b02a1f30 [locale] Update locales 2018-01-15 18:20:44 +08:00
xiez
bfc72301b5 Merge pull request #1980 from haiwen/6.2-trans 
[i18n] Update source string
 2018-01-15 18:11:10 +08:00
zhengxie
cc33ca396c [locale] Update po files 2018-01-15 17:32:47 +08:00
zhengxie
2c7aeb1296 [oauth] Fix oauth state issue in multiple processes 2018-01-15 16:12:33 +08:00
zhengxie
06ee26e7d3 [i18n] Update source string 2018-01-12 18:06:42 +08:00
zhengxie
2abfa3fd53 Update tests 2018-01-11 16:35:14 +08:00
zhengxie
efac7b598f Fix tests 2018-01-11 15:50:22 +08:00
xiez
ddd8affb48 Merge pull request #1949 from haiwen/org-delete-repo 
update send repo_deleted signal in org mode
 2018-01-11 10:23:19 +08:00
zming
0affd2fc1f license file type invalid && update test 2018-01-10 18:49:55 +08:00
lian
a2a77236c0 update send repo_deleted signal in org mode 2018-01-10 17:48:32 +08:00
ilearnit
4b7ec9de27 Delete user option (#1979) 
* Remove user all options

* delete space

* delete space

* debug sapce
 2018-01-10 17:28:28 +08:00
llj
2d98cc405d Merge pull request #1976 from haiwen/file-view 
[file view] current/history/shared file view: bugfix & improvement
 2018-01-10 10:11:19 +08:00
xiez
1c6092cc58 Merge pull request #1977 from haiwen/2fa_remember 
[2fa] Remember device for certain days
 2018-01-09 16:15:16 +08:00
zhengxie
7206c13200 [locale] Update translations 2018-01-09 14:08:06 +08:00
zhengxie
c767931fd3 [2fa] Remember device for certain days 2018-01-09 13:29:26 +08:00
xiez
f5daddfef3 Merge pull request #1965 from haiwen/guest-login-notify 
[notification] Notify inviter on guest accept invitation.
 2018-01-09 13:23:50 +08:00
xiez
93b131a8ab Merge pull request #1975 from haiwen/notify_admin_after_register 
Notify admins after register
 2018-01-09 11:43:51 +08:00
llj
d8a5e73390 [file view] current/history/shared file view: bugfix & improvement 2018-01-08 16:10:32 +08:00
xiez
a03f3066c0 Merge pull request #1971 from haiwen/upload_invalid_type 
upload with invalid type
 2018-01-08 16:05:29 +08:00
zming
295b567b84 upload with invalid type 2018-01-08 16:00:55 +08:00
zhengxie
ed8a549458 Notify admins after register 2018-01-06 16:53:48 +08:00
llj
3e27dcdef1 Merge pull request #1974 from haiwen/ui-fix 
[mobile] top bar: modified styles of icons
 2018-01-05 14:14:58 +08:00
llj
30f098a5c0 [mobile] top bar: modified styles of icons 2018-01-05 14:00:41 +08:00
xiez
4495460810 Merge pull request #1972 from haiwen/sudo_login_attempts 
Sudo login attempts
 2018-01-05 13:37:22 +08:00
zhengxie
2d4c3e2ce2 [sudo] Update tests 2018-01-05 11:56:47 +08:00
zhengxie
4b326ad404 [auth] Refactor login attempts 2018-01-04 17:32:30 +08:00