lian
5a2b0f848c
rm ENABLE_FOLDER_PERM check when get file lock info
2018-08-30 14:45:10 +08:00
zhengxie
29ce466c3c
Merge branch '6.3'
2018-08-24 17:43:46 +08:00
zheng xie
6d8bfb93f6
Merge pull request #2286 from haiwen/user-role-public
...
add can_add_public_repo user role
2018-08-24 10:40:25 +08:00
lian
eaff121ef2
add can add public repo user role permission
2018-08-23 19:04:33 +08:00
lian
e9dd17f511
update copy dirent api
...
remove same repo_id,path check when copy dirent
2018-08-17 16:13:45 +08:00
zhengxie
864b4da11d
Merge branch '6.3'
...
Conflicts:
seahub/urls.py
2018-08-08 10:40:48 +08:00
Daniel Pan
fa38dd9151
Rewrite wiki page with react ( #2258 )
2018-08-06 18:29:12 +08:00
Hu
cf8cbff719
new activity
2018-07-21 14:08:42 +08:00
Daniel Pan
6db978f9b2
Merge pull request #2215 from haiwen/repo-owner
...
return owner name and contact email when get mine/shared repo list
2018-07-19 16:24:32 +08:00
lian
d69e700fb6
return owner name and contact email when get mine/shared repo list
2018-07-19 15:56:38 +08:00
Daniel Pan
9b653bdbcd
Merge pull request #2214 from haiwen/file-detail-star
...
update file detail api
2018-07-19 14:35:59 +08:00
lian
c00b71630a
update file detail api
...
fix bug when starred file table has more than one records
2018-07-19 14:02:35 +08:00
lian
0d8e7ed41d
update file detail api
...
return permission field & refactor code
2018-07-18 14:35:38 +08:00
lian
54ab3952cb
update file detail api
...
add permission check
2018-07-18 12:40:28 +08:00
lian
edf49639d0
update api2/repos api
...
add share_from(name/contact_email) field when get group/public repos
2018-07-18 11:17:40 +08:00
zhengxie
b51477aea5
Merge branch '6.2' into 6.3
...
Conflicts:
seahub/api2/views.py
seahub/utils/repo.py
2018-07-09 13:13:59 +08:00
lian
8755d87510
add last modifier info to file detail api
2018-07-05 16:51:53 +08:00
lian
8b0e0ceb51
add admin org api
...
1, get org info
2, update name/max user number/quota
3, delete an org
2018-06-27 18:25:21 +08:00
lian
da3aa999a1
add ENABLE_RESET_ENCRYPTED_REPO_PASSWORD
2018-06-26 13:33:30 +08:00
lian
28554c07f2
support init library password when user forget password
2018-06-25 02:42:07 -07:00
lian
603e993c39
update repos dir api
...
remove pro version check when create folder with parents
2018-06-22 14:03:12 +08:00
lian
553aaf68cf
add group owned library user/group share api ( #2133 )
...
* add new api for group owned library share
add all groups api
add group owned library user/group share api
* filter library owner group id in get group share item api
* update get address book memebre info api
* return "group_name" field for groups/admin-libs/admin-trash-libs api
* update address book group api
* update admin delete address book api
* [address book] fixed text tips
2018-06-15 17:14:40 +08:00
lian
4507beb7e8
add starred field to file detail api
2018-06-13 15:25:06 +08:00
zming
7b91da8553
search by time and size
2018-06-05 16:14:03 +08:00
zhengxie
de31389fe0
Merge branch '6.2' into 6.3
2018-06-05 13:39:20 +08:00
zming
af0d175c37
search virtual repo
2018-05-29 17:30:47 +08:00
ilearnit
b01eb64a1f
seafile-editor-master-dist
2018-05-25 13:47:30 +08:00
lian
5a9d362cce
check if repo exist before check folder permission
2018-05-22 15:53:43 +08:00
lian
e6927c3ba9
Merge branch '6.2'
2018-05-18 14:41:45 +08:00
zMingGit
e387c92b99
can set sub-path permission with admin ( #1962 )
...
* can set sub-path permission with admin
* fixup after rebase
2018-05-18 13:46:43 +08:00
lian
8a95cc5060
update group owned library folder permission ( #2096 )
...
* update group owned library folder permission
get/add/modify/delete user/group folder permission
* add new address book api
1, search member in current and sub groups
2, list current and sub groups
* update is_group_member check
NOT check if is address book sub group member when add a member to group
* add rename group owned library api
2018-05-18 11:48:03 +08:00
lian
4af7d0df3f
add translate for out of quota
2018-05-17 17:52:07 +08:00
xiez
148c4becd8
Merge pull request #2119 from haiwen/copy-move-file-quota
...
check quota when copy/move file/dir
2018-05-17 11:12:59 +08:00
zming
98be047c69
add obj_type filter for search
2018-05-17 10:41:40 +08:00
lian
e85a6ff3d4
check quota when copy/move file/dir
2018-05-16 10:53:08 +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
lian
9d79577094
Merge branch '6.2'
2018-05-10 17:29:23 +08:00
lian
ed16e644c3
return repo type when search file via api
2018-05-10 12:41:31 +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
lian
c82f040cc7
Refactor view edit file ( #2084 )
...
* remove unused code
remove api_convert_desc_link, prepare_events, view_repo_file
* refactor file view function
2018-04-27 16:45:44 +08:00
zhengxie
8d10466ce9
Merge branch '6.2'
...
Conflicts:
media/css/seahub.css
seahub/notifications/management/commands/send_notices.py
seahub/notifications/models.py
seahub/templates/js/templates.html
seahub/views/__init__.py
seahub/views/file.py
tests/seahub/notifications/management/commands/test_send_notices.py
tests/seahub/notifications/test_models.py
2018-04-27 11:00:43 +08:00
lian
d0a4f257d3
update get dir/file info api
...
sort dir/file by parent_dir.
2018-04-26 11:45:30 +08:00
lian
89e25fa965
update dir view
...
return file info when get dir info recursively
2018-04-19 11:45:17 +08:00
haiwen
3a82e7694e
Merge branch '6.2'
2018-04-14 03:00:03 +00:00
ilearnit
12a9ef5b27
transfer share links
2018-04-12 10:57:19 +08:00
zhengxie
d0f8e1b2b2
Merge branch '6.2'
...
Conflicts:
seahub/views/__init__.py
static/scripts/app/views/myhome-repos.js
2018-04-11 13:25:52 +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
