saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-10-31 05:41:13 +00:00
Code Activity
241 commits 2 branches 74 tags 31 MiB
Commit graph

241 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel García
16056626b0
 		Merge pull request #131 from mprasil/revision_date 
Implement update_revision trigger
 2018-08-13 14:38:30 +02:00
Miroslav Prasil
626a3c93ba Revert "Merge branch 'beta' of https://github.com/krankur/bitwarden_rs into beta" 
This reverts commit 3fd3d8d5e9.
 2018-08-13 12:35:41 +01:00
Miroslav Prasil
3f5a99916a Implement update_revision trigger 2018-08-13 10:58:39 +01:00
Miroslav Prasil
b5a057f063 Merge branch 'master' into beta 2018-08-10 21:43:16 +01:00
Daniel García
e7e0717f5b
 		Merge pull request #129 from krankur/beta 
Implemented PUT for /two-factor/authenticator and /two-factor/disable #124
 2018-08-10 22:20:44 +02:00
Kumar Ankur
3fd3d8d5e9 Merge branch 'beta' of https://github.com/krankur/bitwarden_rs into beta 2018-08-10 23:49:34 +05:30
Kumar Ankur
7b2de40beb Merge branch 'beta' of https://github.com/krankur/bitwarden_rs into beta 2018-08-10 23:26:55 +05:30
Kumar Ankur
5f6d721c09 Implemented PUT for /two-factor/authenticator and /two-factor/disable 2018-08-10 23:20:19 +05:30
Kumar Ankur
ddda86b90d Implemented bulk cipher share (share selected) #100 2018-08-10 23:20:19 +05:30
Daniel García
c6256e1455
 		Merge pull request #128 from mprasil/revision_date 
Return revision date in miliseconds (fixes #127)
 2018-08-10 19:40:56 +02:00
Daniel García
0cd3053fcb
 		Merge pull request #125 from stammw/master 
Make password hints available in the error message #85
 2018-08-10 19:40:31 +02:00
Miroslav Prasil
58c1545707 Return revision date in miliseconds (fixes #127) 2018-08-10 17:18:59 +01:00
Jean-Christophe BEGUE
d3b4b10d18 Add a explaination to the password hint message #85 2018-08-10 16:59:23 +02:00
Jean-Christophe BEGUE
c031ae9f2f Make password hints available in the error message #85 2018-08-10 15:52:06 +02:00
Daniel García
672e3273cd
 		Merge pull request #123 from mprasil/beta_patch 
Fix patch file for v2.1.1
 2018-08-09 16:40:29 +02:00
Miroslav Prasil
039860f87e Fix patch file for v2.1.1 2018-08-09 13:38:40 +01:00
Daniel García
9511456ded
 		Merge pull request #116 from krankur/beta 
Implemented bulk cipher share (share selected) #100
 2018-08-09 01:44:16 +02:00
Daniel García
04b198a7e2
 		Merge pull request #120 from mprasil/vault_2.1.1 
Update vault to latest version
 2018-08-09 01:43:22 +02:00
Miroslav Prasil
73a1abed10 Update vault to latest version 2018-08-08 23:15:01 +02:00
Kumar Ankur
fb7b1c8c18 Implemented bulk cipher share (share selected) #100 2018-08-06 03:29:44 +05:30
Daniel García
8ffa7ebb6a
 		Merge pull request #115 from krankur/beta 
Implmeneted DELETE on 'api/ciphers' to delete selected ciphers (#98)
 2018-08-03 16:29:23 +02:00
Kumar Ankur
aac1304b46 clean up 2018-08-03 19:31:01 +05:30
Kumar Ankur
7dfc759691 Implmeneted DELETE on 'api/ciphers' to delete selected ciphers (#98) 2018-08-03 19:23:38 +05:30
Daniel García
54afe0671e
 		Merge pull request #111 from krankur/beta 
Implemented PUT for single cipher sharing (#97)
 2018-08-01 21:12:48 +02:00
Kumar Ankur
74e2ca81ae Implemented PUT for single cipher sharing (#97) 2018-08-02 00:07:14 +05:30
Daniel García
d6fadb52ff
 		Merge pull request #109 from mprasil/beta_merge 
Merge changes from master to beta
 2018-08-01 12:57:32 +02:00
Miroslav Prasil
b163aeb8ca Merge changes in master to beta branch (concurrency fixes) 2018-08-01 11:37:42 +01:00
Daniel García
fcb479a457
 		Merge pull request #108 from krankur/beta 
Implementing PUT for 'api/ciphers/move' (#99)
 2018-08-01 11:49:14 +02:00
Kumar Ankur
0e095a9fa4 change to reuse the logic for POST in PUT as well 2018-08-01 13:50:52 +05:30
Kumar Ankur
2f6aa3c363 Reverting removal of 'api/ciphers/move' POST as it is required for backward compatibility 2018-08-01 11:21:05 +05:30
Kumar Ankur
fcc485384f clean up 2018-08-01 04:12:46 +05:30
Kumar Ankur
91a2319325 Implementing PUT for ciphers/move (#99) 2018-08-01 03:58:47 +05:30
Daniel García
56b3afa77c
 		Merge pull request #107 from shauder/bug/attachments_for_orgs 
Bug/attachments for orgs
 2018-07-31 20:08:05 +02:00
Shane A. Faulkner
d335f45e34 Bump version to 0.12.0 2018-07-31 12:07:03 -05:00
Shane A. Faulkner
34d2648509
 		Merge pull request #3 from shauder/master 
Sync working branch with changes in master upstream
 2018-07-31 12:05:52 -05:00
Shane A. Faulkner
f39c4fe2f4
 		Merge pull request #2 from dani-garcia/master 
Sync local fork with upstream
 2018-07-31 12:03:39 -05:00
Shane A. Faulkner
01875c395b
 		Merge pull request #1 from mprasil/concurrency_fix 
WAL journal mode and delete retry added
 2018-07-31 11:39:45 -05:00
Miroslav Prasil
2872f40d13 WAL journal mode and delete retry added 2018-07-31 16:43:43 +01:00
Daniel García
07a30c8334
 		Merge pull request #106 from mprasil/beta_stable 
Use stable release of v2.0.0
 2018-07-30 15:43:41 +02:00
Miroslav Prasil
ceb3d0314d Use stable release of v2.0.0 2018-07-27 10:01:33 +01:00
mprasil
d7df545078
 		Merge pull request #104 from jcgruenhage/patch-1 
Update matrix.to link in the README
 2018-07-26 22:52:12 +01:00
Jan Christian Grünhage
d073f06652
 		Update matrix.to link in the README 
Using the room ID instead of an alias isn't supposed to be working for joining rooms, and doesn't work when joining over federation. It only works when your server is already participating in the room.
 2018-07-26 22:42:02 +01:00
Daniel García
3726da9c14
 		Merge pull request #103 from mprasil/https_doc_fix 
Fixed the documentation for https (resolves #101)
 2018-07-24 15:28:23 +02:00
Miroslav Prasil
51450a0df9 Fixed the documentation for https (resolves #101) 2018-07-24 12:32:41 +01:00
Daniel García
659f677897 Add missing slash, to put it like it was at first 2018-07-21 18:50:54 +02:00
Daniel García
a291dea16f Updated dependencies and Docker image to new web-vault 2018-07-21 17:27:00 +02:00
Shane A. Faulkner
98bae4a0a1 Cleanup and working with 2 or less attachments 2018-07-18 15:35:45 -05:00
Daniel García
48e69cebab
 		Merge pull request #92 from mprasil/not_found 
Return 404 in case the path doesn't match instead of 500
 2018-07-18 14:07:28 +02:00
Daniel García
798a3b6a43
 		Merge pull request #91 from mprasil/worker_threads 
Change number of workers in image, document the setting (fixes #90)
 2018-07-18 14:06:53 +02:00
Miroslav Prasil
2dc1427027 Bump the version 2018-07-18 12:04:48 +01:00