lian
|
ae77f70a36
|
Merge pull request #2121 from haiwen/search-filter-obj-type
add obj_type filter for search
|
2018-05-16 19:53:04 -07:00 |
|
zming
|
98be047c69
|
add obj_type filter for search
|
2018-05-17 10:41:40 +08:00 |
|
xiez
|
b22c92f9de
|
Merge pull request #2118 from haiwen/update-oauth
Update OAuth
|
2018-05-17 10:18:46 +08:00 |
|
xiez
|
0737b3b5d2
|
Merge pull request #2117 from haiwen/user-event
return timestamp when get user events
|
2018-05-15 17:30:39 +08:00 |
|
lian
|
70f62942e3
|
return timestamp when get user events
|
2018-05-15 17:28:04 +08:00 |
|
xiez
|
086e46d32f
|
Merge pull request #2106 from haiwen/search-repo-type
return repo type when search file via api
|
2018-05-15 17:08:30 +08:00 |
|
zhengxie
|
a51bf28e44
|
[admin api] Update/Remove reference id
|
2018-05-15 14:19:03 +08:00 |
|
lian
|
0019ec6de0
|
Update OAuth
1, custom for sjtu.edu.cn's 'user_id' field
2, add user auth token to cookie
|
2018-05-12 13:59:17 +08:00 |
|
Daniel Pan
|
2eed2b9e1d
|
Merge pull request #2107 from haiwen/guest-search-user
update search user api
|
2018-05-11 15:56:24 +08:00 |
|
lian
|
ed16e644c3
|
return repo type when search file via api
|
2018-05-10 12:41:31 +08:00 |
|
lian
|
dc97762ee7
|
update search user api
disable full email searh if current user is a guest user
|
2018-05-09 15:14:02 +08:00 |
|
Daniel Pan
|
35a531c4af
|
Merge pull request #2103 from haiwen/onlyoffice
fix bug of saving file via onlyoffice
|
2018-05-08 12:24:52 +08:00 |
|
lian
|
31d0a28868
|
fix bug of saving file via onlyoffice
|
2018-05-08 12:22:39 +08:00 |
|
Daniel Pan
|
432ba6f1f5
|
Merge pull request #2091 from haiwen/post-dir-2
update create dir api v2.1
|
2018-04-28 16:21:29 +08:00 |
|
lian
|
ca77136586
|
update create dir api v2.1
recreate dir when failed when `file already exists'.
|
2018-04-28 16:14:24 +08:00 |
|
Daniel Pan
|
454c5934c8
|
Merge pull request #2089 from haiwen/post-dir
update create dir api
|
2018-04-28 11:35:59 +08:00 |
|
lian
|
d6a9988a92
|
update create dir api
recreate dir when failed when `file already exists'.
|
2018-04-28 11:34:53 +08:00 |
|
llj
|
4a5397e542
|
[info bar] fix
|
2018-04-27 15:29:49 +08:00 |
|
Daniel Pan
|
3ee97bc440
|
Merge pull request #2083 from haiwen/sort-dir-file
update get dir/file info api
|
2018-04-26 11:49:23 +08:00 |
|
lian
|
d0a4f257d3
|
update get dir/file info api
sort dir/file by parent_dir.
|
2018-04-26 11:45:30 +08:00 |
|
C_Q
|
7e212c4246
|
[fix] send notices (#2079)
* [fix] send notices
* WIP
* update fix-send-notices test
* Refactor
|
2018-04-25 10:51:33 +08:00 |
|
lian
|
5fcafcb921
|
Merge pull request #2077 from haiwen/footer-time
change footer time
|
2018-04-19 01:18:08 -05:00 |
|
ilearnit
|
12947aea6d
|
change footer time
|
2018-04-19 14:16:55 +08:00 |
|
Daniel Pan
|
9adf6bf683
|
Merge pull request #2076 from haiwen/refactor-dir-view
update dir view
|
2018-04-19 13:16:05 +08:00 |
|
lian
|
89e25fa965
|
update dir view
return file info when get dir info recursively
|
2018-04-19 11:45:17 +08:00 |
|
llj
|
9d8ebf3201
|
Merge pull request #2071 from haiwen/group-options
Add group discussion options and file comment options
|
2018-04-18 16:46:04 +08:00 |
|
llj
|
b383846e87
|
[group discussion] fixup for 'enable' option
|
2018-04-18 16:39:20 +08:00 |
|
ilearnit
|
876fa2e138
|
Add group discussion options and file comment options
|
2018-04-18 15:05:21 +08:00 |
|
ilearnit
|
a1055b8969
|
make the change password optional
Conflicts:
seahub/wiki/views.py
|
2018-04-18 13:45:54 +08:00 |
|
lian
|
488c8802a3
|
update multi storages backend
1. use $.isEmptyObject() check if app.pageOptions.storages is empty
2. return [] if no storage_ids setting for user role
|
2018-04-13 13:27:05 +08:00 |
|
xiez
|
12963cb7ef
|
Merge pull request #2068 from haiwen/fix-transfer-share-links
fix transfer share links
|
2018-04-12 16:42:22 +08:00 |
|
ilearnit
|
755f9fbbc6
|
fix transfer share lonks
|
2018-04-12 16:38:23 +08:00 |
|
xiez
|
d4b8fb558f
|
Merge pull request #2067 from haiwen/test_debug
[test] debug
|
2018-04-12 16:36:20 +08:00 |
|
ilearnit
|
7ba56a5abc
|
[test] debug
|
2018-04-12 13:20:13 +08:00 |
|
xiez
|
55e72dc763
|
Merge pull request #2066 from haiwen/transfer-share-links
transfer share links
|
2018-04-12 11:47:21 +08:00 |
|
ilearnit
|
12a9ef5b27
|
transfer share links
|
2018-04-12 10:57:19 +08:00 |
|
lian
|
571a82c19f
|
update trans str
|
2018-04-11 13:31:47 +08:00 |
|
xiez
|
b99c923f8d
|
Merge pull request #2063 from haiwen/dir-recursive
return file info when get dir recursively
|
2018-04-08 15:58:22 +08:00 |
|
lian
|
d643456d0a
|
return file info when get dir recursively
|
2018-04-08 12:06:34 +08:00 |
|
xiez
|
a0684cb057
|
Merge pull request #2053 from haiwen/virtual-repo
rm can_add_repo permission check
|
2018-04-08 11:20:42 +08:00 |
|
lian
|
3ccc0e5084
|
check if enable LIBRARY_TEMPLATES inside repo_create_cb func (#2056)
|
2018-03-30 13:43:48 +08:00 |
|
lian
|
f4cd577823
|
use inner file upload url when send post request inside seahub code. (#2055)
|
2018-03-30 13:29:12 +08:00 |
|
zhengxie
|
df7fd295a2
|
Update requirements
|
2018-03-30 13:28:29 +08:00 |
|
Daniel Pan
|
cfab8f6889
|
Merge pull request #2052 from haiwen/oos-title
add title when view file via OOS
|
2018-03-29 11:11:24 +08:00 |
|
lian
|
d7d90dc5a2
|
rm can_add_repo permission check
|
2018-03-28 14:30:26 +08:00 |
|
lian
|
e3cd767dee
|
add title when view file via OOS
|
2018-03-28 14:08:16 +08:00 |
|
xiez
|
768678054c
|
Merge pull request #2034 from haiwen/multi-storage
update multi storage backend feature
|
2018-03-23 10:36:16 +08:00 |
|
Daniel Pan
|
7fa3816c14
|
Merge pull request #2047 from haiwen/6.2-fixed-search-path
[fixed] error when use search_path feature
|
2018-03-22 16:24:04 +08:00 |
|
zming
|
3998466c25
|
[fixed] error when use search_path feature
|
2018-03-22 13:31:32 +08:00 |
|
Daniel Pan
|
bed0ed8bc5
|
Merge pull request #2037 from haiwen/dst-obj-name
update admin library dirent copy api
|
2018-03-19 14:56:24 +08:00 |
|