spencerrlongg
|
a8cd1027f3
|
rm commented code
|
2024-08-20 11:40:15 -05:00 |
|
spencerrlongg
|
20ec420ba3
|
not quite done, api side needs some work
|
2024-08-14 13:53:29 -05:00 |
|
spencerrlongg
|
120cfd13c5
|
translation
|
2024-08-13 14:07:40 -05:00 |
|
spencerrlongg
|
09f2739298
|
works, un-reassignable licenses are an issue
|
2024-08-13 13:45:41 -05:00 |
|
spencerrlongg
|
ec863df007
|
rm conditional that might be unnecessary
|
2024-08-12 16:58:53 -05:00 |
|
spencerrlongg
|
cc3b8e0681
|
this should more or less work, but i need to determine if this is the best way
|
2024-08-12 16:58:21 -05:00 |
|
spencerrlongg
|
ff145abbe7
|
use array for eager loading, makes ide prettier
|
2024-08-12 16:13:03 -05:00 |
|
snipe
|
759ab78f80
|
Added more redirects
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-26 11:27:36 +01:00 |
|
snipe
|
ae9085b11f
|
Modernize use statements, switch to auth()
Signed-off-by: snipe <snipe@snipe.net>
|
2024-07-04 20:49:22 +01:00 |
|
snipe
|
1d26ccac4e
|
Check for the additional auth for that user
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-22 19:33:06 +01:00 |
|
snipe
|
e19922abd0
|
Cleaned up UI controller
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-22 18:49:35 +01:00 |
|
snipe
|
e03614d91b
|
Added withtrashed back in
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-22 16:40:32 +01:00 |
|
snipe
|
b82770d0a8
|
One more small fix
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-22 16:38:29 +01:00 |
|
snipe
|
55e1326164
|
Fixed #14935 - user does not exist
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-22 16:24:18 +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
|
7e3d66ec53
|
Merge branch 'develop' into fixes/companyable_trait_on_users
|
2024-06-12 11:27:26 +01:00 |
|
snipe
|
5cdb2b7163
|
Check that the user was not aready deleted
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-05 14:00:35 +01:00 |
|
snipe
|
d4c080c7e4
|
Use the form request on the UI controller
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-05 13:40:32 +01:00 |
|
snipe
|
065a47a446
|
Use the DeleteUser request
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-05 13:28:44 +01:00 |
|
snipe
|
09e94ec176
|
Reordered withTrashed() and find()
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-05 09:57:24 +01:00 |
|
snipe
|
67fb3f10d5
|
Tightened up tests with better checks
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-01 04:24:47 +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
|
3f9a80942e
|
Removed manual companyable from non-API views
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 23:10:23 +01:00 |
|
snipe
|
dc62e393c3
|
Hotfix for user permissions
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-31 21:22:21 +01:00 |
|
snipe
|
a46e2ebfd8
|
Small tweaks to user export, user view translations
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-30 13:59:00 +01:00 |
|
snipe
|
f710b1aac3
|
Merge pull request #14614 from akemidx/feature/sc-19796
ADDED: Export User Permissions (Superuser & Admin)
|
2024-05-30 13:41:26 +01:00 |
|
snipe
|
92ba889cae
|
Updated/removed facades
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-29 12:53:51 +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 |
|
Godfrey Martinez
|
5272824d85
|
Merge branch 'develop' into asset-location-update-bug
|
2024-05-13 10:47:25 -07:00 |
|
akemidx
|
ac4aa97103
|
develop reheading
|
2024-04-23 17:05:50 -04:00 |
|
akemidx
|
0bc93c6a1e
|
space
|
2024-04-23 15:31:37 -04:00 |
|
akemidx
|
0d049a0be7
|
conflict resolution
|
2024-04-22 20:09:40 -04:00 |
|
akemidx
|
01c24ab4cd
|
translating text
|
2024-04-22 19:16:14 -04:00 |
|
akemidx
|
e8d9701a26
|
array key existing
|
2024-04-17 19:16:25 -04:00 |
|
snipe
|
9bb15aaf1b
|
Added individual gates to keep response consistent with other company-ed things
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-17 10:57:49 +01:00 |
|
snipe
|
ed0a441e4d
|
Refactor destroy method
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-11 14:52:03 +01:00 |
|
snipe
|
f54a94bd4c
|
Refactorered methods
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-11 14:40:00 +01:00 |
|
snipe
|
adacdc038d
|
Apply company scoping for users
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-10 12:34:32 +01:00 |
|
akemidx
|
721902c2d4
|
committed for later
|
2024-03-28 16:44:44 -04:00 |
|
akemidx
|
e6b366020a
|
lots of attempts and syntax, but no go
|
2024-03-27 19:05:59 -04:00 |
|
Godfrey M
|
633249b08a
|
user assets get updated when a user changes location
|
2024-03-21 15:15:40 -07:00 |
|
akemidx
|
5ffade663a
|
unstash
|
2024-02-26 18:41:58 -05:00 |
|
akemidx
|
9397372f87
|
permissions, but they are now all in their own column because reasons???
|
2024-02-20 18:48:17 -05:00 |
|
akemidx
|
8bbf6da052
|
user block, trying to pick out ONLY permissions we wanna see
|
2024-02-20 18:25:41 -05:00 |
|
akemidx
|
f7d0cecdac
|
permissions query starto
|
2024-02-12 19:01:06 -05:00 |
|
akemidx
|
2a54797dce
|
permission level proof of formatting
|
2023-11-28 17:58:37 -05:00 |
|
akemidx
|
9770016eec
|
beginning of permission groups export
|
2023-11-28 17:47:36 -05: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
|
f7ccef16e7
|
Refactorer controller restore methods
Signed-off-by: snipe <snipe@snipe.net>
|
2023-11-22 18:02:47 +00:00 |
|
Marcus Moore
|
2aba8252f3
|
Ensure users editing themselves do not deactivate their account
|
2023-04-20 21:59:55 -07:00 |
|