snipe
|
dc7b9315b5
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-19 10:35:54 +01:00 |
|
snipe
|
6c17b141db
|
Removed duplicate locations_id search
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-19 10:35:21 +01:00 |
|
snipe
|
d87da78eb5
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Users/UsersController.php
# config/version.php
# public/css/build/AdminLTE.css
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all-defer.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2024-06-17 11:18:33 +01:00 |
|
snipe
|
756a2ac25c
|
Added API tests
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-12 11:58:12 +01:00 |
|
snipe
|
7e3d66ec53
|
Merge branch 'develop' into fixes/companyable_trait_on_users
|
2024-06-12 11:27:26 +01:00 |
|
Brady Wetherington
|
c8820adb56
|
Add two new 'with()' relationships to Users API index query
|
2024-06-10 13:29:53 +01:00 |
|
snipe
|
065a47a446
|
Use the DeleteUser request
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-05 13:28:44 +01:00 |
|
snipe
|
cff382605c
|
Fixed some missing strings and checks
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-01 04:01:04 +01:00 |
|
snipe
|
03b0268dc2
|
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-01 03:00:45 +01:00 |
|
snipe
|
801e58d52e
|
Removed manual scoping
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 06:58:15 +01:00 |
|
snipe
|
fb233c0aa4
|
Cleaned up facade names and references
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-29 12:38:15 +01:00 |
|
Brady Wetherington
|
4adbd7af4c
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2024-05-22 21:02:11 +01:00 |
|
snipe
|
bb96a190fd
|
Moved validator
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-22 12:34:48 +01:00 |
|
snipe
|
34f1ea1c0e
|
Re-order gating and refactor group syncing
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-21 10:00:49 +01:00 |
|
Brady Wetherington
|
f633dbba64
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2024-05-20 12:55:29 +01:00 |
|
snipe
|
8c327e6523
|
Handle user not found properly
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-07 19:16:56 +01:00 |
|
snipe
|
d942b8f1fb
|
Fixed alias names
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-07 17:40:35 +01:00 |
|
snipe
|
49dc9767b6
|
Added debugging :(
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-07 15:54:43 +01:00 |
|
snipe
|
410b547f3c
|
Added users and locatipon count to API
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-07 12:07:28 +01:00 |
|
Brady Wetherington
|
3f5c5cbe82
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2024-04-24 16:24:43 +01:00 |
|
snipe
|
4450351b75
|
Only sync groups if API user is superadmin
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-17 11:06:50 +01:00 |
|
snipe
|
65dd729e19
|
Additional gates
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-17 10:57:20 +01:00 |
|
snipe
|
710370ac24
|
Added scoping for destroy
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-11 14:58:25 +01:00 |
|
snipe
|
460693c153
|
Added comment
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-11 14:40:13 +01:00 |
|
Brady Wetherington
|
65e21faa3e
|
Merge branch 'develop' into snipeit_v7_laravel10
Hopefully, last merge?
|
2024-04-02 20:34:04 +01:00 |
|
snipe
|
8bc9688d71
|
Added ability to filter on category ID and model ID from user’s asset API
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-27 16:04:00 +00:00 |
|
snipe
|
5ed2bd0fb7
|
Skip the normal edit observer
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-20 23:52:22 +00:00 |
|
snipe
|
2067b1138a
|
Added the log item
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-20 23:43:58 +00:00 |
|
Brady Wetherington
|
5b9120ba6c
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2024-03-05 19:22:37 +00:00 |
|
snipe
|
cb78451d6c
|
Made website searchable on users table
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-22 16:13:54 +00:00 |
|
snipe
|
e8ad8a7448
|
Added email, phone icons
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-22 14:48:01 +00:00 |
|
Brady Wetherington
|
8f2843bfcf
|
Merge branch 'develop' into snipeit_v7_laravel10
Had to re-generate composer.lock, and re-do package.json and rebuild assets as well.
|
2024-02-21 20:22:28 +00:00 |
|
snipe
|
a32c679519
|
Removed debugging
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-20 16:40:31 +00:00 |
|
Brady Wetherington
|
f734e196e5
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2024-01-08 18:57:55 +00:00 |
|
snipe
|
f8a21bdb2d
|
Moved limit and offset to after additional qualifiers
Signed-off-by: snipe <snipe@snipe.net>
|
2024-01-05 11:59:31 +00:00 |
|
snipe
|
f08ce34036
|
Fixed translation string in JSON
Signed-off-by: snipe <snipe@snipe.net>
|
2023-12-19 12:31:55 +00:00 |
|
snipe
|
e894138fd4
|
Added $user->created_at to API user create method
Signed-off-by: snipe <snipe@snipe.net>
|
2023-12-12 12:26:02 +00:00 |
|
Brady Wetherington
|
6210716199
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2023-11-27 13:04:39 +00:00 |
|
snipe
|
d06cfe6502
|
Changed verb to “restore” from “restored”
Signed-off-by: snipe <snipe@snipe.net>
|
2023-11-22 20:08:41 +00:00 |
|
snipe
|
6a3ab526de
|
Refactorer API controller restore methods
Signed-off-by: snipe <snipe@snipe.net>
|
2023-11-22 18:04:24 +00:00 |
|
Godfrey M
|
57019e170f
|
adds user location scope, still needs fine tuning
|
2023-11-14 11:49:00 -08:00 |
|
snipe
|
3f6554ee34
|
Use singleton for offset
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-16 23:23:43 +01:00 |
|
snipe
|
752171d5b8
|
Use singleton for offset
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-16 20:05:11 +01:00 |
|
snipe
|
2166d6649d
|
Merge pull request #13343 from snipe/fixes/re-scramble_password_if_ldap_pw_sync_not_enabled
Fixed #13336 - Save unhashed password if no password provided
|
2023-09-14 14:15:53 +01:00 |
|
Marcus Moore
|
806ab2cb9d
|
Ensure users are scoped by company in index method
|
2023-08-29 16:17:29 -07:00 |
|
snipe
|
baffcbad71
|
Set password property properly
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-28 20:47:56 +01:00 |
|
snipe
|
611db4c0d2
|
Removed stray line
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-28 20:46:45 +01:00 |
|
snipe
|
b54e7dc3ee
|
Fixed #13336 - Save unhashed password if no password provided
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-19 17:44:40 +01:00 |
|
snipe
|
f51dd15893
|
Moved deleted scope down
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-14 07:44:19 +01:00 |
|
snipe
|
087f0e596a
|
Fixed has to where
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-17 22:44:05 -07:00 |
|