 snipe
|
7b7738fbcc
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/app.css.map
# public/css/build/overrides.css
# public/css/build/overrides.css.map
# public/css/dist/all.css
# public/mix-manifest.json
|
2025-08-15 14:24:30 +02:00 |
|
|
snipe
|
9797bb19e2
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-15 14:23:22 +02:00 |
|
|
snipe
|
08a9554b3c
|
Merge pull request #17607 from Godmartinz/color-corrections-pt9000
Fixes #17488 more info text colors
|
2025-08-14 20:39:26 +02:00 |
|
|
Godfrey M
|
d79bd825ee
|
fix popover text color
|
2025-08-14 10:51:31 -07:00 |
|
|
snipe
|
31197604a3
|
Merge pull request #17602 from grokability/develop
Merge develop into master
|
2025-08-13 21:19:39 +02:00 |
|
|
snipe
|
376e0db66e
|
Merge pull request #17601 from ubc-cpsc/bugfix/CVE-2025-55166
Fixes CVE-2025-55166
|
2025-08-13 20:49:41 +02:00 |
|
|
Joël Pittet
|
5fdabc1a62
|
Fixes CVE-2025-55166
|
2025-08-13 11:42:14 -07:00 |
|
|
snipe
|
f42a2d7457
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-11 20:45:38 +01:00 |
|
|
snipe
|
94bd39cf23
|
Merge pull request #17570 from grokability/#10038-add-active-flag-filter
Added sidenav to filter on activated vs inactive users
|
2025-08-11 20:45:22 +01:00 |
|
|
snipe
|
4038a22093
|
Added sidenav to filter on activated vs inactive users
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-11 20:41:55 +01:00 |
|
|
snipe
|
d29619b67c
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-11 18:50:17 +01:00 |
|
|
snipe
|
682baec0c9
|
Merge pull request #17569 from grokability/#10284-add-mobile-number
Fixed #10284: Added mobile phone to users
|
2025-08-11 18:49:49 +01:00 |
|
|
snipe
|
ff91be491d
|
Added mobile to tests
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-11 18:43:37 +01:00 |
|
|
snipe
|
ef35a0f2f1
|
Fixed #10284: Added mobile phone to users
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-11 18:38:22 +01:00 |
|
|
snipe
|
f5235cb835
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-11 18:12:51 +01:00 |
|
|
snipe
|
f12a3bb08b
|
Fixed #10306 - cast purchase cost to a float
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-11 18:12:37 +01:00 |
|
|
snipe
|
ee830e0cb4
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/app.css.map
# public/css/build/overrides.css
# public/css/build/overrides.css.map
# public/css/dist/all.css
# public/mix-manifest.json
|
2025-08-11 14:58:57 +01:00 |
|
|
snipe
|
c8a5065ffa
|
Merge pull request #17567 from grokability/#11754-nicer-menu-alignment
Fixed #11754: nicer menu alignment for dropdowns
|
2025-08-11 14:57:59 +01:00 |
|
|
snipe
|
23da5573f3
|
Fixed #11754 - nicer top menu dropdown alignment
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-11 14:56:43 +01:00 |
|
|
snipe
|
b08f985776
|
Merge pull request #17566 from grokability/partial-fix-for-#17565-standard-layout
Show all icons on location table, even if no results
|
2025-08-11 14:17:59 +01:00 |
|
|
snipe
|
9b968baaa7
|
Show all icons, even if no results
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-11 14:14:15 +01:00 |
|
|
snipe
|
07edbe6f1c
|
Add @mckaygerhard as a contributor
|
2025-08-11 13:08:54 +01:00 |
|
|
snipe
|
0cd3be003d
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-11 13:07:00 +01:00 |
|
|
snipe
|
1f55a8b6e3
|
Added icon and tooltip
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-11 13:06:37 +01:00 |
|
|
snipe
|
f6b9e11810
|
Merge pull request #17538 from mckaygerhard/mail-log-improvements
Mail log for #17491 and some improvements on log errors
|
2025-08-11 13:05:56 +01:00 |
|
|
snipe
|
c93e35ec77
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-11 11:18:31 +01:00 |
|
|
snipe
|
c18a3e4266
|
Fixed #17562 - bootstrap table formater undefined
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-11 11:18:20 +01:00 |
|
|
snipe
|
9538a76232
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-11 06:26:29 +01:00 |
|
|
snipe
|
5840ef1c6f
|
Fixed #17560
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-11 06:26:15 +01:00 |
|
|
snipe
|
7974baddf5
|
Merge pull request #17551 from grokability/move-file-uploads-paths-to-base-controller
Move the object type mapping and such to the base controller to de-dupe
|
2025-08-11 05:44:39 +01:00 |
|
|
snipe
|
05876bb124
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-11 05:05:13 +01:00 |
|
|
snipe
|
4bf569758f
|
Cleans up a few rmore outes
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-11 05:05:00 +01:00 |
|
|
snipe
|
8bcd5a6d2a
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2025-08-10 21:04:55 +01:00 |
|
|
snipe
|
f56fd9bb0b
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-10 21:04:33 +01:00 |
|
|
snipe
|
a36afbcb25
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-10 21:02:48 +01:00 |
|
|
snipe
|
357ee5fc45
|
Copy over the old dirs just in case
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-10 21:02:37 +01:00 |
|
|
snipe
|
ebd8d085cf
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-10 21:01:34 +01:00 |
|
|
snipe
|
c6dea085b2
|
Missed a few
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-10 21:01:23 +01:00 |
|
|
snipe
|
505148b024
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-10 20:51:27 +01:00 |
|
|
snipe
|
8782c3ecec
|
Merge pull request #17554 from grokability/#13997-add-ldap-sync-via-api
Adds #13997 - API endpoint to sync users via LDAP
|
2025-08-10 20:30:44 +01:00 |
|
|
snipe
|
b636cf2ef0
|
Merge pull request #17555 from grokability/#17490-use-numeric-for-purchase-cost
Fixed #17490: use numeric for purchase cost
|
2025-08-10 20:30:15 +01:00 |
|
|
snipe
|
6dee2b8601
|
Fixed 17490 - currency symbol breaks purchase_cost
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-10 19:04:52 +01:00 |
|
|
snipe
|
bcf301ac17
|
Adds #13997 - API endpoint to sync users via LDAP
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-10 18:48:01 +01:00 |
|
|
snipe
|
bf2120fb31
|
Use newer file path
|
2025-08-10 18:26:41 +01:00 |
|
|
snipe
|
de56b74f3e
|
Merge branch 'develop' into move-file-uploads-paths-to-base-controller
|
2025-08-10 18:25:47 +01:00 |
|
|
snipe
|
2f146abe91
|
Let people upload images on the demo
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-10 18:20:35 +01:00 |
|
|
snipe
|
543d41b6ff
|
Merge pull request #17553 from grokability/#17547-asset-model-images-not-loading
Fixed #17547: asset model images not loading
|
2025-08-10 18:15:57 +01:00 |
|
|
snipe
|
8da0dd7563
|
Use strtolower
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-10 18:11:39 +01:00 |
|
|
snipe
|
a2217d7dbc
|
Specify the public disk for creating directories
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-10 18:08:15 +01:00 |
|
|
snipe
|
ea84728a3f
|
Rename models uploads dir
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-10 17:58:11 +01:00 |
|