feiniks 7d26e0a8f4 Skip merge when post files with replace existed (#671) ...

* Skip merge when post files with replace existed

* Use handle_concurrent_update to check if merge commits

* Go handle concurrent update

---------

Co-authored-by: 杨赫然 <heran.yang@seafile.com>

2024-07-27 10:39:09 +08:00

..

gc

Merge branch '11.0'

2024-07-16 17:37:24 +08:00

access-file.c

Add ETag for access file (#664)

2024-07-09 16:58:35 +08:00

access-file.h

Add option to build http server (#648)

2024-03-13 19:38:44 +08:00

copy-mgr.c

Add and del ccnet compilation dependency in seafile (#347)

2020-05-09 16:31:47 +08:00

copy-mgr.h

…

fileserver-config.c

Regularly cleanup files in the httptemp directory (#343)

2020-05-20 18:36:38 +08:00

fileserver-config.h

Regularly cleanup files in the httptemp directory (#343)

2020-05-20 18:36:38 +08:00

http-server.c

Add column type to RepoInfo (#660)

2024-06-19 12:20:38 +08:00

http-server.h

Add option to build http server (#648)

2024-03-13 19:38:44 +08:00

http-status-codes.h

…

http-tx-mgr.c

Add notification server (#535)

2022-12-16 15:29:01 +08:00

http-tx-mgr.h

Add notification server (#535)

2022-12-16 15:29:01 +08:00

index-blocks-mgr.c

Add last_modify field in form (#666)

2024-07-23 18:52:15 +08:00

index-blocks-mgr.h

…

Makefile.am

Support argon2id password hash algo (#637)

2024-05-22 18:49:57 +08:00

notif-mgr.c

Delete seafile_auth_token option (#594)

2023-02-11 10:54:50 +08:00

notif-mgr.h

Delete seafile_auth_token option (#594)

2023-02-11 10:54:50 +08:00

pack-dir.c

Add option to build http server (#648)

2024-03-13 19:38:44 +08:00

pack-dir.h

Add option to build http server (#648)

2024-03-13 19:38:44 +08:00

passwd-mgr.c

Support argon2id password hash algo (#637)

2024-05-22 18:49:57 +08:00

passwd-mgr.h

…

permission-mgr.c

Add and del ccnet compilation dependency in seafile (#347)

2020-05-09 16:31:47 +08:00

permission-mgr.h

…

quota-mgr.c

Get group members add LIMIT (#416)

2020-10-15 15:26:01 +08:00

quota-mgr.h

…

repo-mgr.c

Create repo add pwd_hash and don't read pwd_hash from seafile.conf (#665)

2024-07-16 16:42:37 +08:00

repo-mgr.h

Add last_modify field in form (#666)

2024-07-23 18:52:15 +08:00

repo-op.c

Skip merge when post files with replace existed (#671)

2024-07-27 10:39:09 +08:00

repo-perm.c

Add and del ccnet compilation dependency in seafile (#347)

2020-05-09 16:31:47 +08:00

seaf-server.c

Merge branch '11.0'

2024-07-16 17:37:24 +08:00

seafile-session.c

Merge branch '11.0'

2024-07-16 17:37:24 +08:00

seafile-session.h

get nickname from seahub database (#663)

2024-07-10 16:34:33 +08:00

share-mgr.c

Add column type to RepoInfo (#660)

2024-06-19 12:20:38 +08:00

share-mgr.h

Get accessible repo list return 500 when db error exists (#423)

2020-11-28 14:40:27 +08:00

size-sched.c

Update repofilecount compatibility for older version upgrades (#540)

2022-02-10 16:49:33 +08:00

size-sched.h

…

upload-file.c

Add last_modify field in form (#666)

2024-07-23 18:52:15 +08:00

upload-file.h

Add option to build http server (#648)

2024-03-13 19:38:44 +08:00

virtual-repo.c

Merge branch '11.0'

2024-07-16 17:37:24 +08:00

web-accesstoken-mgr.c

Add option to build http server (#648)

2024-03-13 19:38:44 +08:00

web-accesstoken-mgr.h

…

zip-download-mgr.c

Add option to build http server (#648)

2024-03-13 19:38:44 +08:00

zip-download-mgr.h

Add option to build http server (#648)

2024-03-13 19:38:44 +08:00