snipe
|
b7cc12a466
|
Merge remote-tracking branch 'origin/develop'
|
2020-11-09 22:53:23 -08:00 |
|
snipe
|
f4080a7aa9
|
Fixed created_at and expired_at order in API token screen
|
2020-11-09 22:53:07 -08:00 |
|
snipe
|
31bbb2d035
|
Merge remote-tracking branch 'origin/develop'
|
2020-11-09 22:43:41 -08:00 |
|
snipe
|
33dca84ec7
|
Show expiry and created at date on API token page
|
2020-11-09 22:43:27 -08:00 |
|
snipe
|
b2101a5188
|
Merge remote-tracking branch 'origin/develop'
|
2020-11-09 21:09:05 -08:00 |
|
snipe
|
ede20523f2
|
Fixed #8680 - location image path
|
2020-11-09 21:08:19 -08:00 |
|
snipe
|
63a8535de1
|
Merge remote-tracking branch 'origin/develop'
|
2020-11-09 19:11:37 -08:00 |
|
Brady Wetherington
|
a5423649f4
|
This is the smallest set of changes we can use to work around a change in functionality
in Bootstrap Tables. This should remedy some of the issues we've been having with large
GET strings being sent to the back-end by the Assets system.
|
2020-11-09 17:36:07 -08:00 |
|
snipe
|
48c3d0fd19
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# resources/lang/es-VE/general.php
|
2020-11-09 14:55:11 -08:00 |
|
snipe
|
67f60127be
|
Updated translations with latest from CrowdIn
|
2020-11-09 14:52:11 -08:00 |
|
snipe
|
4b8e9a962b
|
Fixed Venezuelan translation file
|
2020-11-09 14:05:31 -08:00 |
|
snipe
|
6618e88a9a
|
Fixed spanish translation parse error
|
2020-11-06 10:19:32 -08:00 |
|
snipe
|
e8fd2a7fe8
|
Merge remote-tracking branch 'origin/develop'
|
2020-11-03 13:07:31 -08:00 |
|
snipe
|
df5972c4fa
|
Fixed send creds checkbox in create user form
|
2020-11-03 13:07:15 -08:00 |
|
snipe
|
4d003ac97a
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# app/Http/Controllers/Auth/ResetPasswordController.php
# config/version.php
|
2020-11-03 11:49:34 -08:00 |
|
snipe
|
44e5fec707
|
Fixed #8603 - Use correct CSS path for signature-pad.min.css
|
2020-11-03 10:01:55 -08:00 |
|
snipe
|
c800662f0c
|
Use username for forgotten password
Since emails are not required to be unique
|
2020-11-02 23:57:00 -08:00 |
|
snipe
|
e6f53a53bc
|
Updated min requirement for passwords in lang files
|
2020-11-02 22:15:01 -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
|
42347d0f0c
|
Added validation language for same_pwd_as_user_fields
|
2020-11-02 17:46:30 -08:00 |
|
snipe
|
c93f4ef0d5
|
Merge remote-tracking branch 'origin/develop'
|
2020-10-23 19:50:56 -07:00 |
|
snipe
|
89e36dbc42
|
Merge pull request #8606 from uberbrady/fix_cant_manage_self
Add a new custom validator for Users
|
2020-10-23 19:16:11 -07:00 |
|
snipe
|
8ee9e5e059
|
Fixed #8537 - wrong sorting on dashboard
|
2020-10-23 18:33:10 -07: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 |
|
Brady Wetherington
|
0eda53c484
|
Add a new custom validator for Users to prevent someone from managing themselves
|
2020-10-23 16:55:10 -07:00 |
|
snipe
|
28612d8b61
|
Merge remote-tracking branch 'origin/develop'
|
2020-10-23 14:23:46 -07:00 |
|
snipe
|
2aa8e1e76b
|
Merge pull request #8596 from snipe/fixes/8462_move_accessory_notes
Fixes #8462 - move accessory notes into pivot table
|
2020-10-23 14:19:51 -07:00 |
|
snipe
|
d74df93c48
|
Merge remote-tracking branch 'origin/develop'
|
2020-10-23 12:10:13 -07:00 |
|
snipe
|
b9a9949570
|
Use the form partial for avatars
|
2020-10-23 12:09:20 -07:00 |
|
snipe
|
2219c9ccb5
|
Merge remote-tracking branch 'origin/develop'
|
2020-10-23 06:55:39 -07:00 |
|
snipe
|
bf9e53fbe7
|
Updated markdown templates
|
2020-10-23 06:55:23 -07:00 |
|
snipe
|
f68580b482
|
Make the email table wider
|
2020-10-23 06:55:04 -07:00 |
|
snipe
|
aec2f2a249
|
Fixed #8576 - switch to HTML from markdown
This is really stupid. A markdown table with over 3 columns doesn’t render correctly. :(
|
2020-10-23 06:54:45 -07:00 |
|
snipe
|
831da2d6d1
|
New mail vendor files
|
2020-10-23 06:17:07 -07:00 |
|
snipe
|
40c0ba9a95
|
Merge remote-tracking branch 'origin/develop'
|
2020-10-23 04:46:44 -07:00 |
|
snipe
|
2263dae8f4
|
Fixed HTML
|
2020-10-23 04:07:55 -07:00 |
|
snipe
|
88f03e6b55
|
Added last_checkout and notes from pivot for accessories
|
2020-10-23 00:44:26 -07:00 |
|
snipe
|
c3e8f64064
|
Merge remote-tracking branch 'origin/develop'
|
2020-10-22 23:24:56 -07:00 |
|
snipe
|
ec7d70cea0
|
Merge pull request #8551 from Godmartinz/bug/ch10148/error-when-using-dark-green-skin
fixed the Green skin (dark mode) color scheme on the importer page and asset table
|
2020-10-22 21:16:52 -07:00 |
|
snipe
|
6c285b0273
|
Merge pull request #8586 from Godmartinz/Confusing_wording_in_LDAP
reworded the ad_append_domain_help string
|
2020-10-22 21:15:35 -07:00 |
|
snipe
|
5d112be49a
|
Fixed #8585 - requested assets page blank
|
2020-10-22 20:08:33 -07:00 |
|
snipe
|
496b176d4e
|
Fixed #8589 - unable to accept asset
|
2020-10-22 19:46:40 -07:00 |
|
snipe
|
c71086d2f3
|
Fixed #8590 - unable to checkin and delete from user view
|
2020-10-22 19:32:51 -07:00 |
|
Godfrey M
|
fcdb945f5f
|
reworded the ad_append_domain_help string
|
2020-10-22 09:21:18 -07:00 |
|
snipe
|
a6d0209e93
|
Fixed #8567 - don’t require model for custom report
|
2020-10-21 12:23:27 -07:00 |
|
Godfrey M
|
4a3d8f2cc0
|
fixed the Green skin (dark mode) color scheme on the importer page and assets table
|
2020-10-20 15:22:38 -07:00 |
|
Bennett Blodinger
|
132f296f03
|
Fix typo
|
2020-10-20 08:13:52 -05:00 |
|
snipe
|
c1443aa6eb
|
Pull licenses, accessories, etc - the qty is not accurately reflected
|
2020-10-19 16:22:55 -07:00 |
|
snipe
|
fa41b74856
|
Fixed parse error in Columbian spanish translation
|
2020-10-09 17:24:48 -07:00 |
|
snipe
|
a39069bc45
|
Small UI improvements to API keys page
|
2020-10-09 16:02:30 -07:00 |
|
snipe
|
714ad071ca
|
Add API endpoint to API keys page
// TODO - localize it
|
2020-10-09 14:46:11 -07:00 |
|
snipe
|
c0f9a35dea
|
Fixed password reset blade with correct username
|
2020-10-08 18:47:42 -07:00 |
|
snipe
|
d7e58a35bf
|
Revert "Updated translations"
This reverts commit aad14b4d7a .
|
2020-10-08 18:43:06 -07:00 |
|
snipe
|
aad14b4d7a
|
Updated translations
|
2020-10-06 19:30:04 -07:00 |
|
snipe
|
01a98c38dc
|
Added welsh as an localization option
|
2020-10-06 19:16:29 -07: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
|
14a10f60d9
|
Undo previous change (it was an intentional choice)
|
2020-09-29 15:24:50 -07:00 |
|
snipe
|
186e229190
|
Make date example reflect actual date
|
2020-09-28 19:01:58 -07:00 |
|
snipe
|
dafac4ceb3
|
Disable ldap_enabled on demo, fixed some incorrect error messages
|
2020-09-25 19:04:38 -07:00 |
|
snipe
|
695774a3fb
|
Corrected throttle string
|
2020-09-24 23:39:32 -07:00 |
|
snipe
|
98246de4c7
|
Disable SAML on the demo
|
2020-09-24 19:25:28 -07:00 |
|
Bennett Blodinger
|
83dfa2a28c
|
Merge branch 'develop' into gmaps-8465
|
2020-09-22 17:41:38 -05:00 |
|
Blodinger
|
471e0fd2fc
|
Changes the Google Maps window to be a bit more detailed
|
2020-09-22 14:30:38 -05: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
|
b508482441
|
Merge pull request #8438 from snipe/features/nicer_slack_ui
Nicer slack settings UI
|
2020-09-16 12:29:58 -07:00 |
|
snipe
|
30f8431bfb
|
Added required field indicator
|
2020-09-16 12:29:20 -07:00 |
|
snipe
|
a3e738b283
|
Fixed #8442 - wrong CSS url path on /setup
|
2020-09-16 11:20:59 -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
|
3ceff29e04
|
Added some translations for Slack integration
|
2020-09-15 23:05:42 -07:00 |
|
snipe
|
440ca686e4
|
More verbose warning for data purge
|
2020-09-15 20:53:07 -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
|
2855a9b2e8
|
Added debugging to file upload for easier diagnostics
|
2020-09-15 20:07:46 -07:00 |
|
snipe
|
e8befe9afd
|
Increased favicon filesize max
|
2020-09-15 20:07:29 -07:00 |
|
snipe
|
d5f8e93d7c
|
Moved delete logo option higher for nicer layout
|
2020-09-15 19:52:34 -07:00 |
|
snipe
|
303388e1f5
|
Added a space between favicon help text blocks
|
2020-09-15 19:50:15 -07:00 |
|
snipe
|
9601bf6edd
|
Make “remove image” text clearer
|
2020-09-15 11:57:40 -07:00 |
|
snipe
|
3b6fb68ff1
|
Added space between padlock icon and demo warning text
|
2020-09-15 11:40:36 -07:00 |
|
snipe
|
bfd024fdfd
|
Merge pull request #8434 from inietov/bug/ch15182/make-all-of-the-this-feature-has-been-disabled
Thanks!
|
2020-09-15 11:21:35 -07:00 |
|
snipe
|
e464f0edf3
|
Small UI tweaks for kits
|
2020-09-15 10:15:14 -07:00 |
|
Ivan Nieto
|
291997c915
|
Change the class of a reusable element so the icon changes from a warning to a padlock
|
2020-09-15 01:32:46 -05: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
|
e448b626e2
|
Removed pagaination from dashboard
|
2020-09-12 08:37:37 -07:00 |
|
snipe
|
ac2403e8fc
|
Fixed markdown issue in markdown notifications
|
2020-09-11 17:12:33 -07:00 |
|
snipe
|
cf545f0ed1
|
Fixed form layout on accessory checkin page
|
2020-09-11 16:20:56 -07:00 |
|
snipe
|
e750b2b2da
|
Added envelope css to overrides for table header
|
2020-09-11 16:06:19 -07:00 |
|
snipe
|
d3d64bd85c
|
Removed asset tag from accessory checkin markdown notification
|
2020-09-11 16:06:02 -07:00 |
|
snipe
|
0f22cf6807
|
Fixed #8428 - Added purchase cost column to user tabs
|
2020-09-11 11:48:51 -07:00 |
|
snipe
|
2f435a57c1
|
Fixed #8426 - show model number in custom fields model listing
|
2020-09-11 11:27:30 -07:00 |
|
snipe
|
82e0b1ffd8
|
Fixed [ch15130] - update the seeder to clear requested assets table
|
2020-09-08 18:29:02 -07:00 |
|
snipe
|
5b68a321a6
|
Added comapny formatter to asset maintenance report - fixes [ch15119]
|
2020-09-08 18:15:45 -07:00 |
|
snipe
|
251ef82741
|
Added company formatter to asset maintenance report
|
2020-09-08 18:14:21 -07:00 |
|
snipe
|
d9e7a457d4
|
Fixed regression on select menus [ch15093]
Custom report doesn’t pass an $item, so we have to check for that in that required check
|
2020-09-04 15:43:49 -07:00 |
|