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
Ferdinand Thiessen
f80ad5c420
[auth_ldap] Fix typo in __init__
2021-11-11 15:23:11 +01:00
Ferdinand Thiessen
4e1799e297
[auth_ldap] Allow more configuration
...
* Allow configuring the password hash (SSHA, PBKDF2 or Argon2)
* Allow setting custom dn templates for users and groups to e.g. allow "ou=people" or "ou=user"
* Allow setting custom object class for entries
* Stop using deprecated openssl constants
2021-11-11 15:23:11 +01:00
Ferdinand Thiessen
f7e07fdade
[events] Hotfix: delete an event with registered jobs
2021-11-11 15:22:55 +01:00
Ferdinand Thiessen
3d833fb6af
[plugin] Plugins should have an unique ID
2021-11-11 15:22:15 +01:00
Ferdinand Thiessen
2dabd1dd34
[events] Fix deleteing an event
2021-11-11 12:23:45 +01:00
Ferdinand Thiessen
cadde543f2
[plugins] Improved handling of plugin loading errors
2021-08-30 14:39:54 +02:00
Tim Gröger
4e46ea1ca3
[balance] add get and modify limits for all users
2021-08-09 10:06:51 +00:00
Tim Gröger
0d1a39f217
[balance] add sorting of transaction
2021-08-09 10:06:51 +00:00
Ferdinand Thiessen
7129469835
[roles] MySQL is caseinsensitive for strings so workaround it for renaming roles
2021-07-29 17:18:01 +02:00
Tim Gröger
e7b978ae3c
better drink dependency
...
drink_ingredient has name and cost_per_volume
Flaschengeist/flaschengeist-pricelist#2
2021-06-30 10:45:41 +02:00
Tim Gröger
ff1a0544f8
Merge branch 'develop' into feature/pricelist
2021-06-29 20:21:50 +02:00
Ferdinand Thiessen
3fc04c4143
[docs] Moved some devel docs to the wiki
2021-05-27 01:52:45 +02:00
Ferdinand Thiessen
7928c16c07
[db] Try mysqlclient first, maybe the user managed to get it working on Windows
2021-05-27 01:52:30 +02:00
Ferdinand Thiessen
7b5f854d51
[db] Support sqlite and postgresql as engine, fixes #5
...
mysql / mariadb still is the only tested configuration.
This will break existing databases, as UTF8MB4 is enforced for
mysql (real UTF8).
2021-05-27 01:27:53 +02:00
Ferdinand Thiessen
8696699ecb
[run_flaschengeist] Improved export command
...
Export now supports --no-core flag, if set no core models will
get exported.
Also --plugins was changed to support a list of plugins,
if no list is given the old behavior is taken (export all plugins).
If a list of plugins is given, only those plugins are exported.
2021-05-26 16:47:03 +02:00
groegert
776332d5fe
added some hints to ease the installation
2021-05-20 15:37:17 +00:00
Tim Gröger
96e4e73f4b
[users] add dynamic shortcuts for users
2021-04-18 23:28:05 +02:00
Tim Gröger
1e5304fe1e
Merge branch 'feature/pricelist' into develop
2021-04-17 18:32:49 +02:00
Tim Gröger
3da2ed53d5
[pricelist][ #6 ] save order of pricelist columns for user
2021-04-17 18:27:14 +02:00
Tim Gröger
f5624e9a7d
[pricelist] add user options pricelist_view
2021-04-15 22:55:41 +02:00
Tim Gröger
2d31cda665
Revert "[pricelist] delete visibleColums"
...
This reverts commit 2d45c0dab9
2021-04-15 22:05:34 +02:00
Tim Gröger
2da0bb1683
Merge remote-tracking branch 'origin/develop' into feature/pricelist
2021-04-15 15:36:00 +02:00
Ferdinand Thiessen
Tim Gröger
groegert