Commit Graph

  • 0a01b95c85 Merge pull request 'fix ci' (#383) from usage-stats into main philipp 2024-04-16 09:08:26 +02:00
  • 6daf2495a8 Merge pull request 'fix ci' (#381) from usage-stats into staging philipp 2024-04-16 09:07:31 +02:00
  • 8771a378da fix ci philipp 2024-04-16 09:06:24 +02:00
  • e84547c8ca Merge pull request 'log usage' (#380) from usage-stats into main philipp 2024-04-16 08:54:25 +02:00
  • 872dcd0668 Merge pull request 'log usage' (#379) from usage-stats into staging philipp 2024-04-16 08:53:46 +02:00
  • a9f74fcd3c log usage philipp 2024-04-16 08:52:37 +02:00
  • 95752703ff Merge pull request 'clean w/ clippy' (#378) from clippy into main philipp 2024-04-15 23:37:27 +02:00
  • 5e19a62c7e Merge pull request 'clippy' (#377) from clippy into staging philipp 2024-04-15 23:37:18 +02:00
  • 2694829b6e clean w/ clippy philipp 2024-04-15 23:26:52 +02:00
  • 151e1b7864 Merge pull request 'show steering person in logs if not cox' (#376) from show-steering-person-in-logs into main philipp 2024-04-15 22:04:14 +02:00
  • 5965b1d626 Merge pull request 'show steering person in logs if not cox' (#375) from show-steering-person-in-logs into staging philipp 2024-04-15 22:03:39 +02:00
  • 219b80377d show notification to vorstand if boat entry with 'externes boot' or on multiple days is entered philipp 2024-04-15 22:03:20 +02:00
  • 8315a27ea8 fix tests (proper timezone), proper spacing philipp 2024-04-15 21:32:16 +02:00
  • d070c7731a show steering person in logs if not cox philipp 2024-04-15 20:45:26 +02:00
  • c8f614e2d2 Merge pull request 'staging' (#374) from staging into main philipp 2024-04-15 18:49:51 +02:00
  • 4b07c11bc3 fix ci philipp 2024-04-15 18:24:18 +02:00
  • 0bc00472d7 don't create any notification if we are working with planned_event philipp 2024-04-15 18:22:58 +02:00
  • 37da4f2c3e Merge branch 'main' into staging philipp 2024-04-15 18:16:57 +02:00
  • 74505c1554 add notification to all pot. coxes if trip is full philipp 2024-04-15 18:16:43 +02:00
  • 1869b36e09 add notification on canceled trips; add explicit 'cancel trip' button philipp 2024-04-15 17:17:54 +02:00
  • 13808d0103 Merge pull request 'staging' (#373) from staging into main philipp 2024-04-15 11:26:20 +02:00
  • 4a3803df51 Merge branch 'main' into staging philipp 2024-04-15 11:25:49 +02:00
  • d58d4642af 1x boats: don't show 'Ruderer: ' in logbook; Fixes #362 philipp 2024-04-15 11:23:07 +02:00
  • c3fa5195d3 Merge pull request 'hide old verified boat damages' (#372) from hide-old-verified-boatdamages into main philipp 2024-04-14 21:40:39 +02:00
  • c4a9a541d3 Merge pull request 'don't show external boats in boatstat; hide logout in menu; move owner into own column in boatstat' (#369) from updates into main philipp 2024-04-14 21:40:27 +02:00
  • 8db9e020c8 Merge pull request 'hide old verified boat damages' (#371) from hide-old-verified-boatdamages into staging philipp 2024-04-14 20:28:42 +02:00
  • 42277699a7 hide old verified boat damages philipp 2024-04-14 20:28:06 +02:00
  • a1b78db750 Merge pull request 'don't show external boats in boatstat; hide logout in menu; move owner into own column in boatstat' (#368) from updates into staging philipp 2024-04-14 20:22:18 +02:00
  • 7ebbf5661a don't show external boats in boatstat; hide logout in menu; move owner into own column in boatstat philipp 2024-04-14 20:20:22 +02:00
  • 2ff08141ae Merge pull request 'steering' (#367) from steering into main philipp 2024-04-14 20:18:45 +02:00
  • 297e0629a4 Merge pull request 'steering' (#366) from steering into staging philipp 2024-04-14 19:57:26 +02:00
  • 213a80bd28 Merge branch 'staging' into steering philipp 2024-04-14 19:56:58 +02:00
  • b111c4a1b9 lint html philipp 2024-04-14 18:38:41 +02:00
  • db43ef628f [TASK] style steering html Marie Birner 2024-04-14 18:36:27 +02:00
  • ccf9f41f4e Merge branch 'staging' of ssh://git.hofer.link:2222/Ruderverein-Donau-Linz/rowt into staging philipp 2024-04-14 18:27:35 +02:00
  • fb9e694919 add required role philipp 2024-04-14 18:27:21 +02:00
  • ea70170d2b Merge pull request '[TASK] improve style searchable table' (#365) from js-table into main philipp 2024-04-14 18:19:22 +02:00
  • 36af52bf7e Merge pull request 'js-table' (#364) from js-table into staging marie 2024-04-14 17:56:43 +02:00
  • 0b6461eeb5 [TASK] improve style searchable table Marie Birner 2024-04-14 17:43:18 +02:00
  • b0c936cc34 Merge pull request 'have test users only @ staging' (#363) from staging into main philipp 2024-04-14 17:00:53 +02:00
  • d51174e8fd have test users only @ staging philipp 2024-04-14 16:59:17 +02:00
  • e2a30dad52 Merge pull request 'staging' (#360) from staging into main philipp 2024-04-13 09:52:24 +02:00
  • 74d3957cf8 dont show external boat philipp 2024-04-13 09:44:22 +02:00
  • cfc35fbec6 only show non-placed boats in boathouse list philipp 2024-04-13 09:42:12 +02:00
  • b1d3f8ddc9 Merge pull request 'allow html in notifications' (#359) from staging into main philipp 2024-04-12 11:33:26 +02:00
  • 3b04b39d66 allow html in notifications philipp 2024-04-12 11:32:21 +02:00
  • cdcb07a3f7 Merge pull request 'update deps' (#356) from staging into main philipp 2024-04-09 11:25:01 +02:00
  • 19523acc67 update deps philipp 2024-04-09 11:24:38 +02:00
  • faa8e6a13b Merge pull request 'fix ci' (#355) from staging into main philipp 2024-04-09 08:08:11 +02:00
  • 0fed206df6 fix ci philipp 2024-04-09 08:07:56 +02:00
  • 7660953e6b Merge pull request 'don't clutter logs' (#354) from staging into main philipp 2024-04-09 07:30:40 +02:00
  • 4a5d9fa65b don't clutter logs philipp 2024-04-09 07:30:05 +02:00
  • 83c0285204 Merge pull request 'staging' (#353) from staging into main philipp 2024-04-08 23:22:24 +02:00
  • 3823d959e8 add stats from nginx logs philipp 2024-04-08 23:21:35 +02:00
  • 6c302712d4 add stats from nginx logs philipp 2024-04-08 23:20:33 +02:00
  • f93677b420 add stats from nginx logs philipp 2024-04-08 23:19:59 +02:00
  • 23cd62820c Merge pull request 'only show notifications from last 2 weeks' (#352) from staging into main philipp 2024-04-08 20:25:37 +02:00
  • 39d410b050 only show notifications from last 2 weeks philipp 2024-04-08 20:25:13 +02:00
  • 61c67d78da Merge pull request 'allow admin to send notifications' (#351) from staging into main philipp 2024-04-08 19:36:35 +02:00
  • 64d32e2688 allow admin to send notifications philipp 2024-04-08 19:35:31 +02:00
  • 1aba6948ee Merge pull request 'only allow people with 'donau linz' role to be in logbook' (#350) from staging into main philipp 2024-04-08 19:05:29 +02:00
  • 3b9103e9aa fix membership application error philipp 2024-04-08 19:04:57 +02:00
  • db3158d4e7 only allow people with 'donau linz' role to be in logbook philipp 2024-04-07 23:17:06 +02:00
  • 08a970853a Merge pull request 'better text for boat reservation' (#349) from staging into main philipp 2024-04-07 22:13:32 +02:00
  • 7cbfafa5c5 better text for boat reservation philipp 2024-04-07 22:12:56 +02:00
  • c64f392fe7 Merge pull request 'improve header of list' (#348) from staging into main philipp 2024-04-07 20:12:22 +02:00
  • 4fef4ca2c6 improve header of list philipp 2024-04-07 20:11:41 +02:00
  • 268c2018ae Merge pull request 'allow to search by nickname' (#347) from staging into main philipp 2024-04-07 15:31:07 +02:00
  • b7e8e1fa37 keep defaults philipp 2024-04-07 15:30:52 +02:00
  • fe6af27813 allow to search by nickname philipp 2024-04-07 15:26:37 +02:00
  • a2005c55aa Merge pull request 'show boats w/o km' (#346) from staging into main philipp 2024-04-06 21:17:43 +02:00
  • da446c5073 show boats w/o km philipp 2024-04-06 21:17:23 +02:00
  • d3bc2bea4f Merge pull request 'staging' (#345) from staging into main philipp 2024-04-06 20:00:25 +02:00
  • 37fcdb81bc remove unnecessary if philipp 2024-04-06 19:57:42 +02:00
  • b3041d9ca7 also show boats w/o any km philipp 2024-04-06 19:56:06 +02:00
  • 7c8f20623c Merge pull request 'show owner of boat in boat km list' (#344) from staging into main philipp 2024-04-06 18:57:57 +02:00
  • 8b07ace876 show owner of boat in boat km list philipp 2024-04-06 18:55:38 +02:00
  • 073b2aca04 Merge pull request 'don't show external cox as cox' (#343) from staging into main philipp 2024-04-06 18:40:29 +02:00
  • 934795abd8 don't show external cox as cox philipp 2024-04-06 18:40:01 +02:00
  • c3965c9528 Merge pull request 'staging' (#342) from staging into main philipp 2024-04-06 18:29:27 +02:00
  • 5164ce1f02 show list of coxes philipp 2024-04-06 18:27:20 +02:00
  • 18cdb20923 Merge pull request 'fancier-boat-stats' (#341) from fancier-boat-stats into main philipp 2024-04-06 17:56:07 +02:00
  • 85a61dfdc0 Merge pull request 'fancier-boat-stats' (#340) from fancier-boat-stats into staging philipp 2024-04-06 17:54:42 +02:00
  • c094097af7 don't show boats which are still on the water philipp 2024-04-06 17:54:07 +02:00
  • 39ba7d53dd make table readable philipp 2024-04-06 17:44:05 +02:00
  • 98fc037f73 Merge pull request 'fancier boat stats' (#339) from fancier-boat-stats into staging philipp 2024-04-06 15:28:28 +02:00
  • 955f657298 fancier boat stats philipp 2024-04-06 15:27:35 +02:00
  • 853f9d901e Merge pull request 'staging' (#338) from staging into main philipp 2024-04-03 18:07:59 +02:00
  • d0c2b4d703 don't show duplicate boats for rennrowing philipp 2024-04-03 18:07:20 +02:00
  • 1af3838ebc use proper timezone philipp 2024-04-03 08:13:32 +02:00
  • d0bbf8f181 Merge pull request 'staging' (#337) from staging into main philipp 2024-04-03 08:07:48 +02:00
  • 8c8a5c9762 show boats which have place in boatshouse philipp 2024-04-03 08:07:16 +02:00
  • b0ea0668c7 Merge pull request 'reservations' (#327) from reservations into main philipp 2024-04-02 21:46:18 +02:00
  • 4e1de0c886 Merge pull request 'show 'no reservations' if no reservations :-)' (#336) from reservations into staging philipp 2024-04-02 21:31:53 +02:00
  • 244eb1be07 show 'no reservations' if no reservations :-) philipp 2024-04-02 21:31:02 +02:00
  • 06f9fcc427 Merge pull request 'reservations' (#335) from reservations into staging philipp 2024-04-02 21:12:14 +02:00
  • 784deaf9f4 deployed :-) philipp 2024-04-02 21:11:31 +02:00
  • 3b63cafa79 Merge branch 'staging' into reservations philipp 2024-04-02 21:09:47 +02:00
  • 0fe672c9da Merge branch 'main' into staging philipp 2024-04-02 21:08:35 +02:00
  • 37ab6e9132 reorder ergo entry philipp 2024-04-02 21:07:58 +02:00