snipe
|
ad8a2387f0
|
Updated help text to be more clear
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-11 12:38:37 -07:00 |
|
|
snipe
|
70c766e8b3
|
Added setting to choose dashboard type
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-29 04:16:46 -07:00 |
|
Godfrey M
|
2994c3613a
|
adds clearfix to settings page
|
2022-08-22 10:46:15 -07:00 |
|
Brad Coudriet
|
77a1fcb1fc
|
There was actually a missing p tag too
|
2022-08-09 06:36:53 -04:00 |
|
|
Brad Coudriet
|
0cf0598936
|
Added a closing div tag around the mail text help block, this was causing labels further down the page to be formatted in correctly
|
2022-08-09 06:32:03 -04:00 |
|
|
snipe
|
75d19d815d
|
Still show the purge button even if not allowed to avoid confusion
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-24 15:59:40 -07:00 |
|
|
snipe
|
fce4f0dc0e
|
Disable delete button if not allowed
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-24 15:49:07 -07:00 |
|
|
snipe
|
77bf28bcb6
|
Disallow purge
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-23 20:11:43 -07:00 |
|
|
snipe
|
ce2362459c
|
Layout tweak for search and back placement
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-23 19:30:52 -07:00 |
|
|
snipe
|
4e568bec8a
|
Moves the settings search box higher
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-23 19:25:30 -07:00 |
|
|
snipe
|
35365882ac
|
Used new settings_button class in settings index
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-23 18:10:28 -07:00 |
|
|
snipe
|
8f5ac5fb55
|
Removed quotes around filter query
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-03 13:01:53 -07:00 |
|
|
snipe
|
1c4864a3cc
|
Added explicit “Example:” text in placeholders
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-03 11:25:18 -07:00 |
|
|
snipe
|
4078e4e323
|
Added spinner onClick for file upload button on backups
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-18 02:40:32 -07:00 |
|
Brady Wetherington
|
213d990e47
|
We inadvertently used the wrong label for one of the headers on the backups page
|
2022-05-16 17:00:22 -07:00 |
|
|
snipe
|
ed8e82a606
|
Removed sr-only class for now - not sure why it’s interfering with the submit button JS
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-14 11:02:02 -07:00 |
|
|
Godfrey M
|
4956eb0410
|
WIP: needs to be tested. adds ldap_manager field to ldap sync
|
2022-03-21 11:15:39 -07:00 |
|
|
snipe
|
43c57c8461
|
Merge master into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Http/Controllers/BulkAssetModelsController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/ModalController.php
# app/Http/Transformers/GroupsTransformer.php
# config/version.php
# package-lock.json
# 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/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/assets/less/overrides.less
# resources/lang/en/admin/hardware/message.php
# resources/lang/en/admin/settings/general.php
# resources/views/partials/bootstrap-table.blade.php
# routes/web.php
|
2022-01-12 20:51:33 -08:00 |
|
Alex Janes
|
edef640d35
|
Merge branch 'develop' into features/lock_logins_to_saml
|
2022-01-11 09:05:14 -05:00 |
|
|
snipe
|
d9624b59b4
|
Merge pull request #10264 from nuraeil/added-localized-strings
Added #10242: Improved localized strings
|
2022-01-10 14:48:52 -08:00 |
|
|
snipe
|
b98c97b00e
|
Merge pull request #10265 from uberbrady/remove_old_ldap
Remove old ldap
|
2022-01-10 14:34:34 -08:00 |
|
Nuraeil
|
5bb2f6fa0f
|
Merge branch 'develop' into added-localized-strings
|
2022-01-09 17:40:54 +01:00 |
|
|
snipe
|
0f5bb0e65d
|
Localize bakcup restore strings
Signed-off-by: snipe <snipe@snipe.net>
|
2022-01-07 16:50:19 -08:00 |
|
Wächtler, Yannick
|
04d649122b
|
Fixed duplication for a couple of items, removed TODO markers, added lots of translation strings where there was a TODO
|
2022-01-06 12:35:37 +01:00 |
|
|
Brady Wetherington
|
3c7f2e89ec
|
Merge branch 'develop' into remove_old_ldap
Had to re-do the composer install because the conflicts were too complicated.
|
2022-01-03 12:56:58 -08:00 |
|
Alex Janes
|
5fe2083688
|
Adjusted the phrasing around auto-incrementing asset tags.
|
2021-12-31 16:33:30 -05:00 |
|
|
Alex Janes
|
ead142cdf7
|
Corrected a tiny HTML typo in the SAML view. (Unrelated to this PR)
|
2021-12-18 12:00:07 -05:00 |
|
|
Wächtler, Yannick
|
2901525194
|
Merge branch 'snipe-develop' into added-localized-strings
|
2021-12-17 00:22:08 +01:00 |
|
|
snipe
|
398180dc59
|
Small merge unmagling
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-16 14:38:04 -08:00 |
|
|
snipe
|
c3d55ee27e
|
Merge master down into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .all-contributorsrc
# README.md
# app/Exceptions/Handler.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/CustomFieldsController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Models/Setting.php
# config/version.php
# resources/lang/af/button.php
# resources/lang/ar/button.php
# resources/lang/bg/button.php
# resources/lang/cs/button.php
# resources/lang/cy/button.php
# resources/lang/da/button.php
# resources/lang/de/button.php
# resources/lang/el/button.php
# resources/lang/en-GB/button.php
# resources/lang/en-ID/button.php
# resources/lang/es-CO/admin/groups/message.php
# resources/lang/es-MX/button.php
# resources/lang/et/admin/custom_fields/general.php
# resources/lang/et/admin/hardware/table.php
# resources/lang/et/admin/kits/general.php
# resources/lang/et/admin/manufacturers/message.php
# resources/lang/et/admin/models/general.php
# resources/lang/et/admin/settings/general.php
# resources/lang/et/button.php
# resources/lang/et/mail.php
# resources/lang/fa/button.php
# resources/lang/fa/help.php
# resources/lang/fi/button.php
# resources/lang/fil/button.php
# resources/lang/fr/button.php
# resources/lang/ga-IE/button.php
# resources/lang/he/button.php
# resources/lang/hr/button.php
# resources/lang/hu/admin/settings/general.php
# resources/lang/hu/auth/message.php
# resources/lang/hu/button.php
# resources/lang/hu/mail.php
# resources/lang/id/admin/hardware/table.php
# resources/lang/id/button.php
# resources/lang/it/button.php
# resources/lang/iu/button.php
# resources/lang/ja/button.php
# resources/lang/ko/button.php
# resources/lang/lt/button.php
# resources/lang/lv/button.php
# resources/lang/mi/button.php
# resources/lang/mk/button.php
# resources/lang/ml-IN/button.php
# resources/lang/mn/button.php
# resources/lang/ms/admin/hardware/table.php
# resources/lang/ms/admin/kits/general.php
# resources/lang/ms/admin/models/general.php
# resources/lang/ms/admin/models/message.php
# resources/lang/ms/admin/settings/general.php
# resources/lang/ms/button.php
# resources/lang/nl/button.php
# resources/lang/no/admin/hardware/table.php
# resources/lang/no/admin/kits/general.php
# resources/lang/no/admin/settings/general.php
# resources/lang/no/auth/message.php
# resources/lang/no/button.php
# resources/lang/no/help.php
# resources/lang/no/mail.php
# resources/lang/pl/button.php
# resources/lang/pt-BR/button.php
# resources/lang/pt-PT/auth/message.php
# resources/lang/pt-PT/button.php
# resources/lang/pt-PT/mail.php
# resources/lang/ro/button.php
# resources/lang/ru/admin/settings/general.php
# resources/lang/ru/button.php
# resources/lang/ru/help.php
# resources/lang/sl/admin/custom_fields/general.php
# resources/lang/sl/admin/hardware/table.php
# resources/lang/sl/admin/kits/general.php
# resources/lang/sl/admin/manufacturers/message.php
# resources/lang/sl/admin/models/general.php
# resources/lang/sl/admin/settings/general.php
# resources/lang/sl/admin/users/general.php
# resources/lang/sl/auth/message.php
# resources/lang/sl/button.php
# resources/lang/sl/help.php
# resources/lang/sr-CS/button.php
# resources/lang/ta/button.php
# resources/lang/th/button.php
# resources/lang/th/mail.php
# resources/lang/tl/button.php
# resources/lang/tr/admin/settings/general.php
# resources/lang/tr/auth/message.php
# resources/lang/tr/button.php
# resources/lang/uk/button.php
# resources/lang/ur-PK/button.php
# resources/lang/vi/button.php
# resources/lang/zh-CN/button.php
# resources/lang/zh-HK/button.php
# resources/lang/zh-TW/admin/hardware/table.php
# resources/lang/zh-TW/button.php
# resources/lang/zu/button.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/slack.blade.php
|
2021-12-16 14:26:24 -08:00 |
|
|
Wächtler, Yannick
|
484b996879
|
fixed merge conflicts
|
2021-12-14 19:48:59 +01:00 |
|
|
snipe
|
ff97b359ad
|
Removed form request on ajax, cleaned up some other things
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-08 17:58:46 -08:00 |
|
|
snipe
|
cde2bad297
|
Small mods to slack jquery
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-08 15:56:05 -08:00 |
|
|
snipe
|
ebdbc20740
|
Adds stricter validation for slack endpoints
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-06 11:40:24 -08:00 |
|
|
Wächtler, Yannick
|
9164daf5bc
|
Added localized strings for admin/settings
|
2021-11-19 15:23:48 +01:00 |
|
|
snipe
|
65d1855b38
|
Display app_locked message on front-end
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-15 19:50:55 -08:00 |
|
|
snipe
|
bc21875324
|
More refinements to the UI
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-10 18:15:38 -08:00 |
|
|
snipe
|
1a703bf78b
|
Added logout clarification
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-10 17:59:52 -08:00 |
|
|
snipe
|
494c72d92b
|
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-10 17:58:04 -08:00 |
|
|
snipe
|
69fe3c0299
|
Added some comments on the JS
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-10 17:57:15 -08:00 |
|
|
snipe
|
e2702186a9
|
Slightly reworked UI
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-10 17:48:59 -08:00 |
|
|
snipe
|
b069eec43a
|
Fixed upload disabled button
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-10 16:01:22 -08:00 |
|
|
snipe
|
f8cf65bbb3
|
Small layout fixes
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-10 13:01:02 -08:00 |
|
|
snipe
|
230a568145
|
Added help text and more info in the modal
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-10 01:44:11 -08:00 |
|
|
snipe
|
856b9294f8
|
Improved BS tables on backups
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-10 00:08:43 -08:00 |
|
|
Brady Wetherington
|
a58c5ce27f
|
Better documentation, disable AdLdap2-based "Add domain" setting
|
2021-11-08 17:11:47 -08:00 |
|
|
snipe
|
61f16f47a2
|
Use Helper alias
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-28 19:44:55 -07:00 |
|
|
snipe
|
7e41c74cc3
|
Updated more fa icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-26 01:11:08 -07:00 |
|
|
snipe
|
299ad681f7
|
More fa icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 07:21:30 -07:00 |
|
|
snipe
|
dbe93d91cd
|
Updated fontawesome icons
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-24 06:07:46 -07:00 |
|