CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-28 03:01:15 +12:00
Code Issues Projects Releases Wiki Activity

Merge branch '0.6' of github.com:appwrite/appwrite into functions

Browse source
This commit is contained in:
Eldad Fux 2020-05-14 00:13:55 +03:00
parent 8e4dd5583a bce8631cbd
commit feefcc4fb1
4 changed files with 24 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/controllers/api/users.php
View file

@ -302,7 +302,23 @@ $utopia->get('/v1/users/:userId/logs')
$countries = Locale::getText('countries');
$logs = $audit->getLogsByUser($user->getId());
$logs = $audit->getLogsByUserAndActions($user->getId(), [
'account.create',
'account.delete',
'account.update.name',
'account.update.email',
'account.update.password',
'account.update.prefs',
'account.sessions.create',
'account.sessions.delete',
'account.recovery.create',
'account.recovery.update',
'account.verification.create',
'account.verification.update',
'teams.membership.create',
'teams.membership.update',
'teams.membership.delete',
]);
$reader = new Reader(__DIR__.'/../../db/DBIP/dbip-country-lite-2020-01.mmdb');
$output = [];

2
public/dist/styles/default-ltr.css vendored
View file

File diff suppressed because one or more lines are too long

2
public/dist/styles/default-rtl.css vendored
View file

File diff suppressed because one or more lines are too long

10
public/styles/tabels.less
View file

@ -17,11 +17,11 @@ table {
border-bottom: solid 1px var(--config-color-fade-super);
font-size: 14px;
th {
position: sticky;
top: -30px;
z-index: 3;
}
// th {
// position: sticky;
// top: -30px;
// z-index: 3;
// }
}
&.small {