Skip to content

Commit

Permalink
Merge master to dev... because I'm an idiot
Browse files Browse the repository at this point in the history
  • Loading branch information
kiswa committed Sep 5, 2020
2 parents fb54058 + aca954f commit 99d55dc
Show file tree
Hide file tree
Showing 20 changed files with 3,414 additions and 2,980 deletions.
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
## v1.0.2

### New Features

* German translation - Thanks to @ben-so

### Updates

* N/A

### Bug Fixes

* New user creation defaults Security Level to User
* Drag-and-drop automatic actions correctly update UI
* Special characters in emails now handled correctly - Contributed by @ben-so
* Changing card order now updates UI correctly
* Token refresh no longer causes user to be logged out
* Minor fixes for Spanish translations

## v1.0.1

### New Features
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -195,20 +195,20 @@ Because I like seeing the numbers.

Language | Files | Blank | Comment | Code
-----------|--------:|---------:|---------:|---------:
TypeScript | 69 | 1032 | 122 | 4307
PHP | 21 | 790 | 40 | 2396
HTML | 22 | 287 | 2 | 1604
SASS | 14 | 302 | 10 | 1365
**SUM:** | **126** | **2411** | **174** | **9672**
TypeScript | 67 | 977 | 129 | 4103
PHP | 20 | 744 | 37 | 2243
HTML | 21 | 268 | 2 | 1572
SASS | 14 | 299 | 10 | 1347
**SUM:** | **122** | **2288** | **178** | **9265**

Command: `cloc --exclude-dir=vendor,favicons --exclude-ext=json,svg,ini src/`

### `test`

Language | Files | Blank | Comment | Code
-----------|-------:|---------:|---------:|---------:
TypeScript | 38 | 1018 | 8 | 3544
PHP | 11 | 795 | 19 | 2301
**SUM:** | **49** | **1813** | **27** | **5845**
TypeScript | 38 | 1017 | 8 | 3540
PHP | 11 | 784 | 19 | 2272
**SUM:** | **49** | **1801** | **27** | **5812**

Command: `cloc --exclude-ext=xml test/`
Loading

0 comments on commit 99d55dc

Please sign in to comment.