 Tim Gröger
|
11b7f05ad7
|
Merge remote-tracking branch 'origin/develop' into feature/pricelist
|
2021-11-25 10:11:53 +01:00 |
|
Tim Gröger
|
d28130817b
|
[balance] revert user ssp for pull-request
|
2021-11-25 10:11:41 +01:00 |
 Ferdinand Thiessen
|
b4086108e4
|
[events] Can invite, accept and reject invitations
|
2021-11-24 21:49:14 +01:00 |
|
Tim Gröger
|
be1854d7c1
|
Merge branch 'develop' into feature/pricelist
|
2021-11-22 15:40:34 +01:00 |
|
Tim Gröger
|
eb04d305ab
|
[auth_ldap] fix add displayName when create
|
2021-11-22 15:38:33 +01:00 |
|
Ferdinand Thiessen
|
471258c886
|
[events] Default jobs to unlocked state
|
2021-11-22 15:33:18 +01:00 |
|
Ferdinand Thiessen
|
7cac708309
|
[clean] PEP8 cleanup
|
2021-11-22 15:31:53 +01:00 |
|
ferfissimo
|
9b935541b0
|
Merge pull request 'feature/balance add server side pagination for get balances' (#16) from feature/balance into develop
Reviewed-on: #16
|
2021-11-22 14:30:41 +00:00 |
|
Tim Gröger
|
d17b0a7cab
|
[balance] add sorting of transaction
|
2021-11-22 15:23:21 +01:00 |
|
Tim Gröger
|
ff03325e2b
|
[balance] add get and modify limits for all users
|
2021-11-22 15:20:24 +01:00 |
|
Tim Gröger
|
9ab84073d0
|
[balance] add serverside pagination
|
2021-11-22 15:07:16 +01:00 |
|
Tim Gröger
|
0b94177235
|
[auth_ldap] fix add displayName when create
|
2021-11-21 19:45:12 +01:00 |
|
Ferdinand Thiessen
|
04d5b1e83a
|
[events] Allow locking events
|
2021-11-21 17:58:28 +01:00 |
|
Ferdinand Thiessen
|
51a3a8dfc8
|
[events] Respect backup assignment
|
2021-11-21 17:52:24 +01:00 |
|
Tim Gröger
|
d75574e078
|
[auth_ldap] fix create Users
|
2021-11-21 15:30:49 +01:00 |
|
Tim Gröger
|
0be31d0bfe
|
[auth_ldap] sync ldap_users to Database
|
2021-11-21 15:11:37 +01:00 |
|
Tim Gröger
|
26d63b7c7d
|
[users][auth_ldap][auth_plain] delete avatar
|
2021-11-20 22:58:05 +01:00 |
|
Tim Gröger
|
f7f27311db
|
[image] bigger filename size
|
2021-11-19 22:04:33 +01:00 |
|
Tim Gröger
|
00c9da4ff2
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-11-19 20:11:07 +01:00 |
|
Ferdinand Thiessen
|
795475fe15
|
[pricelist] Delete old images
|
2021-11-19 13:32:54 +01:00 |
|
Ferdinand Thiessen
|
d00c603697
|
[events] Allow server side pageination
|
2021-11-18 23:06:03 +01:00 |
|
Ferdinand Thiessen
|
48933cdf5f
|
[core] Minor fixes
|
2021-11-18 23:02:03 +01:00 |
|
Ferdinand Thiessen
|
7cb31bf60e
|
gitignore
|
2021-11-18 12:57:18 +01:00 |
|
Ferdinand Thiessen
|
05dc158719
|
[cleanup] PEP8 cleanup
|
2021-11-18 12:56:02 +01:00 |
|
Tim Gröger
|
6535aeab2e
|
Merge remote-tracking branch 'origin/develop' into develop
|
2021-11-16 21:32:25 +01:00 |
|
Ferdinand Thiessen
|
92183a4235
|
[logging] Enabled overriding logger config by user config
|
2021-11-16 21:18:06 +01:00 |
|
Ferdinand Thiessen
|
c6c41adb02
|
[logging] Enabled overriding logger config by user config
|
2021-11-16 14:07:05 +01:00 |
|
Ferdinand Thiessen
|
f1d973b446
|
[deps] Updated flask requirement
|
2021-11-16 14:06:31 +01:00 |
|
Ferdinand Thiessen
|
45ed9219a4
|
[logging] Some cleanup and improved configuring using user config
|
2021-11-16 13:43:47 +01:00 |
|
Tim Gröger
|
0ef9d18ace
|
[auth_ldap][fix] fix loade correct picture
|
2021-11-16 11:18:00 +01:00 |
|
Tim Gröger
|
ae1bf6c54b
|
[auth_ldap][fix] hash ssha from ldap3
|
2021-11-15 22:38:49 +01:00 |
|
Tim Gröger
|
f205291d6d
|
[pricelist][fix] autodeletion of relationship. drinks can be modified
|
2021-11-15 20:47:14 +01:00 |
|
Ferdinand Thiessen
|
6a9db1b36a
|
[pricelist] Fix minor issues
|
2021-11-15 17:05:18 +01:00 |
|
Ferdinand Thiessen
|
e3d0014e62
|
[pricelist] Use Serial database type instead of int for IDs
|
2021-11-15 16:34:58 +01:00 |
|
Ferdinand Thiessen
|
a43441e0c5
|
[pricelist] Use new image controller
|
2021-11-15 16:34:35 +01:00 |
|
Ferdinand Thiessen
|
a6fe921920
|
[controller] Add controller for handling uploading images
|
2021-11-15 16:32:24 +01:00 |
|
ferfissimo
|
42e304cf5f
|
Merge pull request 'feature/pricelist' (#15) from feature/pricelist into develop
Reviewed-on: #15
|
2021-11-15 09:55:09 +00:00 |
|
ferfissimo
|
55278c8413
|
Merge branch 'develop' into feature/pricelist
|
2021-11-15 09:54:52 +00:00 |
|
Tim Gröger
|
57a03a80cc
|
[pricelist] add serverside sorting for pricelist, sorting by name for drinks
|
2021-11-15 09:19:50 +01:00 |
|
Tim Gröger
|
dba60fdab8
|
[pricelist] serverside pagination and filtering for pricelist
|
2021-11-14 19:35:11 +01:00 |
|
Tim Gröger
|
1bb7bafa2a
|
[pricelist][fix] better query to send drinks with public prices
|
2021-11-13 15:57:49 +01:00 |
|
Tim Gröger
|
e4b937991b
|
[pricelist] add serverside pagination and filter for receipts
|
2021-11-13 15:44:06 +01:00 |
|
Tim Gröger
|
526433afba
|
[pricelist] serviceside filtering for ingredients
|
2021-11-13 15:03:21 +01:00 |
|
Ferdinand Thiessen
|
1b371763ee
|
[events] Fix conflic return code
|
2021-11-13 14:49:28 +01:00 |
|
Tim Gröger
|
8fb74358e7
|
[pricelist] add serverside filtering for getDrinks
|
2021-11-13 13:23:04 +01:00 |
|
Tim Gröger
|
26a00ed6a6
|
[pricelist] add serverside pagination of drinks
|
2021-11-12 22:09:16 +01:00 |
|
Ferdinand Thiessen
|
974af80a9b
|
[db] Fix warnings and fix readme
|
2021-11-12 11:34:42 +01:00 |
|
Tim Gröger
|
ff13eefb45
|
Merge branch 'develop' into feature/pricelist
|
2021-11-11 19:49:43 +01:00 |
|
Tim Gröger
|
5ef603ee50
|
Merge pull request '[auth_ldap] Allow more configuration' (#14) from improve_ldap into develop
Reviewed-on: #14
|
2021-11-11 18:43:17 +00:00 |
|
Ferdinand Thiessen
|
80f06e483b
|
[auth_ldap] modify_role has to be called before the update to change it on the backend
|
2021-11-11 15:23:11 +01:00 |