seafile

seafile:maxerdrive

  1. Git
  2. lp:seafile
  3. maxerdrive
Last commit made on 2014-05-29
Get this branch:
git clone -b maxerdrive https://git.launchpad.net/seafile

Branch merges

Branch information

Name:
maxerdrive
Repository:
lp:seafile

Recent commits

9435e9d... by Shuai Lin

customization for maxerdrive

5dca804... by Shuai Lin

update msi/deb version to 3.0.4

63c211f... by Shuai Lin

Merge branch '3.0'

8b04dc0... by Jiaqiang Xu

[client] Fix a bug in merge.

Reproduce sequence (only for version 0 repo):
1. Both client and server change the same file;
2. Client syncs and do a real merge and fails with conflict;
3. The 30-second auto syncing timer kicks in, sync state [initializing] -> [merging];
4. Merge returns "Already up to date".
5. Afterwards, every sync of this repo will stuck in "Already up to date".

c0bf949... by zhengxie <email address hidden>

[server] return NULL if username is empty in check_repo_permission

aa3d1a2... by Jiaqiang Xu

Remove unused code.

5a73198... by Jiaqiang Xu

[server] Improve db connection pool.

644d9f0... by Jiaqiang Xu

[server] Check store id validity in a few RPC.

240dc14... by Shuai Lin

allow using a privileged port for block tranfer, Closes #597

371e052... by Shuai Lin

apply the patch metioned in #518

add libjansson flags to Makefiles