Commit Graph

132 Commits

Author SHA1 Message Date
Tim Gröger 28204f95e6 Merge remote-tracking branch 'origin/develop' into develop 2020-05-11 23:03:31 +02:00
Tim Gröger e502e3f334 added feature to lock barview
fixed bug, that you can send negative amount.
2020-05-11 23:03:16 +02:00
Tim Gröger 0b545c1c8e updated functions for ##222 2020-03-13 19:07:57 +02:00
Gregor f845c0d686 remove console.log 2020-03-10 00:32:37 +01:00
Gregor 811111f486 add active members count and fixing style for small screens
resolve tickets #220 and ticket #221
https://groeger-clan.duckdns.org/redmine/issues/220
https://groeger-clan.duckdns.org/redmine/issues/221
2020-03-10 00:32:06 +01:00
Tim Gröger 53676763ea finished ##217
fixed bug that when you search in barCreditList or finanzerOverview, with 2 strings e.g. full name

fixed bug when you click on a name in searchbar in finanzerOverview, that you get the profile of the user
you dont need to click button "hinzufügen"
2020-03-07 15:00:52 +01:00
Tim Gröger 00bffe665d fixed bug that password is cleared, whenn saving. 2020-03-05 21:31:52 +01:00
Tim Gröger b2428cb5b4 fixed some bugs 2020-03-05 21:16:47 +01:00
Tim Gröger a82d3bf4b6 fixed ##214 2020-03-05 20:15:35 +01:00
Tim Gröger c0360bfff5 new logo 2020-03-04 23:18:32 +01:00
Tim Gröger 3893ab3851 finished ##197 2020-03-04 23:10:18 +01:00
Tim Gröger 586e1fdf64 finished ##213 2020-03-04 21:12:08 +01:00
Tim Gröger c1d058f8c5 Merge branch 'feature/status' into develop 2020-03-03 23:34:13 +01:00
Tim Gröger 50da6c74f0 add customfield for user to addAmount of a custom value
fix that customfields in user and baruser are disabled if user ist locked
2020-03-03 23:33:55 +01:00
Tim Gröger 4316e1b791 add customfield for baruser to addAmount of a custom value 2020-03-03 23:28:05 +01:00
Tim Gröger 11b8df2251 finished ##210 2020-03-03 22:50:47 +01:00
Tim Gröger 7ab0af4119 finished ##209 2020-03-03 22:29:32 +01:00
Tim Gröger 8c981c705e fixed bug ##205 now for user 2020-03-01 21:48:41 +01:00
Tim Gröger e708498818 fixed bug ##205 2020-03-01 21:45:11 +01:00
Tim Gröger 715d216efb bugfix in ##172, forgot to load types second time 2020-03-01 20:41:12 +01:00
Tim Gröger ef733e040a bugfix in ##172, forgot to load types 2020-03-01 20:35:12 +01:00
Tim Gröger 174bef1fce Merge branch 'feature/pricelist' into develop 2020-03-01 20:10:32 +01:00
Tim Gröger f0a2231a5b finished ##172
edit and add pricelist
edit and add drinktypes
2020-03-01 19:18:58 +01:00
Tim Gröger afa8945f66 add Icon to go to pricelist 2020-02-27 22:19:31 +01:00
Tim Gröger e0697b2a6d finished ##172 2020-02-27 21:54:28 +01:00
Tim Gröger 5d8befdaec Merge branch 'feature/user_storno' into develop 2020-02-27 16:02:41 +01:00
Tim Gröger 796e359463 better Button vor history in ##200 2020-02-27 15:59:10 +01:00
Tim Gröger af8584173e finished ##200
user can storno them transaktion
2020-02-27 15:52:58 +01:00
Tim Gröger 578f8923b3 Merge branch 'feature/serviceManegement' into develop 2020-02-26 20:12:59 +01:00
Tim Gröger e90dbf6513 finished ##169 and ##170
user can transact a Job, if the transact accepted the user can delete his job

user can decline or accept a jobrequest
2020-02-25 22:34:45 +01:00
Tim Gröger 917690eba3 finished ##192
user can delete his job if day not locked
2020-02-24 18:57:28 +01:00
Tim Gröger 9082b00567 finished ##186 2020-02-24 12:19:13 +01:00
Tim Gröger b6dfc45c46 finished ##184 2020-02-23 22:32:31 +01:00
Tim Gröger dadb31f376 finished ##188
for sm only send year, month, day. But you have to decrement month to send, because month starts with 0.
Also you have to increment month to get.
2020-02-23 11:19:53 +01:00
Tim Gröger 62af175884 finished ##168 2020-02-22 11:14:54 +01:00
Tim Gröger ae89781da1 destroy Interval to render every Second the History 2020-02-22 08:40:02 +01:00
Tim Gröger 3125e00a2a fixed ##181 2020-02-22 08:33:21 +01:00
Tim Gröger 6f4980dfb5 fixed ##180 2020-02-22 07:28:13 +01:00
Tim Gröger 75056fc932 Merge branch 'feature/info_message' into develop 2020-02-19 23:22:37 +01:00
Tim Gröger 20fb2f56de storno at 5 min for the baruser in geruecht ##164 2020-02-19 23:22:23 +01:00
Tim Gröger 211bb99d07 change name to 'Flaschengeist', add some logic that messages_navigation_drawer hide and show in tablet mode 2020-02-19 21:29:09 +01:00
Tim Gröger 08c8475ac1 add history 2020-02-16 20:35:13 +01:00
Tim Gröger a8ae06b3a8 transfer 2020-02-11 20:34:05 +01:00
Tim Gröger 4642d58a2c Merge branch 'feature/useroptions' into develop 2020-01-27 20:19:31 +01:00
Tim Gröger 3be0315993 add joboverview, so the user can see when he has to work 2020-01-27 19:56:56 +01:00
Tim Gröger 743018e9ed Merge remote-tracking branch 'origin/feature/useroptions' into feature/useroptions
# Conflicts:
#	src/plugins/routes.js
2020-01-26 23:57:00 +01:00
Tim Gröger 7d27421659 change icons and added userConfigChange 2020-01-26 23:55:59 +01:00
Tim Gröger 23d24658cf added userSkeleton for finanzer 2020-01-26 12:55:39 +01:00
Tim Gröger ba5a50c35f added loading utilities for every view 2020-01-23 23:25:21 +01:00
Tim Gröger 3bf0467726 upload skeleton 2020-01-23 21:10:04 +01:00