Cram42
f5fac50e91
Add preview pane
2022-11-02 19:31:34 +08:00
Cram42
6de48b4dc8
Implement settings for labels
2022-11-01 20:00:53 +08:00
Godfrey M
f9ac447dd1
adds default group to LDAP
2022-10-18 15:18:09 -07:00
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
9b448227f7
tinkering to no avail
2022-09-13 11:40:10 -07:00
Godfrey M
193b31e427
select options working, testing sync then done
2022-08-31 12:58:33 -07:00
Godfrey M
70ac8af9c4
.
2022-08-31 09:53:20 -07:00
Godfrey M
0c362e8b57
gets the groups selector to appear but options are blank
2022-08-29 12:09:56 -07:00
Godfrey M
fc6fefdb4e
adds migration, variables, checkbox,working on groups
2022-08-25 15:19:38 -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
Brady Wetherington
4d4badf830
Got the client-side LDAP setup working well enough for sync!
2021-08-17 14:43:36 -07:00
Brady Wetherington
0ec2884c29
The custom settings section of SAML sometimes has bad linefeeds
2021-07-08 17:00:01 -07:00
snipe
3f09d17389
Fixed typo “synchronization”
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-25 18:45:06 -07:00
snipe
9aac3ae628
Fixed HTML causing two backup headers to appear
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-07 16:36:07 -07:00
snipe
1d43eda21f
Features: improved UI for importer ( #9467 )
...
* Small UI improvements for importer
Signed-off-by: snipe <snipe@snipe.net>
* And UI backup improvements
Signed-off-by: snipe <snipe@snipe.net>
2021-04-21 20:16:17 -07:00
snipe
e1c6d4ced7
Merge branch 'develop' of https://github.com/Skywalker-11/snipe-it into Skywalker-11-develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Requests/SettingsSamlRequest.php
2021-04-14 15:15:07 -07:00
Godfrey Martinez
246cc0eaa8
Feature/ch16172/adding other fields to ldap sync settings ( #9416 )
...
* new branch, added manager as an additional field. Currently having DB issues
* WIP DB Issue with eloquent
* added department to LDAP sync
* removed unused variables
2021-04-14 10:17:57 -07:00
Godfrey Martinez
5ea759f615
Fixed #7211 , #9197 , #7864 , [ch15504] - Added additional LDAP fields to sync ( #9318 )
...
* LDAP and Active Directory has plenty of other [ch15504]
* removed department id from ldap sync
* removed department id from ldap sync
* Update 2021_03_18_184102_adds_several_ldap_fields.php
2021-04-05 19:26:04 -07:00
snipe
70a7a8f20b
WTF. This shit is haunted.
...
Signed-off-by: snipe <snipe@snipe.net>
2021-03-30 08:00:27 -07:00
NMC
3e934a1b96
Add a way for a user to override the site skin setting + fix mislabeled comment. ( #6891 )
...
* Add a way for a user to override the skin setting.
* Add site setting to allow user to change the skin.
* Fix skin list.
Co-authored-by: NMC <info@nmc-lab.com>
2021-03-29 19:09:23 -07:00
Eli Young
97fa9663b1
Fixed #9299 : Use correct SVG MIME type for uploads ( #9300 )
...
The correct MIME type of SVG is image/svg+xml. Out of an abundance of
caution, I am leaving in image/svg to avoid potentially causing issues
on very old browsers, but this can likely be removed without issue.
2021-03-15 16:42:11 -07:00
Evgeny
bbf7fbcff4
Localization digit separator feature. ( #8915 )
...
Provides an ability to localize the purchase_cost field in front-end hardware index table.
Has two digit separator formats in admin settings with comma and dot.
2020-12-15 11:49:13 -08:00
johnson-yi
0cdd83aabf
Fixes #8584 , #8654 , #8727 - fixes and improvements for saml ( #8795 )
...
* Let onelogin/php-saml know to use 'X-Forwarded-*' headers if it is from a trusted proxy
* Gracefully handle the case where openssl_csr_new fails when openssl.cnf is invalid/missing
* Improve ui of saml sp metadata by displaying it's url and a download button
2020-11-20 18:54:25 -08:00
Brady Wetherington
a97b15ec96
Re-add LDAP "test login" feature to LDAP settings (helps with #8751 ) ( #8757 )
...
* Start work on re-adding back the "Test LDAP logins" feature to develop
* Add back-end method to allow LDAP test users to try to log in.
2020-11-16 21:23:08 -08:00
snipe
0c0de5e351
Added clarity in language as to what the activated flag does on LDAP screens
2020-11-13 11:52:34 -08:00
snipe
7765c87387
Fixed #8669 - Allow application/xml in SAML upload in Safari
2020-11-12 18:47:19 -08:00
snipe
6a2e21f502
More in depth error reporting on mail test failure
2020-11-12 13:22:49 -08:00
snipe
fd7c0bc5fb
Use newer blade facade for requests
2020-11-10 08:36:18 -08:00
snipe
a55694da2f
Added validation to disallow password to be the same as username, email, etc
2020-11-02 20:03:26 -08:00
snipe
33bda9b6d1
Added blade option for same_pwd_as_user_fields
...
Disallows password form value to be the same as username, email, first name or last name
2020-11-02 17:47:25 -08:00
snipe
f357d9fc90
Include audit settings text in settings overview so they get picked up by the filter box
2020-10-23 18:13:28 -07:00
Bennett Blodinger
132f296f03
Fix typo
2020-10-20 08:13:52 -05:00
snipe
b49c5dbf06
Clarified language
2020-10-05 20:43:28 -07:00
snipe
6234c6e5fc
Fixed typo
2020-10-05 20:35:27 -07:00
snipe
0cd19c87bf
Added utility to delete barcode cache from labels/barcodes setting
2020-10-05 20:34:17 -07:00
snipe
dafac4ceb3
Disable ldap_enabled on demo, fixed some incorrect error messages
2020-09-25 19:04:38 -07:00
snipe
98246de4c7
Disable SAML on the demo
2020-09-24 19:25:28 -07:00
Brady Wetherington
0e823a962b
Fix for #8424 - where the ldap_server setting was grayed out
2020-09-17 13:32:14 -07:00
snipe
002ca52c83
Standardize feature disabled messages in UI
2020-09-16 15:09:58 -07:00
Brady Wetherington
8331be05aa
Some fancy JS to enable/disable Slack-test based on field values
2020-09-16 13:15:39 -07:00
snipe
e8dfb71682
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop
...
# Conflicts:
# resources/views/settings/slack.blade.php
2020-09-16 12:40:23 -07:00
snipe
7de685a1c1
Added demo disabled text on slack screen
2020-09-16 12:36:33 -07:00
snipe
30f8431bfb
Added required field indicator
2020-09-16 12:29:20 -07:00
snipe
74b96a7413
UI tweaks and updated JS to disable the save button if the settings are not correct
2020-09-15 23:14:10 -07:00
snipe
4fd5358aa8
Changed login attempts icon so it’s not the same as SAML
2020-09-15 20:27:01 -07:00
snipe
e8befe9afd
Increased favicon filesize max
2020-09-15 20:07:29 -07:00
snipe
303388e1f5
Added a space between favicon help text blocks
2020-09-15 19:50:15 -07:00
snipe
912401a0a0
Change warning icon to padlock icon
2020-09-12 12:07:56 -07:00
snipe
ec5daa387b
Better explanation for demo mode
2020-09-12 10:04:57 -07:00
snipe
e1cc003cec
Fixed backup urls for download
2020-08-28 18:22:37 -07:00
Michael Pietsch
4f5374b2e8
enable use custom file based saml certificate/private key
2020-08-14 12:25:00 +02:00
snipe
4e0a9c7a94
Fart fix
...
I just…. don’t ask.
2020-08-03 12:35:34 -07:00
Johnson Yi
572185ac96
Revised how saml sp info is displayed
2020-05-09 09:44:51 +10:00
Johnson Yi
b2930d6069
Added #542 : add saml authentication
2020-05-06 00:06:19 +10:00
snipe
412caebf69
Fixed logo uploads
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-27 23:22:52 -07:00
snipe
44962d1eb9
Switched to use Primary button
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-23 22:44:48 -07:00
snipe
b01e8720dc
Fixed ldap settings JS error
...
Signed-off-by: snipe <snipe@snipe.net>
2020-04-23 14:41:20 -07:00
snipe
e786ef8290
Pull branding back to develop normal
2020-04-21 10:42:37 -07:00
snipe
be446eedb0
Updated html styles on settings index
2020-04-21 06:29:08 -07:00
snipe
cb71bcc4af
Switch to old() helper
2020-04-21 03:58:31 -07:00
snipe
87464e6ec0
Merge branch 'develop' into integrations/2020-04-15-v5-merge
...
# Conflicts:
# README.md
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/ComponentsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Controllers/UsersController.php
# app/Http/Requests/AssetRequest.php
# app/Http/Requests/ImageUploadRequest.php
# app/Models/LicenseSeat.php
# app/Models/Location.php
# app/Models/Setting.php
# composer.json
# composer.lock
# config/database.php
# config/version.php
# npm-shrinkwrap.json
# package.json
# public/css/AdminLTE.css
# public/css/AdminLTE.css.map
# public/css/overrides.css
# public/css/overrides.css.map
# public/css/skins/skin-blue-light.css
# public/css/skins/skin-blue.css
# public/css/skins/skin-green-dark.min.css
# public/js/app.js
# public/js/bootstrap-table.js
# public/js/bootstrap/js/bootstrap.js
# public/js/bootstrap/js/bootstrap.min.js
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/demo.js
# public/js/ekko-lightbox.js
# public/js/ekko-lightbox.min.js
# public/js/extensions/export/bootstrap-table-export.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js
# public/js/extensions/toolbar/bootstrap-table-toolbar.min.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# public/js/plugins/timepicker/bootstrap-timepicker.js
# public/js/plugins/timepicker/bootstrap-timepicker.min.js
# public/js/vue.js
# public/mix-manifest.json
# resources/assets/js/bootstrap-js.js
# resources/assets/js/bootstrap.min.js
# resources/assets/js/ekko-lightbox.js
# resources/assets/js/ekko-lightbox.min.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# resources/assets/js/plugins/chartjs/Chart.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js
# resources/assets/less/AdminLTE.less
# resources/assets/less/overrides.less
# resources/assets/less/skins/_all-skins.less
# resources/assets/less/skins/skin-black.less
# resources/assets/less/skins/skin-blue.less
# resources/assets/less/skins/skin-green.less
# resources/assets/less/skins/skin-purple.less
# resources/assets/less/skins/skin-red.less
# resources/assets/less/skins/skin-yellow.less
# resources/assets/less/variables.less
# resources/js/components/importer/importer-file.vue
# resources/lang/en/auth/message.php
# resources/lang/en/passwords.php
# resources/lang/es-CO/general.php
# resources/lang/es-ES/general.php
# resources/lang/es-VE/general.php
# resources/less/skins/skin-black-dark.less
# resources/less/skins/skin-blue-dark.less
# resources/less/skins/skin-contrast.less
# resources/less/skins/skin-green-dark.less
# resources/less/skins/skin-orange-dark.less
# resources/less/skins/skin-orange.less
# resources/less/skins/skin-purple-dark.less
# resources/less/skins/skin-red-dark.less
# resources/less/skins/skin-yellow-dark.less
# resources/views/accessories/checkin.blade.php
# resources/views/accessories/checkout.blade.php
# resources/views/accessories/edit.blade.php
# resources/views/account/profile.blade.php
# resources/views/account/view-assets.blade.php
# resources/views/asset_maintenances/edit.blade.php
# resources/views/auth/passwords/email.blade.php
# resources/views/auth/passwords/reset.blade.php
# resources/views/categories/edit.blade.php
# resources/views/companies/edit.blade.php
# resources/views/components/checkin.blade.php
# resources/views/components/checkout.blade.php
# resources/views/components/edit.blade.php
# resources/views/consumables/checkout.blade.php
# resources/views/consumables/edit.blade.php
# resources/views/custom_fields/fields/edit.blade.php
# resources/views/custom_fields/fieldsets/edit.blade.php
# resources/views/dashboard.blade.php
# resources/views/departments/edit.blade.php
# resources/views/groups/edit.blade.php
# resources/views/hardware/audit.blade.php
# resources/views/hardware/bulk-checkout.blade.php
# resources/views/hardware/bulk.blade.php
# resources/views/hardware/checkin.blade.php
# resources/views/hardware/checkout.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/index.blade.php
# resources/views/hardware/quickscan.blade.php
# resources/views/hardware/view.blade.php
# resources/views/importer/import.blade.php
# resources/views/layouts/basic.blade.php
# resources/views/layouts/default.blade.php
# resources/views/layouts/edit-form.blade.php
# resources/views/licenses/checkin.blade.php
# resources/views/licenses/checkout.blade.php
# resources/views/licenses/edit.blade.php
# resources/views/locations/edit.blade.php
# resources/views/manufacturers/edit.blade.php
# resources/views/modals/upload-file.blade.php
# resources/views/models/bulk-edit.blade.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/models/edit.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/address.blade.php
# resources/views/partials/forms/edit/asset-select.blade.php
# resources/views/partials/forms/edit/category-select.blade.php
# resources/views/partials/forms/edit/category.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# resources/views/partials/forms/edit/company.blade.php
# resources/views/partials/forms/edit/department-select.blade.php
# resources/views/partials/forms/edit/depreciation.blade.php
# resources/views/partials/forms/edit/email.blade.php
# resources/views/partials/forms/edit/image-upload.blade.php
# resources/views/partials/forms/edit/item_number.blade.php
# resources/views/partials/forms/edit/location-profile-select.blade.php
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/location.blade.php
# resources/views/partials/forms/edit/maintenance_type.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/manufacturer.blade.php
# resources/views/partials/forms/edit/minimum_quantity.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/model_number.blade.php
# resources/views/partials/forms/edit/name.blade.php
# resources/views/partials/forms/edit/notes.blade.php
# resources/views/partials/forms/edit/order_number.blade.php
# resources/views/partials/forms/edit/phone.blade.php
# resources/views/partials/forms/edit/purchase_cost.blade.php
# resources/views/partials/forms/edit/purchase_date.blade.php
# resources/views/partials/forms/edit/quantity.blade.php
# resources/views/partials/forms/edit/serial.blade.php
# resources/views/partials/forms/edit/status.blade.php
# resources/views/partials/forms/edit/submit.blade.php
# resources/views/partials/forms/edit/supplier-select.blade.php
# resources/views/partials/forms/edit/supplier.blade.php
# resources/views/partials/forms/edit/user-select.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/alerts.blade.php
# resources/views/settings/asset_tags.blade.php
# resources/views/settings/barcodes.blade.php
# resources/views/settings/branding.blade.php
# resources/views/settings/general.blade.php
# resources/views/settings/labels.blade.php
# resources/views/settings/ldap.blade.php
# resources/views/settings/localization.blade.php
# resources/views/settings/security.blade.php
# resources/views/setup/user.blade.php
# resources/views/suppliers/edit.blade.php
# resources/views/users/bulk-edit.blade.php
# resources/views/users/edit.blade.php
# resources/views/users/ldap.blade.php
# resources/views/users/print.blade.php
# resources/views/users/view.blade.php
# routes/api.php
# routes/web/hardware.php
# webpack.mix.js
2020-04-20 23:20:34 -07:00
snipe
320d660e83
Updated chartjs
2020-04-06 21:17:26 -07:00
snipe
fb903b2fda
Added comments, better indenting
2020-04-06 21:05:42 -07:00
snipe
7bf398aca4
More settings filter fixes
2020-04-06 20:47:05 -07:00
snipe
f6bb655383
Prevent form submission
2020-04-06 20:17:44 -07:00
snipe
19f71face9
Added filtering to settings page
2020-04-06 20:11:13 -07:00
snipe
bdddab5b8b
Added role=“option” to option items, additional icon font fixes
2020-04-02 18:17:21 -07:00
snipe
2d2cd68061
Switched to h2 from h4
2020-04-01 03:51:08 -07:00
snipe
fd642e95eb
Hide success icons from screen readers
2020-04-01 03:25:07 -07:00
snipe
9ab3370be5
Hide icons in error messages
2020-04-01 03:21:15 -07:00
snipe
c3d2e8ff26
Added aria-hidden to inline form error text
2020-04-01 00:18:20 -07:00
snipe
c6c75cc11f
Fixed missing </h3 tags
2020-03-31 23:36:56 -07:00
snipe
bf6a0f8d2f
Added aria-hidden
2020-03-31 22:50:38 -07:00
snipe
bde45cbb34
Fixed h3 to h2 for semantic header levels
2020-03-31 21:30:24 -07:00
snipe
c71dd9b68a
Added sr-only text
2020-03-31 17:29:06 -07:00
snipe
2a813244a2
Wrapped text in h5s, added aria hidden to icons
2020-03-27 21:45:27 -07:00
Fabian Grutschus
5becb93e6c
Added: allow appending of domain name to username when user tries to login ( #7790 )
2020-02-04 12:47:49 -08:00
snipe
b5db0b22f8
Switched to Request facade
...
I don’t know why my greps keep missing this shit.
2019-12-10 19:47:54 -08:00
snipe
296de34e8a
WIP: Upgrade develop to Laravel 6.6.1 ( #7637 )
...
I'm going ahead and merging this, since the upgrade doesn't break Flysystem any worse than the current develop is broken, so far as I can tell.
* Upgraded framework to Laravel 6
### TO DO:
- Fix password restriction rules- the old library isn’t compatible with Laravel 6 :(
- Figure out why in-app API calls are returning “Unauthorized”
* More updates from Input:: to Request:: helper
* Switch to Request:: from Input
* Added passport config
* Fixed goofy password minimum in seeder
* Added laravel/helpers
* Changed ($item) to ($item->id) in forms
I have no idea why this is necessary
* Changed ($item) to ($item->id) in forms
* Updated API middleware to auth:api
* Updated with added laravel auth.php values
* FIxed *&!^$%^&$^%!!!! ajax issue
* Switch to Request::get from Input::get
* Switched to Request facade
* Added password security minimums back in
The package we were using has not been updated to Laravel v6, so I created custom validators instead
* Added language strings for error messages for password rules
* Fixed `($item)` issue in formActions for partials
2019-12-10 19:32:50 -08:00
Valentyn Tulub
6ad1f51673
Added #6489 : show asset assignments under user assignments ( #7293 )
...
* Add a setting to show assets assigned to other assets #6489
* Update user's views to show assets assigned to other assets #6489
* Add ukrainian and russian translation for the feature #6489 in settings
2019-12-06 10:57:48 -08:00
Martin Berg
3dcef9aac9
Add support for custom remote user header ( #7370 )
2019-09-03 11:07:26 -07:00
snipe
ded1a59914
Removed help text for email images (since we embed them by default now)
...
Added help text for username format
2019-04-02 18:22:31 -07:00
snipe
37b8029d04
Fixed parse error on label settings
...
Also fixed [ch1362] - moving left/right
2019-04-02 18:04:31 -07:00
snipe
bca82684a1
Merge branch 'hotfixes/2fa_qr' into develop
...
# Conflicts:
# .all-contributorsrc
# Dockerfile
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/ImportController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/ImportsController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Requests/ItemImportRequest.php
# app/Http/Transformers/ActionlogsTransformer.php
# composer.json
# composer.lock
# config/app.php
# config/version.php
# docker/startup.sh
# public/css/build/all.css
# public/css/dist/all.css
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
2019-03-20 02:17:02 -07:00
Tim Farmer
5893e25b43
Label bugs in alerts settings ( #6808 )
...
* Label bugs in alerts settings
Found another label bug where the alert_email label should be alerts_enabled.
* Update alerts.blade.php
2019-03-14 10:53:05 -07:00
snipe
55f727ef28
Fixed HTML labels on alerts setting page
...
Originally https://github.com/snipe/snipe-it/pull/6808/ by @timothyfarmer - I also updated the error class logic in the same block
2019-03-13 19:53:23 -07:00
snipe
6c71e72dcd
Fixed labels labels (wha?)
...
Wrong HTML labels for some fields in the Settings > Labels page.
Originally https://github.com/snipe/snipe-it/pull/6809 by @timothyfarmer but it was made against the wrong branch
2019-03-13 19:50:35 -07:00
Tim Farmer
7deab0f53b
Label bugs in general settings ( #6801 )
...
* checkbox label bug
The checkbox label in general settings for require_accept_signature was set to full_multiple_companies_support instead so when you click the label for require accept signature it would check the wrong box.
* Update general.blade.php
* Update general.blade.php
Another label that is wrong in general settings
2019-03-08 12:24:24 -08:00
Steffen
e1907e30b1
Allow multiple upload fields and add logo option to labels ( #6736 )
...
* Change upload js to work with multiple upload elements on a single page
* Change uploadFile in upload modal and form partial
* Change uploadFile to js-uploadFile to avoid potential issues in the future
* Remove duplicate style attribute causing webpack to fail
* Missed a css class in rename to js- prefix
* - Move logo uploads to partial for eaiser usage
- Add label logo
- Add css classes to label elements
- Change label prefix text (M: S: ...) to css::before content for easy removal in config
* Add more css classes to labels
* Allow unescaped " (quot) in css ouput
* Add max size param to partial, set defaults for allowedType and size
2019-03-01 15:25:42 -08:00
Wes Hulette
34246ee4ef
[WIP] v5 Develop: New LDAP implementation ( #6352 )
...
* Fixed missing oauth tables during setup.
* WIP New LDAP implementation
* WIP New LDAP implementation
* WIP New LDAP implementation
Merge remote-tracking branch 'origin/WIP_LDAP' into WIP_LDAP
* WIP New LDAP implementation
Added Adldap2 to handle ldap intergration.
* Updated per PR quality review
* Added specific LDAP settings method
* Corrected version number
* Added return documentation
* Added imports
* Changed class to be injected into controller
* Updated with PR suggestions
2018-12-06 14:05:43 -08:00
snipe
09c4dd4891
Added ability to upload favicon and email logo
...
todo: refactor the image upload/resize for less copypasta
2018-12-05 19:56:12 -08:00
Wes Hulette
465b69516d
Fixed : #6259 - Remove remote JS/CSS file loading ( #6330 )
...
* Fixed missing oauth tables during setup.
* Remove remote JS/CSS file loading
Updated gravatar to return to default image
* Updated default avatar path to user url
Removed local html5shim & response js files.
Removed copying html5shim & respond js file to public directory
2018-10-17 12:52:01 -07:00
snipe
4a4fc38c43
Style updates
2018-10-05 00:57:18 -07:00
snipe
79367642b1
[WIP] Added #5957 - Flysystem support ( #6262 )
...
* Added AWS url to example env
* Upgrader - added check for new storage path and attempt to move
* Ignore symlink
* Updated paths for models
* Moved copy methods
* Added AWS_URL support
For some reasin, Flysystem was generating the wrong AWS url (with a region included)
* Switch to Flysystem for image uploads
* Nicer display of image preview
* Updated image preview on edit blades to use Flysystem
* Twiddled some more paths
* Working filesystems config
* Updated Asset Models and Departments to use Flysystem
* Janky workaround for differing S3/local urls/paths
* Try to smartly use S3 as public disk if S3 is configured
* Use public disk Storage options for public files
* Additional transformer edits for Flysystem
* Removed debugging
* Added missing use Storage directive
* Updated seeders to use Flysystem
* Default logo
* Set a default width
We can potentially override this in settings later
* Use Flysystem for logo upload
* Update downloadFile to use Flysystem
* Updated AssetFilesController to use Flysystem
* Updated acceptance signatures to use Flysystem
* Updated signature view to use Flysystem
This isn’t working 100% yet
* Use Flysystem facade for displaying asset image
* Set assets path
Should clean all these up when we’re done here
* Added Rackspace support for Flysystem
* Added Flysystem migrator console command
* Added use Storage directive for categories
* Added user avatars to Flysystem
* Added profile avatar to Flysystem
* Added the option to delete local files with the migrator
* Added a check to prevent people from trying to move from local to local
* Fixed the selectlists for Flysystem
* Fixed the getImageUrl method to reflect Flysystem
* Fixed AWS copy process
* Fixed models path
* More selectlist updates for Flysystem
* Updated example .envs with updated env variable names
* *sigh*
* Updated non-asset getImageUrl() methods to use Flysystem
* Removed S3 hardcoding
* Use Flysystem in email headers
* Fixed typo
* Removed camera support from asset file upload
We’ll find a way to add this in later (and add that support to all of the other image uploads as well)
* Fixed path for categories
* WIP - Switched to standard handleImages for asset upload.
This is currently broken as I refact the handleImages method. Because the assets store/create methods use their own Form Request, the handleImages method doesn’t exist in that Form Request so it wil error now.
* Fixed css URL error
* Updated Debugbar to latest version (#6265 )
v3.2 adds support for Laravel 5.7
* Fixed: Missing CSS file in basic.blade.php (#6264 )
* Fixed missing CSS file in basic.blade.php
* Added
* Changed stylesheet import for authorize.blade.php
* Updated composer lock
* Added AWS_BUCKET_ROOT as env variable
* Use nicer image preview for logo upload
* Removed AssetRequest form request
* Removed asset form request, moved custom field validation into model
* Added additional help text for logo upload
* Increased the size of the image resize - should make this a setting tho
* Few more formatting tweaks to logo section of branding blade preview
* Use Flysystem for asset/license file uploads
* Use Flysystem for removing images from models that have been deleted
* Enable backups to use Flysystem
This only handles part of the problem. This just makes it so we can ship files to S3 if we want, but does not account for how we backup files that are hosted on S3
* Use Flysystem to download license files
* Updated audits to use Flysystem
2018-09-29 21:33:52 -07:00
Wes Hulette
ecf77e60df
Added: #6246 - CSS Cleanup ( #6247 )
...
* Streamlined CSS by using NPM
Removed unnecessary CSS files
Merged CSS files into one file
* Streamlined CSS by using NPM
Removed unnecessary CSS files
Merged CSS files into one file
* Removed override.less
* Moved bootstrap-color-picker css to file
Removed inline calls
* Changed css import on setup.blade.php
* Updated signature-pad.css import
* NPM Prod compile
* Fixed font family loading issue.
2018-09-28 14:09:48 -07:00
Dmitriy Minaev
bc8fa31eb2
Add depreciation with half-year convention. Fixed #1237 ( #6128 )
...
* Add half-year convention in depreciation for Models/Depreciable.php
* Add a setting for the depreciation method
* Integrate half-year convention inside working output
* fix: add more checks at Depreciable.php
* depreciation value rounding
* Codestyle fix
2018-08-28 12:32:46 -07:00
snipe
694166862e
Added attempted logins admin screen ( #6018 )
...
* Added attempted logins admin screen
* Smaller table spacing
2018-08-01 03:51:59 -07:00
snipe
e320d2ba05
Fixed #5944 - added logo option for print-assets page ( #5950 )
2018-07-24 13:37:02 -07:00
Jason
98b20fc1cd
Added option to include model information on asset labels. ( #5301 )
...
* Added option to include model information on asset labels.
Cleaned up label page to fix skewed label alignment on last row per page.
* Changes made per Snipe's direction
changed type from tinyint to boolean in DB
changed labels back to initials
2018-07-12 18:23:12 -07:00
snipe
0e88a6b268
Fixed bug in branding image upload size text
2018-07-09 19:04:18 -07:00
snipe
35fc001c58
Fixed #5742 - create_function() is deprecated
2018-07-05 20:49:01 -07:00
snipe
339263a295
Fixed #5751 - added option for unique constraint on serial
2018-07-05 19:30:36 -07:00
