Upstream/bitwarden-server
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2024-12-17 16:07:41 +01:00
Code Issues Projects Releases Wiki Activity
2,449 Commits 298 Branches 183 Tags 77 MiB
14a8224a99
Commit Graph

2449 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
hinton
14a8224a99 Be explicit about AccessAll for ViewPassword 2020-05-23 11:06:41 +02:00
hinton
1c0095b122 Be explicit with AccessAll and fix bug in create/update cipher 2020-05-23 10:36:35 +02:00
hinton
54f3ab5863 Add database migration script for hidden passwords 2020-05-22 22:52:08 +02:00
hinton
f2348d2264 Resolve review comments 2020-05-22 22:16:01 +02:00
hinton
28fe86ecff Merge branch 'master' of https://github.com/bitwarden/server into feature/hide-passwords 
# Conflicts:
#	src/Sql/dbo/Stored Procedures/CollectionUser_UpdateUsers.sql
#	src/Sql/dbo/Stored Procedures/OrganizationUser_UpdateWithCollections.sql
 2020-05-22 21:42:29 +02:00
Kyle Spearrin
4b776f9413 bump docker version 2020-05-22 10:16:51 -04:00
Kyle Spearrin
beb40eb682
Update swagger config to use proper URL scheme (#744) 2020-05-21 15:00:03 -04:00
Kyle Spearrin
343ef92a20
Sproc tweaks (#730) 
* do not follow local hosts or ip addresses

* remove cron from mssql

* migration script

* Use joins instead of temp tables

* update migration script with join changes
 2020-05-21 11:35:00 -04:00
hinton
36f15c67d0 Add support for new collection access, hide passwords 2020-05-21 15:38:57 +02:00
Kyle Spearrin
0cd90be83a bump version for release 2020-05-18 21:58:12 -04:00
Kyle Spearrin
c205bf72e6 update some libs 2020-05-18 21:57:14 -04:00
Chad Scharf
e71617886a
Merge pull request #736 from bitwarden/subscription-credit-fix 
Stripe not crediting customer balance after void
 2020-05-18 13:16:56 -04:00
Chad Scharf
d49cc18a41 Stripe not crediting customer balance after void 2020-05-18 12:38:00 -04:00
Kyle Spearrin
d22992451c
updated bootstrap and colors (#733) 2020-05-15 13:24:25 -04:00
Chad Scharf
97158d607a
Merge pull request #727 from bitwarden/subscription-change-invoicing 
Subscription change, invoice process update
 2020-05-13 10:24:46 -04:00
Chad Scharf
cdfde692a6 Fixed SDK reference issue in Billing proj 2020-05-13 09:58:17 -04:00
Chad Scharf
9ef39bcadb Removed payment_behavior, errant whitespace 2020-05-13 09:54:10 -04:00
Kyle Spearrin
5c8c915f4e
Increase limits set by importer to 2k (#729) 2020-05-13 09:23:59 -04:00
Chad Scharf
a024b43cea Updated code style and PR feedback 2020-05-12 17:22:04 -04:00
Kyle Spearrin
10a6e12d09
generate signin token for enterprise portal (#728) 2020-05-12 15:36:33 -04:00
Chad Scharf
a9a7003bfc Subscription change, invoice process update 2020-05-12 12:48:21 -04:00
Chad Scharf
00af142d63
Merge pull request #723 from bitwarden/stripe-sdk-update 
Updated Stripe API SDK version to 36.9.0
 2020-05-08 11:15:52 -04:00
Chad Scharf
9a2d8e96e4 Updated Stripe API SDK version to 36.9.0 2020-05-08 10:15:48 -04:00
Kyle Spearrin
3c5cd0ffb2 brand color updates 2020-05-05 17:08:53 -04:00
Chad Scharf
ddd7ea94ed
Merge pull request #718 from Overflow0xFFFF/feature/api-unit-test-suite 
Server API unit test suite
 2020-05-04 21:43:55 -04:00
Joshua Ford
e00f53369f Create tests for AccountsController 
Partial test suite included to minimize the amount necessary to review.
 2020-05-04 17:30:15 -05:00
Joshua Ford
945d4cc1c1 Initialize Api.Test unit test suite 2020-05-04 17:30:06 -05:00
Mart124
e6526ab596
Properly download bitwarden.sh (#720) 2020-05-04 15:44:38 -04:00
Mart124
330ff7cd80
Fix sleep calculation (#719) 
* Fix sleep calculation

* Fix sleep calculation
 2020-05-04 07:48:16 -04:00
Kyle Spearrin
9cb103e6aa update comment 2020-05-01 11:09:44 -04:00
Kyle Spearrin
7abfefd167 replace ip regex with IPAddress.Parse 2020-05-01 11:08:47 -04:00
Kyle Spearrin
3462613f49 Do not request local hosts or ip addresses 2020-04-30 11:41:30 -04:00
Kyle Spearrin
68901437ba only fetch icons from http(s) with default ports 2020-04-30 11:23:40 -04:00
Kyle Spearrin
fae4a335dc
public API for organization import (#707) 2020-04-23 11:29:19 -04:00
Kyle Spearrin
c177714799
Remove www. URL from alibaba (#701) 2020-04-16 10:38:39 -04:00
Chad Scharf
eeba92b46f
Merge pull request #696 from bitwarden/soft-delete-sql-cleanup 
[Soft Delete] deleted date null failure in DataTable
 2020-04-10 15:25:37 -04:00
Chad Scharf
145dcabba6 [Soft Delete] bulk import fails if DeletedDate null 2020-04-10 13:43:51 -04:00
Chad Scharf
45e1e1a01b [Soft Delete] - cleanup whitespace in Cipher_Restore 2020-04-10 13:22:09 -04:00
Chad Scharf
32f19e9f90 [Soft Delete] - Add not null/is null filters to soft delete and restore sprocs 2020-04-10 13:22:09 -04:00
Chad Scharf
50069bbfa4
Merge pull request #695 from bitwarden/soft-delete-sql-cleanup 
[Soft Delete] Add not null/is null filters to soft delete restore sprocs
 2020-04-10 11:15:05 -04:00
Chad Scharf
43501e643f [Soft Delete] - cleanup whitespace in Cipher_Restore 2020-04-10 10:51:27 -04:00
Chad Scharf
598e1ff92b [Soft Delete] - Add not null/is null filters to soft delete and restore sprocs 2020-04-09 15:25:17 -04:00
Chad Scharf
4b5e708ea3
Merge pull request #693 from bitwarden/soft-delete-fix 
[Soft Delete] - fix Upsert calls based on cipher supertype
 2020-04-09 09:22:13 -04:00
Chad Scharf
4defd13395 [Soft Delete] - fix Upsert calls based on cipher supertype 2020-04-08 16:18:22 -04:00
Kyle Spearrin
b106fd22fb
Only set channel prefix. Use machine name on counter (#687) 2020-04-03 08:39:59 -04:00
Kyle Spearrin
d6ed8291e6
Only apply count restriction to non-deleted users (#685) 2020-04-02 20:31:02 -04:00
Chad Scharf
168f0314f8
Merge pull request #686 from bitwarden/soft-delete-sql 
Fixed date time precision assignment for DeletedDate and RevisionDate
 2020-04-02 14:44:17 -04:00
Chad Scharf
7f22088d5f Fix delcaration of @UtcNow variable 2020-04-02 14:08:19 -04:00
Chad Scharf
3d786cbf28
Update Cipher_SoftDelete.sql 
Co-Authored-By: Kyle Spearrin <kspearrin@users.noreply.github.com>
 2020-04-02 14:06:15 -04:00
Chad Scharf
eb34cc49c6 Fixed date time precision assignment for DeletedDate and RevisionDate (performance + match/data quality) 2020-04-02 13:45:53 -04:00