Daniel García
8ce4c79612
Merge pull request #233 from Toucan-Sam/patch-2
...
Update PROXY.md
2018-10-26 00:37:34 +02:00
Toucan-Sam
77d9641323
Update PROXY.md
...
Removed: `include conf.d/proxy-confs/proxy.conf;` lines because they're specific to user (shauder) and will break nginx if copy-pasted/don't exist.
Changed: Moved listen value and server_name to top as is standard for nginx configs
Changed: Commented out SSL config as it's specific to user (shauder) and will break if copy-pasted/don't exist. But is still useful and a good idea for simplifying nginx config.
Changed: Rearranged location blocks because OCD. First /, then /notifications/hub, then /notifications/hub/negotiate because it looks nicer in a tree where each location grows.
2018-10-25 19:45:22 +13:00
Daniel García
31e4237247
Merge pull request #231 from janost/fix-save-equivalent-domains
...
Accept PUT and POST on /settings/domains, returns JsonResult, fixes saving Custom Equivalent Domains
2018-10-23 01:30:28 +02:00
janost
c32c65d367
Accept PUT and POST on /settings/domains, returns JsonResult, fixes saving Custom Equivalent Domains
2018-10-23 00:32:43 +02:00
Daniel García
0a4dbaf307
Merge pull request #226 from janost/fix-sync-without-query-string
...
Fix /sync without query string
2018-10-19 01:34:32 +02:00
janost
daa66b08dc
Fix /sync without query string
2018-10-19 00:54:40 +02:00
Daniel García
d613fa1e68
Merge pull request #225 from janost/sync-exclude-domains
...
Don't send Domains if excludeDomains=true on /sync
2018-10-17 23:49:09 +02:00
janost
55fbd8d468
Don't send Domains if excludeDomains=true on /sync
2018-10-17 23:22:07 +02:00
Daniel García
adf40291e8
Update web vault to 2.4.0
2018-10-16 16:20:56 +02:00
Daniel García
acfc900997
Merge pull request #224 from fbartels/patch-2
...
refine backup instructions
2018-10-15 22:56:16 +02:00
Felix Bartels
0a08b1afc8
refine backup instructions
...
as mentioned in https://github.com/dani-garcia/bitwarden_rs/issues/223
2018-10-15 21:47:22 +02:00
Daniel García
eb48a3fac2
Merge pull request #221 from mprasil/ws_disable
...
Disable WebSockets negotiation by default
2018-10-15 16:20:07 +02:00
Miroslav Prasil
2e7fa6440b
Do not spawn WS thread if it's disabled
2018-10-15 15:08:15 +01:00
Miroslav Prasil
9ecc98c3cc
Disable WebSockets negotiation by default
2018-10-14 23:25:16 +01:00
Daniel García
02fd68d63b
Merge pull request #218 from janost/refactor-folder-save
...
Folder::save() should return QueryResult instead of bool
2018-10-14 20:07:27 +02:00
Daniel García
235bce1ecb
Merge pull request #220 from janost/refactor-user-save
...
User::save() should return QueryResult instead of bool
2018-10-14 20:07:04 +02:00
janost
e985221b50
User::save() should return QueryResult instead of bool
2018-10-14 19:33:12 +02:00
janost
77cf63c06d
Folder::save() should return QueryResult instead of bool
2018-10-14 18:25:04 +02:00
Daniel García
faec050a6d
Merge pull request #217 from janost/refactor-device-save
...
Device::save() should return QueryResult instead of bool
2018-10-14 17:35:59 +02:00
Daniel García
22304f4925
Merge pull request #219 from janost/refactor-organization-save
...
Organization::save() and UserOrganization::save() should return QueryResult instead of bool
2018-10-14 17:35:30 +02:00
janost
58a78ffa54
Device::save() should return QueryResult instead of bool
2018-10-14 16:17:37 +02:00
janost
64f6c60bfd
Organization::save() and UserOrganization::save() should return QueryResult instead of bool
2018-10-14 16:04:23 +02:00
Daniel García
e0614620ef
Merge pull request #216 from mprasil/superuser
...
Implement poor man's admin panel
2018-10-13 17:16:06 +02:00
Miroslav Prasil
a28caa33ef
Implement poor man's admin panel
2018-10-12 15:20:10 +01:00
Daniel García
ce4fedf191
Change error response to be closer to upstream
2018-10-10 20:37:04 +02:00
Daniel García
f2078a3849
Merge pull request #213 from janost/refactor-collectioncipher-save-delete
...
CollectionCipher::save() and delete() should return QueryResult instead of bool
2018-10-07 16:06:47 +02:00
janost
5292d38c73
CollectionCipher::save() and delete() should return QueryResult instead of bool
2018-10-07 11:06:11 +02:00
Daniel García
1049646e27
Merge pull request #210 from janost/cipher-save-refactor
...
Cipher::save() should return QueryResult instead of bool
2018-10-06 16:08:04 +02:00
janost
380cf06211
Cipher::save() should return QueryResult instead of bool
2018-10-06 14:13:49 +02:00
mprasil
1f35ef2865
Merge pull request #209 from janost/resend-invitation-error-message
...
Return proper error message for org reinvite
2018-10-05 23:21:08 +01:00
janost
c29bc9309a
Return proper error message for org reinvite
2018-10-05 12:29:41 +02:00
Daniel García
7112c86471
Updated dependencies, removed valid mail check (now done by lettre), and updated global domains file
2018-10-04 00:01:04 +02:00
Daniel García
2aabf14372
Merge pull request #206 from mprasil/collection_revision
...
Collection update updates User revision
2018-10-01 19:31:43 +02:00
Daniel García
77ff9c91c5
Merge pull request #207 from mprasil/continuation_token
...
Add continuation token when we return object list
2018-10-01 19:31:11 +02:00
Miroslav Prasil
d9457e929c
Add continuation token when we return object list
2018-10-01 17:55:48 +01:00
Miroslav Prasil
86b49856a7
Handle return value from Collection::save()
2018-10-01 17:50:31 +01:00
Miroslav Prasil
54f54ee845
Update revision for users on collection save
2018-10-01 17:04:15 +01:00
Daniel García
015bd28cc2
Merge pull request #201 from mprasil/aarch64
...
Add dockerfile for aarch64 (arm64)
2018-10-01 17:40:20 +02:00
Daniel García
990c83a037
Merge pull request #204 from mprasil/org_improvements
...
Org improvements
2018-10-01 17:40:14 +02:00
Miroslav Prasil
c3c74506a7
Add missing fields to returned Org json
2018-10-01 16:00:11 +01:00
Miroslav Prasil
fb4e6bab14
Clean up the share_collection handling
2018-10-01 15:59:10 +01:00
Miroslav Prasil
fe38f95f15
Add dockerfile for aarch64 (arm64)
2018-09-28 13:01:47 +01:00
Daniel García
9eaa9c1a17
Add WEBSOCKET_ADDRESS config option ( Fixes #199 )
2018-09-28 13:50:04 +02:00
Daniel García
8ee681c4a3
Merge pull request #200 from mprasil/copy_fix
...
Remove unecessary copy from armv7 Dockerfile
2018-09-28 13:31:40 +02:00
Miroslav Prasil
08aee97c1d
Remove unecessary copy from armv7 Dockerfile
2018-09-28 09:49:10 +01:00
Daniel García
2bb6482bec
Merge branch 'openssl-fix'
2018-09-20 22:52:58 +02:00
Daniel García
c169095128
Update dependencies to point to upstream lettre
2018-09-20 22:45:19 +02:00
Daniel García
b1397c95ca
Remove unnecessary path in PROXY.md
2018-09-19 22:33:12 +02:00
Daniel García
3df31e3464
Temp fix for OpenSSL 1.1.1 compatibility
2018-09-19 21:45:50 +02:00
Daniel García
638a0fd3c3
Updated dependencies
2018-09-19 21:43:03 +02:00
