1
0
mirror of https://github.com/bitwarden/server.git synced 2024-11-22 12:15:36 +01:00
Commit Graph

2437 Commits

Author SHA1 Message Date
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
Chad Scharf
1bd4a27f22
Merge pull request #684 from bitwarden/soft-delete
[Soft Delete] - API updates for soft delete + retrieval
2020-04-02 12:26:40 -04:00
Chad Scharf
c0019e7abc [Soft Delete] Update assignment of deleted and revision date to 1-liner 2020-04-02 10:56:22 -04:00
Chad Scharf
d07f27f274 [Soft-Delete] Simplify the data-tier, removed extra sprocs and reuse update 2020-04-01 16:39:27 -04:00
Chad Scharf
f6044f0d00 Missed one other PR comment fix 2020-04-01 15:47:10 -04:00
Chad Scharf
1d04803bd0 Resolved PR comments, spacing and controller code-line reversion 2020-04-01 14:55:14 -04:00
Chad Scharf
d014a597dd [Soft Delete] - API updates for soft delete + retrieval 2020-04-01 13:00:25 -04:00
Kyle Spearrin
fef512bad1
use message codes in query string (#681) 2020-03-29 23:41:31 -04:00
Chad Scharf
0422436287
Merge pull request #679 from bitwarden/control-flow-syntax-change
Changed all C# control flow block statements to include space...
2020-03-28 09:15:58 -04:00
Chad Scharf
9800b752c0 Changed all C# control flow block statements to include space between keyword and open paren 2020-03-27 14:36:37 -04:00
Chad Scharf
943aea9a12
Merge pull request #678 from bitwarden/item-trash
DeletedDate on Cipher table, related sprocs and repositories updated
2020-03-27 12:09:55 -04:00
Chad Scharf
3a28c8dfdf Merge branch 'item-trash' of https://github.com/bitwarden/server into item-trash 2020-03-27 10:28:58 -04:00
Chad Scharf
55b937ff68 Updated PR comments, changed smart defaults for behavior, updated Cipher table index 2020-03-27 10:23:37 -04:00