Commit graph

4247 commits

Author SHA1 Message Date
snipe
2c5ddca695 More jquery and form fixes for users
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 17:08:21 -07:00
slong753
29e3d202fe checking something, quick push 2023-04-03 17:54:31 -05:00
snipe
790f9c2fc4 Updated 2FA to non-icheck
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 15:38:52 -07:00
snipe
b4df9eb586 More checkbox tweaks
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 15:33:21 -07:00
snipe
0d050e4016 Updated user edit page with with non-icheck toggles
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 14:55:12 -07:00
snipe
5c89439ba3 Updated login page to use non-icheck
TODO: override that style for the labels
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 12:18:18 -07:00
snipe
85c0ddf475 Tweaked the col-md to use offset
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 12:17:49 -07:00
snipe
5078b51d4d Removed temp disabled attributes
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 11:39:02 -07:00
snipe
e066f033c8 First attempt at moving us away from iCheck
Signed-off-by: snipe <snipe@snipe.net>
2023-04-03 10:54:01 -07:00
snipe
fcda478712 Merge remote-tracking branch 'origin/develop' 2023-03-30 14:51:23 -07:00
snipe
986c73982e Check if status is set
Signed-off-by: snipe <snipe@snipe.net>
2023-03-30 14:50:56 -07:00
snipe
080a4c823b Merge remote-tracking branch 'origin/develop' 2023-03-30 14:49:19 -07:00
snipe
1fc0a0f94d Quick fix for bulk restore menu
Signed-off-by: snipe <snipe@snipe.net>
2023-03-30 14:44:38 -07:00
snipe
048be49c14 Merge remote-tracking branch 'origin/develop' 2023-03-30 14:37:47 -07:00
snipe
dfa9c07217
Merge pull request #12760 from akemidx/apple_warranty_link_fix2
Updating Apple warranty link to match current Apple webpage
2023-03-30 12:47:09 -07:00
akemidx
0c38257f80 fixing one liner 2023-03-30 15:40:23 -04:00
snipe
9ca5285781
Merge pull request #12762 from spencerrlongg/feature/sc-20304
Bulk Restore from Deleted
2023-03-30 12:37:50 -07:00
slong753
b84eaaf61a translations done 2023-03-30 13:48:05 -05:00
snipe
b7c09042b0
Merge pull request #12758 from inietov/fixes/call_to_member_function_present_null
Fixed Call to a member function present() on null [sc-20594]
2023-03-30 11:01:38 -07:00
snipe
10c1e923dc
Merge pull request #12764 from marcusmoore/fixes/importer-fix
Fixes potential unwanted overwrites in asset imports
2023-03-30 09:40:58 -07:00
slong753
d5d50264c3 fix permissions stuff + optional parameter 2023-03-29 19:53:04 -05:00
Ivan Nieto Vivanco
d622dbb943 Revert the php codeblock and replace it with a ternary 2023-03-29 18:37:47 -06:00
snipe
da940a6bcc Merge remote-tracking branch 'origin/develop' 2023-03-29 17:19:50 -07:00
Marcus Moore
6beb3b551a
Fix typo 2023-03-29 17:01:24 -07:00
slong753
d033733fc0 oops, remove a couple things 2023-03-29 18:30:39 -05:00
slong753
e4c76f454c this is good, just needs translations done in view 2023-03-29 18:24:56 -05:00
slong753
162b70d5a9 wireframed, needs a view and should work 2023-03-29 17:34:36 -05:00
Marcus Moore
863a346d6e
Translate strings 2023-03-29 13:37:14 -07:00
Marcus Moore
e05546d1fa
Display helpful messages when importing assets 2023-03-29 13:23:45 -07:00
slong753
b0fa298d8f delete a couple things 2023-03-29 15:14:48 -05:00
slong753
65bbecd145 this all works - could use some eyes 2023-03-29 14:46:31 -05:00
akemidx
6bee4c1a75 Updating Apple warranty link to match current Apple webpage 2023-03-29 15:09:14 -04:00
Marcus Moore
9cc74caa9e
Add wire:model to import form checkboxes 2023-03-29 10:58:25 -07:00
Ivan Nieto Vivanco
d7c531e1c7 Checks if user variable exist before using its properties 2023-03-29 10:33:15 -06:00
slong753
032ae4348e custom fields display, need to get saving
+some clean up
2023-03-28 21:45:31 -05:00
slong753
804a788a27 initial fetch working 2023-03-28 20:31:24 -05:00
snipe
527c812d04 Use icon for group users header
Signed-off-by: snipe <snipe@snipe.net>
2023-03-28 16:39:41 -07:00
snipe
99a05c6401 Merge remote-tracking branch 'origin/develop' 2023-03-28 13:43:24 -07:00
Joe Ferguson
47e18db172
Fix next button string for Step 2 preflight 2023-03-28 10:30:56 -05:00
snipe
03aadc4abf Merge remote-tracking branch 'origin/develop' 2023-03-28 07:20:22 -07:00
snipe
09674c012c Use named route with params
Signed-off-by: snipe <snipe@snipe.net>
2023-03-28 07:18:45 -07:00
snipe
d2daaf30eb Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
2023-03-28 03:32:04 -07:00
Joe Ferguson
cd49f65c0b
User preflight fix translation strings w/ bad path 2023-03-24 15:27:08 -05:00
snipe
dcbd216e2c Merge remote-tracking branch 'origin/develop' 2023-03-24 08:29:22 -07:00
snipe
697cb4fe6d Fixed translation string for importer
Signed-off-by: snipe <snipe@snipe.net>
2023-03-24 08:27:53 -07:00
snipe
8a395d63a1 Merge remote-tracking branch 'origin/develop' 2023-03-24 07:23:06 -07:00
snipe
16dcc2d3ed Fixed #12641 - add JSON to mimes
Signed-off-by: snipe <snipe@snipe.net>
2023-03-24 06:57:43 -07:00
snipe
43c286c61f Merge remote-tracking branch 'origin/develop' 2023-03-24 06:18:10 -07:00
snipe
13ad69ee75
Merge pull request #12713 from inietov/fixes/trying_access_array_offset_null
Fixed Trying to access array offset on value of type null [sc-20528]
2023-03-24 04:52:56 -07:00
snipe
b91e914a61 Merge remote-tracking branch 'origin/develop' 2023-03-23 10:55:58 -07:00