seafile:fix_conflict

Branch merges

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

94bed47... by =?utf-8?b?5p2o6LWr54S2?= <email address hidden> on 2021-06-21

Don't delete local file when failed to rename backup file to conflict file

8f05b54... by sun20121818 <email address hidden> on 2021-06-16

[Mac] Build mac dmg on local (#2458)

* [Mac] Build mac dmg on local

* [Mac]Add command-line arguments of mac build script

c95bc45... by Xiangyue Cai <email address hidden> on 2021-04-29

handle repo too large error (#2447)

eed7fa2... by Xiangyue Cai <email address hidden> on 2021-03-22

Reduce explorer refresh when copy large folders into library (#2432)

* refresh explorer only for top dir

* fixed refresh problem

* no need to change ignore logic

* only refresh top dir when syncing

* refresh explorer when syncing

8943bcf... by Seafile Ltd on 2021-03-18

Update README.markdown

50d4d5a... by Xiangyue Cai <email address hidden> on 2021-02-22

support json output (#2419)

* support json output

* simplify code

2493113... by sun <email address hidden> on 2021-02-19

Update version to 8.0.2

39c33d0... by freeplant on 2021-01-12

Update README.markdown

0a1bb6a... by feiniks <email address hidden> on 2020-12-30

Should use full_path,the path mabe NULL (#2412)

30fe948... by feiniks <email address hidden> on 2020-12-29

Add sync error when upload a invalid path on linux or mac (#2410)

* Add sync error when upload a invalid path on linux or mac

* Only check the base name of path