 Frank Schubert
|
1e7911de80
|
Showing voicenumber in Order/Index
|
2024-03-12 22:56:12 +01:00 |
|
|
Frank Schubert
|
b4cb70b643
|
Added voicenumber select in Order
|
2024-03-12 22:34:28 +01:00 |
|
|
Frank Schubert
|
1a676fe8aa
|
Merge branch 'master' into fronkdev
|
2024-03-12 15:55:10 +01:00 |
|
|
Frank Schubert
|
caf41e4a23
|
Update header.php
|
2024-03-12 14:52:58 +00:00 |
|
|
Frank Schubert
|
396fabc957
|
Merge branch 'master' into fronkdev
|
2024-03-12 15:46:37 +01:00 |
|
|
Frank Schubert
|
106ecea2b5
|
Merge branch 'master' into fronkdev
|
2024-03-12 15:42:35 +01:00 |
|
|
Frank Schubert
|
45f2e432d8
|
Merge branch 'spidev' into 'master'
Zeiterfassungs Update
See merge request fronk/thetool!291
|
2024-03-12 14:37:03 +00:00 |
|
|
Frank Schubert
|
fab6d2114f
|
Merge branch 'feature/rework-notification' into 'master'
fixed word-breaking and style issues
See merge request fronk/thetool!290
|
2024-03-12 14:35:07 +00:00 |
|
|
Frank Schubert
|
33b0c72b72
|
Merge branch 'fronkdev' into 'master'
Added ciftoken + url to Preorder export
See merge request fronk/thetool!289
|
2024-03-12 14:27:36 +00:00 |
|
|
Frank Schubert
|
1255fa9c55
|
Added ciftoken + url to Preorder export
|
2024-03-12 15:27:09 +01:00 |
|
|
Frank Schubert
|
c9f0cd61fd
|
Merge branch 'feature/rework-notification' into 'master'
implemented global notification and reworked setFlash Function
See merge request fronk/thetool!283
|
2024-03-12 14:12:54 +00:00 |
|
|
Frank Schubert
|
402622271f
|
Merge branch 'spidev' into 'master'
Zeiterfassungs Update
See merge request fronk/thetool!288
|
2024-03-12 13:05:33 +00:00 |
|
|
Frank Schubert
|
915be152c1
|
Merge branch 'spidev' into 'master'
Device Update / Zeiterfassung Update
See merge request fronk/thetool!287
|
2024-03-12 12:21:53 +00:00 |
|
|
Frank Schubert
|
901131fbce
|
Merge branch 'fronkdev' into 'master'
Changed order of preorder admin buttons
See merge request fronk/thetool!286
|
2024-03-07 15:57:10 +00:00 |
|
|
Frank Schubert
|
983312877c
|
Changed order of preorder admin buttons
|
2024-03-07 16:56:44 +01:00 |
|
|
Frank Schubert
|
f7f69b4638
|
Merge branch 'fronkdev' into 'master'
Preorder admin page sorting
See merge request fronk/thetool!285
|
2024-03-07 15:54:32 +00:00 |
|
|
Frank Schubert
|
8d24798722
|
Preorder admin page sorting
|
2024-03-07 16:53:48 +01:00 |
|
|
Frank Schubert
|
31ba14ea04
|
Merge branch 'fronkdev' into 'master'
Preorderadmin & Superexpert mode
See merge request fronk/thetool!284
|
2024-03-07 15:44:25 +00:00 |
|
|
Frank Schubert
|
2085ab6f29
|
Added preorder connection split and add units scripts to admin
|
2024-03-07 16:43:34 +01:00 |
|
|
Frank Schubert
|
39a5933dce
|
Merge branch 'spidev' into 'master'
Zeiterfassung Update
See merge request fronk/thetool!282
|
2024-03-07 14:35:14 +00:00 |
|
|
Frank Schubert
|
2df2ca22a1
|
added superexpert mode
|
2024-03-07 15:33:59 +01:00 |
|
|
Frank Schubert
|
2ac6d8e178
|
Merge branch 'fronkdev' into 'master'
Added Lieboch West1
See merge request fronk/thetool!281
|
2024-03-06 13:19:40 +00:00 |
|
|
Frank Schubert
|
39478b9fb9
|
Added Lieboch West1
|
2024-03-06 14:16:58 +01:00 |
|
|
Frank Schubert
|
1e25c79256
|
Merge branch 'fronkdev' into 'master'
Changed status_code for Preorderlogistics to 140
See merge request fronk/thetool!280
|
2024-03-05 14:20:07 +00:00 |
|
|
Frank Schubert
|
23920c2b78
|
Changed status_code for Preorderlogistics to 140
|
2024-03-05 15:19:16 +01:00 |
|
|
Frank Schubert
|
41cce8e337
|
Merge branch 'spidev' into 'master'
Zeiterfassung Update
See merge request fronk/thetool!276
|
2024-03-05 13:07:07 +00:00 |
|
|
Frank Schubert
|
9a6e25b1a8
|
Merge branch 'feature/improve-dashboard-loading-times' into 'master'
[Enhancement] AddressModel: Added 'id' parameter to getSqlFilter method
See merge request fronk/thetool!279
|
2024-03-05 12:54:46 +00:00 |
|
|
Frank Schubert
|
39f0940d42
|
Merge branch 'spidev' into 'master'
Zeiterfassung Update
See merge request fronk/thetool!275
|
2024-02-29 14:32:00 +00:00 |
|
|
Frank Schubert
|
c1ff9d9cfb
|
Merge branch 'fronkdev' into 'master'
readded network check in Preorder API CIF modules
See merge request fronk/thetool!274
|
2024-02-29 13:27:59 +00:00 |
|
|
Frank Schubert
|
9776a27601
|
readded network check in Preorder API CIF modules
|
2024-02-29 14:26:25 +01:00 |
|
|
Frank Schubert
|
659339c44a
|
Merge branch 'fronkdev' into 'master'
Fixed getting ciftoken in userSetCif Preorder api EP
See merge request fronk/thetool!273
|
2024-02-28 16:17:24 +00:00 |
|
|
Frank Schubert
|
15586820e2
|
Fixed getting ciftoken in userSetCif Preorder api EP
|
2024-02-28 17:16:25 +01:00 |
|
|
Frank Schubert
|
63f7fe6a83
|
Merge branch 'fronkdev' into 'master'
Added Lieboch to rimo api import
See merge request fronk/thetool!272
|
2024-02-28 14:28:37 +00:00 |
|
|
Frank Schubert
|
a0754d8c5d
|
Added Lieboch to rimo api import
|
2024-02-28 15:27:42 +01:00 |
|
|
Frank Schubert
|
566f71972b
|
Merge branch 'spidev' into 'master'
Zeiterfassung Update
See merge request fronk/thetool!271
|
2024-02-27 18:51:35 +00:00 |
|
|
Frank Schubert
|
f611f5201a
|
Merge branch 'fronkdev' into 'master'
Added taxcode to Vatrate
See merge request fronk/thetool!270
|
2024-02-27 13:38:22 +00:00 |
|
|
Frank Schubert
|
2b09a167dc
|
Merge branch 'spidev' into 'master'
Zeiterfassung Update/Bugfix/Migration
See merge request fronk/thetool!269
|
2024-02-27 13:36:04 +00:00 |
|
|
Frank Schubert
|
6db1055c6b
|
Added taxcode to Vatrate
|
2024-02-27 14:35:25 +01:00 |
|
|
Frank Schubert
|
76d22b47e8
|
Merge branch 'fronkdev' into 'master'
Added preorderTrigger / added cif api docs
See merge request fronk/thetool!268
|
2024-02-26 22:14:32 +00:00 |
|
|
Frank Schubert
|
2af51a2f57
|
Added preorderTrigger / added cif api docs
|
2024-02-26 23:13:30 +01:00 |
|
|
Frank Schubert
|
97d3d8d02f
|
Merge branch 'fronkdev' into 'master'
Added gemeinde filter to Dashboard
See merge request fronk/thetool!267
|
2024-02-26 12:33:55 +00:00 |
|
|
Frank Schubert
|
26d022441d
|
Added gemeinde filter to Dashboard
|
2024-02-26 13:33:15 +01:00 |
|
|
Frank Schubert
|
c49bb0fc33
|
Merge branch 'fronkdev' into 'master'
Addded cifurl and -cable url to Preordercampaign
See merge request fronk/thetool!266
|
2024-02-23 15:38:22 +00:00 |
|
|
Frank Schubert
|
8fbea5f824
|
Addded cifurl and -cable url to Preordercampaign
|
2024-02-23 16:37:12 +01:00 |
|
|
Frank Schubert
|
67336d632a
|
Merge branch 'fronkdev' into 'master'
2024-02 RML address updates
See merge request fronk/thetool!265
|
2024-02-22 15:10:35 +00:00 |
|
|
Frank Schubert
|
ec1d6f803c
|
2024-02 RML address updates
|
2024-02-22 16:09:51 +01:00 |
|
|
Frank Schubert
|
e939630b4a
|
Merge branch 'spidev' into 'master'
Zeiterfassung update
See merge request fronk/thetool!264
|
2024-02-22 14:13:22 +00:00 |
|
|
Frank Schubert
|
6541e32dd9
|
Merge branch 'fronkdev' into 'master'
Added checks in Product::deleteAction()
See merge request fronk/thetool!263
|
2024-02-21 15:01:19 +00:00 |
|
|
Frank Schubert
|
db240354a4
|
Added checks in Product::deleteAction()
|
2024-02-21 16:00:41 +01:00 |
|
|
Frank Schubert
|
b833c57a98
|
Added checks in Product::deleteAction()
|
2024-02-21 15:56:15 +01:00 |
|
|
Frank Schubert
|
b2c0ce6b48
|
Merge branch 'fronkdev' into 'master'
Products can now be cloned
See merge request fronk/thetool!262
|
2024-02-21 14:41:55 +00:00 |
|
|
Frank Schubert
|
de39dd6946
|
Products can now be cloned
|
2024-02-21 15:40:59 +01:00 |
|
|
Frank Schubert
|
d0d78921fb
|
Merge branch 'fronkdev' into 'master'
Added vatgroup_id to product
See merge request fronk/thetool!261
|
2024-02-21 14:09:54 +00:00 |
|
|
Frank Schubert
|
0c706f6a0c
|
Added vatgroup_id to product
|
2024-02-21 15:09:26 +01:00 |
|
|
Frank Schubert
|
b33407d517
|
Merge branch 'fronkdev' into 'master'
Fixed Country in BMD Export
See merge request fronk/thetool!260
|
2024-02-21 12:39:54 +00:00 |
|
|
Frank Schubert
|
d1cd15935d
|
Fixed Country in BMD Export
|
2024-02-21 13:39:27 +01:00 |
|
|
Frank Schubert
|
c5c70a5ccd
|
Merge branch 'fronkdev' into 'master'
Limited VatgroupController to Fibu user
See merge request fronk/thetool!259
|
2024-02-20 21:38:18 +00:00 |
|
|
Frank Schubert
|
78916bdd0f
|
Limited VatgroupController to Fibu user
|
2024-02-20 22:37:47 +01:00 |
|
|
Frank Schubert
|
06da66bef7
|
Merge branch 'fronkdev' into 'master'
Added legacy_account in Vatrate
See merge request fronk/thetool!258
|
2024-02-20 21:26:48 +00:00 |
|
|
Frank Schubert
|
b0cd82d0dd
|
Added legacy_account in Vatrate
|
2024-02-20 22:26:20 +01:00 |
|
|
Frank Schubert
|
6ddad09943
|
Merge branch 'fronkdev' into 'master'
Added Vatgroup & Vatrate
See merge request fronk/thetool!257
|
2024-02-20 21:13:25 +00:00 |
|
|
Frank Schubert
|
7cb5ac6329
|
Added Vatgroup & Vatrate
|
2024-02-20 22:12:59 +01:00 |
|
|
Frank Schubert
|
efbf23d974
|
Merge branch 'fronkdev' into 'master'
Fixed saving network without adb_netzgebiet_id
See merge request fronk/thetool!256
|
2024-02-20 20:57:31 +00:00 |
|
|
Frank Schubert
|
cdb1f1fef7
|
Fixed saving network without adb_netzgebiet_id
|
2024-02-20 21:57:04 +01:00 |
|
|
Frank Schubert
|
80cf3d2fc8
|
Merge branch 'fronkdev' into 'master'
Address: changed country to country_id with Country table
See merge request fronk/thetool!255
|
2024-02-20 19:21:37 +00:00 |
|
|
Frank Schubert
|
20163e6008
|
Address: changed country to country_id with Country table
|
2024-02-20 20:20:48 +01:00 |
|
|
Frank Schubert
|
e1139b6d8e
|
Merge branch 'fronkdev' into 'master'
Added Country table and import script
See merge request fronk/thetool!254
|
2024-02-20 14:42:38 +00:00 |
|
|
Frank Schubert
|
c83fc9bcca
|
Added Country table and import script
|
2024-02-20 15:42:11 +01:00 |
|
|
Frank Schubert
|
d238ec0335
|
Merge branch 'spidev' into 'master'
Zeiterfassung update
See merge request fronk/thetool!253
|
2024-02-19 14:04:19 +00:00 |
|
|
Frank Schubert
|
7c1a6f17b0
|
Merge branch 'bugfix/raspberrydisplay-auth-fix' into 'master'
Bugfix/raspberrydisplay auth fix
See merge request fronk/thetool!252
|
2024-02-19 11:55:20 +00:00 |
|
|
Frank Schubert
|
36b3f1e0f8
|
Merge branch 'fronkdev' into 'master'
Added robots.txt
See merge request fronk/thetool!251
|
2024-02-15 20:57:40 +00:00 |
|
|
Frank Schubert
|
6527c67d31
|
Added robots.txt
|
2024-02-15 21:56:17 +01:00 |
|
|
Frank Schubert
|
81108f7f35
|
Merge branch 'fronkdev' into 'master'
New Preorder cancelling
See merge request fronk/thetool!250
|
2024-02-15 19:54:29 +00:00 |
|
|
Frank Schubert
|
dfa8d7ca1d
|
New Preorder cancelling
|
2024-02-15 20:44:04 +01:00 |
|
|
Frank Schubert
|
48ee058660
|
Merge branch 'fronkdev' into 'master'
Fixed sometimes failing redirect to UserProfile in Router
See merge request fronk/thetool!249
|
2024-02-15 14:31:46 +00:00 |
|
|
Frank Schubert
|
0d62e07d3e
|
Fixed sometimes failing redirect to UserProfile in Router
|
2024-02-15 15:30:19 +01:00 |
|
|
Frank Schubert
|
d13628f76f
|
Merge branch 'fronkdev' into 'master'
Added Preordercampaign Admin function updateOaidFromUnit()
See merge request fronk/thetool!248
|
2024-02-14 15:31:27 +00:00 |
|
|
Frank Schubert
|
0c1e248bc7
|
Added Preordercampaign Admin function updateOaidFromUnit()
|
2024-02-14 16:30:42 +01:00 |
|
|
Frank Schubert
|
c616e2ab77
|
Merge branch 'fronkdev' into 'master'
Added mureck to preorder scripts
See merge request fronk/thetool!247
|
2024-02-14 14:36:25 +00:00 |
|
|
Frank Schubert
|
cb5df1783a
|
Added mureck to preorder scripts
|
2024-02-14 15:35:09 +01:00 |
|
|
Frank Schubert
|
5d65740330
|
Fixed Type in translation file
|
2024-02-14 15:32:18 +01:00 |
|
|
Frank Schubert
|
8a746386a3
|
Merge branch 'fronkdev' into 'master'
AddressDB: visibility / resetFilter button in Preorder/Index / php-qrcode to version 4 in composer.json
See merge request fronk/thetool!246
|
2024-02-14 13:01:44 +00:00 |
|
|
Frank Schubert
|
7ecf8e32e6
|
Merge branch 'fronkdev' of code.fronk.at:fronk/thetool into fronkdev
|
2024-02-14 14:00:47 +01:00 |
|
|
Frank Schubert
|
f5c192a65b
|
Merge branch 'master' into fronkdev
|
2024-02-14 13:59:41 +01:00 |
|
|
Frank Schubert
|
2b6df7f96b
|
Merge branch 'master' into 'fronkdev'
# Conflicts:
# composer.json
|
2024-02-14 12:58:02 +00:00 |
|
|
Frank Schubert
|
2b5b22d5f0
|
Fixed composer.json merge conflict
|
2024-02-14 13:57:17 +01:00 |
|
|
Frank Schubert
|
5288ff5f1e
|
Fixed php-qrcode to major version 4 in composer.json
|
2024-02-14 13:50:16 +01:00 |
|
|
Frank Schubert
|
b40e32e6d2
|
Merge branch 'feature/RaspberryDisplay' into 'master'
created RasberryDisplay Module
See merge request fronk/thetool!245
|
2024-02-14 12:41:35 +00:00 |
|
|
Frank Schubert
|
75453d44af
|
Fixed resetFilter button in Preorder/Index
|
2024-02-13 16:56:43 +01:00 |
|
|
Frank Schubert
|
9d5c6a9b4a
|
AddressDB: Added visibility in Form
|
2024-02-13 16:19:17 +01:00 |
|
|
Frank Schubert
|
0bc5359277
|
WIP Contractqueue
|
2024-02-13 16:18:54 +01:00 |
|
|
Frank Schubert
|
8bf9e3efa3
|
Merge branch 'fronkdev' into 'master'
Fixed order_date
See merge request fronk/thetool!244
|
2024-02-12 11:34:07 +00:00 |
|
|
Frank Schubert
|
3a12056db7
|
Fixed order_date
|
2024-02-12 12:33:40 +01:00 |
|
|
Frank Schubert
|
7021da184c
|
Merge branch 'spidev' into 'master'
Zeiterfassung update
See merge request fronk/thetool!243
|
2024-02-12 11:02:20 +00:00 |
|
|
Frank Schubert
|
ade4a3e2e5
|
Merge branch 'spidev' into 'master'
Spidev
See merge request fronk/thetool!242
|
2024-02-12 10:52:54 +00:00 |
|
|
Frank Schubert
|
c20b5e325a
|
Merge branch 'fronkdev' into 'master'
Preorder map: Removed netzgebiet outlines for non-admins
See merge request fronk/thetool!241
|
2024-02-09 17:23:48 +00:00 |
|
|
Frank Schubert
|
4681e5435b
|
Preorder map: Removed netzgebiet outlines for non-admins
|
2024-02-09 18:23:03 +01:00 |
|
|
Frank Schubert
|
7df9ce526f
|
Merge branch 'fronkdev' into 'master'
Added user property to enforce 2fa or not
See merge request fronk/thetool!240
|
2024-02-09 17:09:39 +00:00 |
|
|
Frank Schubert
|
fc260c996d
|
Added user property to enforce 2fa or not
|
2024-02-09 18:09:02 +01:00 |
|
|
Frank Schubert
|
3d9868f2da
|
Merge branch 'fronkdev' into 'master'
Importing adb netzgebiet borderpoly
See merge request fronk/thetool!239
|
2024-02-09 16:52:49 +00:00 |
|