1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-09 19:01:42 +00:00
Commit Graph

7281 Commits

Author SHA1 Message Date
zhengxie
4a498c15f8 [Django 1.11] Feature removed in Django 1.9, request.REQUEST -> request.GET/POST. Remove {% load url from future %} 2018-03-19 13:37:57 +08:00
zhengxie
dcb56d7dd9 Handle empty file/dir rename events 2018-03-19 12:09:46 +08:00
Daniel Pan
4216b7aab1 Merge pull request #2042 from haiwen/search-per-page
update search file api
2018-03-17 20:11:28 +08:00
lian
96156c455c update search file api
set default value of `per_page` parameter to 10
2018-03-17 18:21:42 +08:00
lian
8a57ed1daf Merge pull request #2041 from haiwen/fixed-search-type
fixed search type
2018-03-17 18:04:10 +08:00
zming
aaa5f3a074 fixed search type 2018-03-17 17:42:11 +08:00
llj
9d4cb611b4 Modified js after 'Merge 6.2', since jQuery is updated 2018-03-17 16:58:05 +08:00
Daniel Pan
6daa2a3db0 Merge pull request #2040 from haiwen/pdf-text-selection
[file view] pdf: enable text selection
2018-03-17 15:05:46 +08:00
llj
8d6e0ce5fd [file view] pdf: enable text selection 2018-03-17 14:26:51 +08:00
lian
ad1b6cace7 [locale] Update translations 2018-03-17 13:03:55 +08:00
lian
b6717908cc [locale] Update source string 2018-03-17 13:00:03 +08:00
xiez
a8f649e8e9 Merge pull request #2039 from haiwen/avatar_handle_error
[avatar] Quick fix for avatar image truncated issue which will cause …
2018-03-17 10:58:03 +08:00
zhengxie
eef3e0992d [avatar] Quick fix for avatar image truncated issue which will cause page unavailable 2018-03-17 10:54:49 +08:00
lian
b02805e57b update multi storage backend feature
add STORAGE_CLASS_MAPPING_POLICY setting
2018-03-16 17:30:58 +08:00
Daniel Pan
8802278bb5 Merge pull request #2036 from haiwen/my-libs-fix
[my libs] fixed js
2018-03-16 15:04:07 +08:00
llj
a6026628fb [my libs] fixed js 2018-03-16 14:55:00 +08:00
zhengxie
663eebc8ed [Django 1.11] Feature removed in Django 1.9. Use shortcut to get current site 2018-03-16 13:23:53 +08:00
zhengxie
2d56fd73c0 Rewrite 2fa, do not import models in package level 2018-03-16 11:42:13 +08:00
zhengxie
24b4e4a805 Rewrite contacts and wiki, do not import models in package level 2018-03-16 11:19:34 +08:00
zhengxie
46e0b29637 [auth] Remove unused code 2018-03-16 10:56:59 +08:00
xiez
d120bdef94 Merge pull request #2035 from haiwen/replace-something-with-render
FIx feature removed issue in Django1.10. `render_to_response()` -> `r…
2018-03-16 10:39:44 +08:00
ilearnit
3526b2b5cf FIx feature removed issue in Django1.10. render_to_response() -> render(), remove context_instance arg in `render_to_string()' 2018-03-16 10:33:54 +08:00
llj
545c13085d [SVG] fix after 'merge 6.2' 2018-03-15 11:45:06 +08:00
llj
1182a80989 Merge branch '6.2' 2018-03-15 11:26:02 +08:00
xiez
580a812433 Merge pull request #2033 from haiwen/demo-user
remove CLOUD_MODE check when login demo user
2018-03-14 17:29:34 +08:00
lian
ef5c962b44 update demo user feather
1. remove CLOUD_MODE check when login demo user
2. add ENABLE_DEMO_USER settings
2018-03-14 17:23:12 +08:00
lian
b3da8a8d49 Merge pull request #2031 from haiwen/6.2-trash-event
trash event
2018-03-14 10:58:46 +08:00
zming
f870a6d556 trash event 2018-03-13 18:31:01 +08:00
xiez
44ed4b3955 Merge pull request #2030 from haiwen/password-set
use `seafile_api.is_password_set` to check encrypted repo
2018-03-13 17:57:02 +08:00
lian
df2de72e00 use seafile_api.is_password_set to check encrypted repo 2018-03-13 11:57:13 +08:00
Daniel Pan
e579fb8775 Merge pull request #2029 from haiwen/prefix-query
prefix-query
2018-03-13 10:15:47 +08:00
zming
d6d4bf5aa0 prefix-query 2018-03-12 15:01:58 +08:00
xiez
5dd06a7d0c Merge pull request #2013 from haiwen/fix_rename_activity
Fix folder renaming issue in activity list, ref: https://forum.seafil…
2018-03-08 11:18:43 +08:00
zming
9960fa349c Shared files cannot be previewed by others. 2018-03-08 11:15:20 +08:00
xiez
bdaa660787 Merge pull request #2026 from haiwen/fix-2fa-backup-token
Fix 2fa backup token page when 2fa is skipped.
2018-03-06 17:32:22 +08:00
zhengxie
faf3b84869 Fix 2fa backup token page when 2fa is skipped. 2018-03-06 17:16:38 +08:00
llj
61f4748a46 [system admin] userinfo: improved 'repo transfer' 2018-03-05 15:52:47 +08:00
lian
9a78a6ceef [sysadmin] use web api to transfer repo 2018-03-05 15:52:47 +08:00
xiez
aba614fde8 Merge pull request #2025 from haiwen/pdf-file-view
[file view] update logic for document online view
2018-03-05 14:45:08 +08:00
zming
17f24cda51 review 2018-03-05 14:25:17 +08:00
xiez
e10bbde9c3 Merge pull request #2019 from haiwen/share-link-perm
update permission when user download/upload link
2018-03-05 10:44:48 +08:00
xiez
ee736c1a75 Merge pull request #2020 from haiwen/wopi-post-inner
update wopi post file content
2018-03-05 10:29:19 +08:00
zming
82e4648981 [file view] update logic for document online view 2018-03-03 17:01:35 +08:00
llj
e637c5992f Merge pull request #2024 from haiwen/fileupload
[fileupload] show error message when failed to get upload url
2018-03-03 13:38:39 +08:00
llj
6d4000fc20 [fileupload] show error message when failed to get upload url 2018-03-02 16:11:27 +08:00
lian
5b537709bb Merge pull request #2015 from haiwen/Optimize-search
Reduce redundant operations
2018-03-02 14:16:52 +08:00
zming
16af598e16 Reduce redundant operations 2018-03-02 11:45:52 +08:00
Daniel Pan
d3c8a3f8b2 Merge pull request #2023 from haiwen/pdf-file-view
[file view] always use pdf.js for PDF online view; upgraded pdf.js
2018-03-01 20:49:58 +08:00
lian
5b02073588 Merge pull request #2016 from haiwen/search_custom_bug
update search file_map
2018-03-01 17:01:13 +08:00
lian
91ee8f16cb update permission when user download/upload link
add repo access permission check for share link creator
2018-03-01 16:01:20 +08:00