Commit Graph

966 Commits

Author SHA1 Message Date
Chilledheart
9ee615bce0 Use uname command to detect Darwin platform 2014-06-08 14:55:16 +08:00
Jiaqiang Xu
41e8968929 Merge branch '3.0' 2014-05-27 11:39:48 +08:00
lins05
b9b15030e7 Merge pull request #654 from matejc/fastcgifix
fastcgi: use 0.0.0.0 instead of localhost
2014-05-26 16:11:50 +08:00
Matej Cotman
1630e99118 fastcgi: optional env var SEAFILE_FASTCGI_HOST for listen address 2014-05-25 19:31:38 +02:00
lins05
b598f82ca5 [scripts] fixed creating admin account in seafile-admin 2014-05-21 17:37:19 +08:00
poetwang
793fe6c2b8 v3.0.4 2014-05-21 10:38:20 +08:00
lins05
08b639fa04 [scripts] show error detail when gunicorn failed to start 2014-05-19 11:38:02 +08:00
Jiaqiang Xu
f7007d41fa Improve object and block writting performance. 2014-05-16 15:24:06 +08:00
zhengxie
d6ccd3a66c [python] Rename group repo related api 2014-05-16 13:21:15 +08:00
Jiaqiang Xu
89ceb5a6ac Merge pull request #641 from yason/master
Add #ifdef to include correct headers on BSD systems
2014-05-15 14:11:42 +08:00
Kirill Bychkov
4779ff609a Free/Net/OpenBSD have another names for libevent2 headers.
Add #ifdef / #else / #endif to include correct headers.
2014-05-14 13:42:46 +04:00
lins05
1d8514af61 Merge branch 'master' of https://github.com/yason/seafile 2014-05-14 11:23:52 +08:00
plt
718b40e299 Merge pull request #633 from spacemule/master
Clean up of README
2014-05-13 14:01:52 +08:00
lins05
5dca8045b3 update msi/deb version to 3.0.4 2014-05-12 17:20:13 +08:00
lins05
63c211f09f Merge branch '3.0' 2014-05-12 17:02:08 +08:00
Jiaqiang Xu
8b04dc0dac [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".
2014-05-12 16:20:09 +08:00
Noah Kalish
c3b4587b09 Clean up README.markdown 2014-05-07 22:28:08 -05:00
Noah Kalish
de2883ed00 Merge branch 'master' of https://github.com/spacemule/seafile 2014-05-07 21:27:47 -05:00
Noah Kalish
7c00a06a36 Clean up README.markdown 2014-05-07 21:27:13 -05:00
spacemule
f9ee688997 Update README.markdown 2014-05-07 21:25:59 -05:00
Noah Kalish
f7f7eac716 Clean up README.markdown 2014-05-07 20:57:47 -05:00
Noah Kalish
c5e8a88bfc Clean up README.markdown 2014-05-07 20:51:10 -05:00
Noah Kalish
69220b116c Clean up README.markdown 2014-05-07 20:50:19 -05:00
zhengxie
c0bf9494a9 [server] return NULL if username is empty in check_repo_permission 2014-05-07 15:57:33 +08:00
Jiaqiang Xu
aa3d1a2cdf Remove unused code. 2014-05-05 16:32:30 +08:00
Jiaqiang Xu
5a73198dca [server] Improve db connection pool. 2014-05-05 11:12:17 +08:00
Jiaqiang Xu
644d9f043f [server] Check store id validity in a few RPC. 2014-05-05 11:08:11 +08:00
Kirill Bychkov
e66e4960b7 remove icons and desktop files. their new home should be at seafile-client 2014-04-30 18:06:07 +04:00
lins05
240dc14df6 allow using a privileged port for block tranfer, Closes #597 2014-04-30 17:02:24 +08:00
lins05
371e052a2a apply the patch metioned in #518
add libjansson flags to Makefiles
2014-04-30 16:41:51 +08:00
lins05
11dcd0a209 [client] use new login api in seaf-cli 2014-04-30 14:39:03 +08:00
lins05
f5f0ef3424 [client] update msi/deb version to 3.0.3 2014-04-30 11:40:00 +08:00
Jiaqiang Xu
0276624016 [client] Use old sendcommit-proc to sync old version libraries. 2014-04-30 08:57:44 +08:00
Jiaqiang Xu
b39636217c [server] Fix a bug in recvfs-proc.
pending_objects should be decreased after the object is written
into disk.
2014-04-28 17:12:59 +08:00
Jiaqiang Xu
a41fe51b37 [http] Fix a bug when download a non-existing block. 2014-04-28 15:11:04 +08:00
lins05
52108d5d6c fixed webdav in build-server.py 2014-04-28 14:06:10 +08:00
Jiaqiang Xu
054d30a090 [server] Fix a bug when uploading file with client-encryption. 2014-04-28 13:36:28 +08:00
Jiaqiang Xu
3bc5772b9d [server] Retain sub-library if parent directory is renamed. 2014-04-25 16:37:56 +08:00
Jiaqiang Xu
adf135fd1b [server] Retain sub-library on rename. 2014-04-25 14:56:18 +08:00
lins05
a7c7568195 Revert "Should not change localhost to '127.0.0.1'"
This reverts commit 87c9782291.
Our test on some systems shows that using "localhost" would cause
connection problems, so we have to force using tcp to connect to mysql.
2014-04-25 10:26:12 +08:00
lins05
c43a4a77ed Merge pull request #592 from benjaoming/patch-1
Should not change localhost to '127.0.0.1'
2014-04-25 10:13:16 +08:00
lins05
e5bdf3b674 [scripts] added 3.0 upgrade script for seafile windows server 2014-04-24 14:54:40 +08:00
lins05
8863ef9757 [script] update build-server.py
fix raspberry pi package name
2014-04-24 11:00:54 +08:00
lins05
0f3f230618 [cli] fixed seaf-cli
clone/download rpc params has changed in seafile version 3.0+
2014-04-21 19:11:37 +08:00
lins05
653f11dced [client] upgraded msi/deb version to 3.0.2 2014-04-21 17:48:57 +08:00
Jiaqiang Xu
e08c94d921 [client] fix a sync bug after multiple merges. 2014-04-21 17:42:06 +08:00
lins05
3f4527220c [scripts] add 2.2 to 3.0 upgrade script
Also upgrade source version to 3.0.2
2014-04-21 17:04:43 +08:00
lins05
8e005b2301 Merge branch '2.2'
Conflicts:
	debian/changelog
	msi/Includes.wxi
2014-04-21 15:38:00 +08:00
Jiaqiang Xu
1c9cbb4bb5 Fix a minor SQL bug. 2014-04-21 15:19:19 +08:00
Jiaqiang Xu
ad1d1e4a39 Use prepared statements for accessing database. 2014-04-21 12:02:41 +08:00