soledad.git/server/pkg, branch debian/platform-0.9 [soledad] Merge tag '0.9.3' into debian/platform-0.9 2017-03-11T13:38:51+00:00 drebs drebs@leap.se 2017-03-11T13:38:51+00:00 3ec21a7a6b39b4fe8885f3050ab75402e6812a1f 0.9.3 Conflicts: server/pkg/soledad-server server/pkg/soledad-server.service 
0.9.3

Conflicts:
	server/pkg/soledad-server
	server/pkg/soledad-server.service
[pkg] add script for deploying from git 2017-02-13T13:37:59+00:00 Kali Kaneko kali@leap.se 2017-02-13T13:13:14+00:00 e600a7f57c177fa45c598d24248ef937f1d02e4b - Resolves: #8765 
- Resolves: #8765
[bug] fix typo, again 2017-02-13T13:28:07+00:00 Kali Kaneko kali@leap.se 2017-02-13T13:28:07+00:00 19dfe7e9d1f1862026e768301da2ee1273ec7f9f 






[bug] fix import typo on create-user-db
2017-02-13T13:19:49+00:00

Kali Kaneko
kali@leap.se

2017-02-13T13:19:49+00:00

12e14b761d4669a2f654d870d444356623ffc56f












[refactor] update create-user-db script to use config refactor
2017-02-12T19:33:48+00:00

Kali Kaneko
kali@leap.se

2017-02-12T19:33:48+00:00

6cabe46e4671627c22d5eed9ebb3bdc751948414












[pkg] use the entrypoint from the systemd script too
2017-02-10T21:45:40+00:00

Kali Kaneko
kali@leap.se

2017-02-10T21:45:40+00:00

3b41a4de9c0d0f32815fbd11df3b379bc8688069












[bug] fix typo in the resource path
2017-02-09T23:15:32+00:00

Kali Kaneko
kali@leap.se

2017-02-09T23:15:25+00:00

cfc0dadc7cc927dd9ee6df8c07c1094ccfdc53c5












[pkg] add systemd service file to master
2017-02-09T17:03:05+00:00

Kali Kaneko
kali@leap.se

2017-02-09T17:01:40+00:00

b6359ed68d611cfa11b11e0591eb6186351793bd

this is to ease the packaging flow used in some environments like
Pixelated, that use a debian branch against different branches.

- Resolves: #8762





this is to ease the packaging flow used in some environments like
Pixelated, that use a debian branch against different branches.

- Resolves: #8762







[refactor] allow passing threadpool pool for server sync resource
2017-02-09T16:41:45+00:00

drebs
drebs@leap.se

2017-01-26T21:18:15+00:00

47858d88ca4ca10ac363c71550b1bafe50f8f4ce

Conflicts:
	server/src/leap/soledad/server/_resource.py
	testing/tests/server/test__resource.py





Conflicts:
	server/src/leap/soledad/server/_resource.py
	testing/tests/server/test__resource.py







[feat] use twisted web http auth and creds
2017-02-09T16:41:35+00:00

drebs
drebs@leap.se

2016-12-18T18:36:39+00:00

260805b9967184841c4499f94713a9a48c49a813