Homekolab.org
Diffusion kolab caef7307c937

Merge branch 'master' into dev/openshift

Authored by Liutauras Adomaitis <adomaitis@kolabsystems.com> on Jul 15 2020, 9:16 AM.

Description

Merge branch 'master' into dev/openshift

Details

Committed
Liutauras Adomaitis <adomaitis@kolabsystems.com>Jul 15 2020, 9:16 AM
Pushed
adomaitisJul 15 2020, 9:17 AM
Parents
rK3aeece83cdac: phpstan update fixes
rK73194cf2dcc4: Fix hosted domain creation script
Branches
Unknown
Tags
Unknown
This commit has been deleted in the repository: it is no longer reachable from any branch, tag, or ref.

Event Timeline

Liutauras Adomaitis <adomaitis@kolabsystems.com> committed rKcaef7307c937: Merge branch 'master' into dev/openshift (authored by Liutauras Adomaitis <adomaitis@kolabsystems.com>).Jul 15 2020, 9:16 AM

Merged Changes

CommitAuthorDetailsCommitted
3aeece83cdacmachniak
phpstan update fixes 
Jul 10
877f2f7b358eD1429machniak/vanmeeuwen
Allow multiple ldap operations in a single connection 
Jul 9
a1f86db85908machniak
Use slim version of jQuery 
Jul 9
7554fffa9edcmachniak
Fix flaky tests and bitwise operator use 
Jul 2
c5b4123bf4d9machniak
Update js dependencies 
Jun 29
adf3f7419175machniak
Update phpstan/larastan, add tests/Browser/ to phpstan analyze 
Jun 26
8d1452ae72bbD1414bohlender/machniak
improve mail notificaions 
Jun 26
09591aff30dcD1408machniak
Set NOT NULL DEFAULT current_timestamp() on created_at/updated_at columns 
Jun 24
f25d4dfb516bD1402machniak
Aliases sharing 
Jun 24
c72e9ef38ad9D1390machniak
Added production seeders 
Jun 24
89d61e51f5bcmachniak
Fix flaky tests 
Jun 19
01f9fcea44ceD1384machniak
Mobile UI fixes 
Jun 15
61b980f766d8D1372machniak
Display a notice about the wallet state (Bifrost#T348752) 
Jun 15
b6a778523891D1378machniak
Add copyright and company details in the page footer 
Jun 15
037514191bebD1366machniak
Fix transaction description for domain entitlements 
Jun 15
fbf3f75e27eaD1297machniak
Make sure we bill for entitlements that are deleted 
Jun 15
1e03ad3917a9machniak
Bump js dependencies, fix linting issues 
Jun 14
c4818aadb932machniak
Small css fix 
Jun 10
5b736c1c9b50machniak
Fix font-size on small elements 
Jun 10
5819373d54ffmachniak
Improve error handling on signup welcome page 
Jun 10
98d3e8702b7emachniak
Fix linting issues and a regression in browser tests 
Jun 10
f4537ed38a96D1327machniak
VAT on Receipts 
Jun 10
92c7f9f21811D1348machniak
Receipts UI 
Jun 10
90da82738276D1360machniak
Transaction log in admin UI 
Jun 10
da13578ce560D1150machniak
Wallet magic 
Jun 10
534d00000831D1291vanmeeuwen/machniak
Cherry-picked contents from hkccp-import 
Jun 10
0481c595510aD1354machniak
Add plain text parts to email 
Jun 10
7dc1e3fa2ee8machniak
Limit number of records the test works with, code improvements 
Jun 9
35814db70a9cmachniak
Fix test failing when executed more than once 
Jun 5
279da5dfbdc1machniak
Fix regression, improve button labels 
Jun 4
10f2840186b8D1321machniak
Wallet history 
Jun 4
9b606244c719D1267machniak
Support: Awarding a bonus or penalty (Bifrost#T315896) 
Jun 4
5df6db72a947D1309machniak
Receipt document (html and pdf) 
Jun 4
c4f6f1b8b280D1249machniak
Wallet charge: top-ups and notifications 
Jun 3
ad257f28b608D1102vanmeeuwen
An initial implementation of transactions. 
May 28
9c680e8a7574D1273machniak
Support: Unsuspending/Suspending a user (Bifrost#T315890) 
May 28
fac27dba481bD1303machniak
Add command to render mail templates 
May 28
e177a2f419e7D1219vanmeeuwen
Make the id for a user fillable 
May 28
7058be93faeemachniak
Fix test 
May 28
86f37d40ef58D1285vanmeeuwen
Add a command db:ping and then use it 
May 27
2b1d422c9dd4vanmeeuwen
Ensure that these directories exist 
May 26
0c6f883de458machniak
Fix last occurrence of 'name' instead of first+last name 
May 26
b8897a28a88cD1231machniak
Custom payments, auto-payments, Stripe support 
May 18
58b0b97bb5a7machniak
Small css fixes 
May 15
47d1b7afcad3machniak
RequestLogger: Log memory usage and exec time, don't log the token 
May 15
f137bf7a3983machniak
Bootstrap 4.5.0, jQuery 3.5.1, Popper 1.6.1 + small css fixes 
May 13