snipe
|
a49257ad4b
|
Wrong eval
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 13:16:59 -07:00 |
|
snipe
|
c6eef86661
|
Fixed multiselect for companies
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 13:15:22 -07:00 |
|
snipe
|
23e3d18931
|
Used brackets for multiselect company
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 12:35:30 -07:00 |
|
snipe
|
9f39d71f16
|
Merge pull request #12831 from Godmartinz/adds_multi_select_to_custom_report
Added Multiselect of companies for custom reports
|
2023-05-10 11:36:21 -07:00 |
|
snipe
|
b8a59cc2d8
|
Merge branch 'master' into develop
|
2023-05-10 09:32:26 -07:00 |
|
akemidx
|
537aa04c9a
|
Merge branch 'develop' into delete_asset_from_view_page
|
2023-05-10 09:30:54 -04:00 |
|
snipe
|
27e0484072
|
I lied. Missed one
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 03:12:22 -07:00 |
|
snipe
|
ec76de607b
|
Final google login tweaks
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 03:08:29 -07:00 |
|
snipe
|
14da8934c5
|
Few more login page tweaks
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 02:53:11 -07:00 |
|
snipe
|
ed370a0104
|
Added translations
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 02:47:28 -07:00 |
|
snipe
|
f3c977aa9d
|
Nicer button
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 02:37:01 -07:00 |
|
snipe
|
788c03ef57
|
Hide client secret if app is locked
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 02:22:49 -07:00 |
|
snipe
|
1ef4ea6381
|
Very ugly login shim just to test functionality
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 01:14:31 -07:00 |
|
snipe
|
37bc47290c
|
Disabled fields in demo mode
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 01:12:55 -07:00 |
|
snipe
|
4da40792ea
|
Use google logo
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 01:08:28 -07:00 |
|
snipe
|
f57e39191d
|
Added google settings blade
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 00:55:16 -07:00 |
|
snipe
|
6ab214d3a6
|
Added google option to settings index
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 00:55:04 -07:00 |
|
snipe
|
bc9b47c46d
|
Removed env dependency, switched to DB
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 00:27:47 -07:00 |
|
snipe
|
c52b48c383
|
Google oauth login
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 00:14:28 -07:00 |
|
snipe
|
11cd875c6d
|
Merge remote-tracking branch 'origin/develop'
|
2023-05-09 22:42:45 -07:00 |
|
snipe
|
0680405f4d
|
Tightened up some layout issues, checkbox issues in LDAP settings
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-09 22:34:46 -07:00 |
|
snipe
|
cbe70c9cc1
|
Merge remote-tracking branch 'origin/develop'
|
2023-05-09 20:14:44 -07:00 |
|
snipe
|
6a7bab453f
|
Made spacing more compact
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-09 20:14:00 -07:00 |
|
snipe
|
7412bc32e2
|
Merge pull request #12991 from snipe/fixes/accessories_view
Fixed width of columns in details
|
2023-05-09 20:11:36 -07:00 |
|
snipe
|
ec4697fd3e
|
Merge remote-tracking branch 'origin/develop'
|
2023-05-09 19:45:10 -07:00 |
|
snipe
|
999dc3c358
|
Added icon field back into assets page
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-09 19:43:37 -07:00 |
|
snipe
|
a10652797f
|
Fixed width of columns in details
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-09 19:42:32 -07:00 |
|
snipe
|
a43dea3c04
|
Merge remote-tracking branch 'origin/develop'
|
2023-05-09 16:29:53 -07:00 |
|
snipe
|
2d5da67b1e
|
Merge pull request #12982 from akemidx/feature/sc-23214
Buttons on the Accessory View Page
|
2023-05-09 14:26:28 -07:00 |
|
slong753
|
1d2596fc54
|
wip
|
2023-05-09 14:58:59 -05:00 |
|
snipe
|
7dd41aa574
|
Removed whitespace
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-08 15:49:12 -07:00 |
|
snipe
|
c4d40cdbd4
|
Merge remote-tracking branch 'origin/develop'
|
2023-05-08 15:11:25 -07:00 |
|
snipe
|
277618bf16
|
Added maxlenth to form fields
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-08 14:13:24 -07:00 |
|
snipe
|
6cb6beb6c7
|
Merge remote-tracking branch 'origin/develop'
|
2023-05-08 13:21:43 -07:00 |
|
snipe
|
d70e14de61
|
Merge pull request #12972 from marcusmoore/bug/sc-23177
Fixes user name missing in accessory acceptance notifications
|
2023-05-08 13:04:37 -07:00 |
|
snipe
|
a73205f228
|
Merge remote-tracking branch 'origin/develop'
|
2023-05-08 11:24:03 -07:00 |
|
snipe
|
223ff5e97e
|
Fixed misplaced div when saml is disabled
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-08 11:20:26 -07:00 |
|
snipe
|
3d345d15ac
|
Merge remote-tracking branch 'origin/develop'
|
2023-05-04 11:01:15 -07:00 |
|
snipe
|
60515f1262
|
Show signature column regardless of “require sig” state
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-04 10:56:35 -07:00 |
|
Marcus Moore
|
9efe13bb5e
|
Capitalize "declined" in acceptance in notification
|
2023-05-03 17:03:22 -07:00 |
|
snipe
|
5950ec27ab
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/mix-manifest.json
|
2023-05-03 13:49:36 -07:00 |
|
akemidx
|
526c089424
|
Buttons on the accessory view page
|
2023-05-03 16:40:06 -04:00 |
|
akemidx
|
67105528d1
|
Buttons on the accessory view page
|
2023-05-03 16:31:56 -04:00 |
|
akemidx
|
12f0c42545
|
buttons added
|
2023-05-03 16:31:56 -04:00 |
|
slong753
|
815c77f943
|
wip
|
2023-05-03 14:49:31 -05:00 |
|
snipe
|
fe710efb40
|
Merge pull request #12874 from Godmartinz/feature/sc-23130
Adds a checkout range for custom asset reports
|
2023-05-03 11:43:44 -07:00 |
|
snipe
|
b716f9f55e
|
Merge pull request #12916 from snipe/features/auto_add_to_fieldset
Added ability to auto-add fields to new fieldsets
|
2023-05-03 11:04:33 -07:00 |
|
snipe
|
4a643c1252
|
Merge pull request #12880 from Godmartinz/asset_total_cost
Added component costs to asset view
|
2023-05-03 10:49:03 -07:00 |
|
snipe
|
466c2fd47c
|
Merge pull request #12966 from Godmartinz/bug/sc-23161
fixed color differences in dark themes
|
2023-05-03 10:38:54 -07:00 |
|
Godfrey M
|
7711938f4b
|
fixes dark yellow
|
2023-05-01 16:27:21 -07:00 |
|