Commit Graph

520 Commits

Author SHA1 Message Date
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.

Conflicts:
	flaschengeist/plugins/pricelist/__init__.py
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
Tim Gröger 0630b5183d [pricelist] fix bug set no volumes are set 2021-04-15 15:23:37 +02:00
Tim Gröger 32ad4471c6 [pricelist] black code 2021-04-14 22:43:28 +02:00
Tim Gröger 1d36c3ef6c [pricelist] add more permissions 2021-04-14 22:42:57 +02:00
Tim Gröger 2d45c0dab9 [pricelist] delete visibleColums 2021-04-14 20:11:23 +02:00
Tim Gröger 62948cd591 [picture][fix] any size for thumbnail 2021-04-14 20:03:44 +02:00
Ferdinand Thiessen 03aa7a3231 [roles] controller: Fixed setting permissions 2021-04-04 21:46:51 +02:00
Ferdinand Thiessen 064177542e [core] Added license and added setup information 2021-04-02 06:58:47 +02:00
Tim Gröger 5c688df392 [pricelist][tags] change model of tags, fixed tags on updateDrink 2021-04-01 22:45:28 +02:00
Tim Gröger 15c7a56d56 [pricelist] receipt as list of strings 2021-03-29 22:34:05 +02:00
Tim Gröger bcf1941a81 [pricelist] fix some merge issues 2021-03-29 21:28:48 +02:00
Tim Gröger b2d8431697 [pricelist][fix] add permission to plugin 2021-03-29 20:26:15 +02:00
Tim Gröger 3a4e90f50e Merge remote-tracking branch 'origin/develop' into feature/pricelist 2021-03-29 12:50:04 +02:00
Tim Gröger faf5b0b8d0 [pricelist] add receipts 2021-03-29 12:41:29 +02:00
Ferdinand Thiessen c3aeeea2ce [events] Fixed permissions names 2021-03-29 07:33:20 +02:00
Ferdinand Thiessen 775e775e89 [core][plugin] Added Notifications, restructure plugins 2021-03-29 07:32:58 +02:00
Ferdinand Thiessen 544ae6a3fe [pricelist] Fixed warnings 2021-03-28 23:14:03 +02:00
Tim Gröger e8c9c6e66c [pricelist][drinks] return only public drinkprices if not logged in 2021-03-28 16:41:20 +02:00
Tim Gröger 2ae8bc7e0c [pricelist][picture] delete picture, if not found 2021-03-28 12:47:02 +02:00
Ferdinand Thiessen 3ad1cfa9be [setup] We are using pdoc3 2021-03-28 04:08:35 +02:00
Tim Gröger 6fce88c120 [pricelist] now can delete pictures, add no-image 2021-03-25 23:05:17 +01:00
Tim Gröger 6dbb135621 [pricelist] delete picture (not ready yet) 2021-03-25 20:32:21 +01:00
Ferdinand Thiessen 114e12f151 [setup] Added build documentation target 2021-03-25 13:15:43 +01:00
Ferdinand Thiessen da94acf18c [events] More rename 2021-03-25 01:38:24 +01:00
Ferdinand Thiessen 4ffa5e0e6e [pricelist] Install pillow 2021-03-25 01:20:26 +01:00
Ferdinand Thiessen 05aba1161b [config] Connect with pymysql on Windows 2021-03-25 01:19:37 +01:00
Ferdinand Thiessen 6cf33976b3 [events] Changed routes 2021-03-24 20:47:04 +01:00
Ferdinand Thiessen 7d692c5f68 [chore] cleanup 2021-03-24 18:37:53 +01:00
Ferdinand Thiessen 1550be5da6 [app] Secure plugin loading 2021-03-24 17:09:42 +01:00
Tim Gröger dca890dad9 [pricelist] save and load pictures 2021-03-22 23:17:44 +01:00
Tim Gröger eb1e146da9 [utils] picture creator 2021-03-22 23:17:26 +01:00
Tim Gröger b98bae337d [pricelist] add modify settings, fixed update drinks 2021-03-21 22:06:24 +01:00
Ferdinand Thiessen b60c405f76 [events] Improved event plugin 2021-03-21 00:55:50 +01:00
Ferdinand Thiessen 4cd353cf4e Renamed schedule to events, added recurring events and invites 2021-03-20 17:24:14 +01:00
Tim Gröger e31c5756a6 [pricelist][break] some cleanup, removed unneccessary api 2021-03-20 15:01:18 +01:00
Ferdinand Thiessen e16f4704b5 [setup] Flask-sqlalchemy now supports sqlalchemy 1.4 2021-03-20 12:19:39 +01:00
Ferdinand Thiessen 02959587e1 [plugin] schedule: Allow ID for types (e.g. creating new events) 2021-03-20 01:00:55 +01:00
Ferdinand Thiessen a476e4f5b1 [cleanup] Fixed member names
* Use _name only for protected members (should not be used outside the
class
* Use name_ instead for all members which should not be API exported
2021-03-19 22:40:36 +01:00