ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,439 Commits 84 Branches 293 Tags
#18172-better-permissions-output-via-api
Commit Graph

94 Commits

Author SHA1 Message Date
snipe
23feb64b5a Fixed potential XSS on locations 2025-10-17 17:07:57 +01:00
Marcus Moore
a1e65cd897 Merge branch 'develop' into replace-date-and-time-display-macros 
# Conflicts:
#	resources/macros/macros.php
 2025-10-08 13:10:56 -07:00
Marcus Moore
cd785c9fc3 Remove name_display_format macro that was accidentally re-added 2025-10-06 13:06:52 -07:00
Marcus Moore
23885f5166 Merge branch 'develop' into 17204-replace-form-digit-separator 
# Conflicts:
#	resources/macros/macros.php
 2025-10-06 13:04:34 -07:00
snipe
6cf88b1792 Merge pull request #17978 from marcusmoore/17205-replace-form-email-format 
Fixed #17205 - replace Form:: email_format
 2025-10-03 09:15:49 +01:00
Marcus Moore
3457e7d617 Remove Form::name_display_format macro 2025-10-02 16:08:37 -07:00
Marcus Moore
03fd8df8bd Remove Form::email_format 2025-10-02 15:52:09 -07:00
Marcus Moore
689d5a2d58 Remove digit_separator form macro 2025-10-02 15:39:28 -07:00
Marcus Moore
c8b7782d1d Remove date_display_format and time_display_format macros 2025-10-02 15:27:20 -07:00
Marcus Moore
3cf1e9d55d Remove customfield_elements macro 2025-05-29 13:30:23 -07:00
snipe
783f0c113d Merge pull request #17009 from marcusmoore/chore/replace-user-skin-macro 
Replace `skin` and `user_skin` macros with blade component
 2025-05-29 13:07:47 +01:00
snipe
75a839cc21 Merge pull request #17010 from marcusmoore/chore/replace-two-factor-select-macro 
Replace `two_factor_options` macro
 2025-05-29 13:07:23 +01:00
akemidx
67acca7bc8 fixing two translation strings. 2025-05-28 20:21:05 -04:00
Marcus Moore
3c428f2d7b Inline two_factor_options macro 2025-05-27 16:40:08 -07:00
Marcus Moore
6833716576 Remove skin macro 2025-05-27 16:22:43 -07:00
Marcus Moore
2c452daddf Replace user_skin macro with blade component 2025-05-27 16:00:47 -07:00
Marcus Moore
ca7c416e19 Remove the replaced locales form macro 2025-05-12 16:35:40 -07:00
Godfrey M
073c9f5f7c remove duplicate input-group color correction 2025-04-30 16:16:14 -07:00
snipe
9c88aa6974 Merge pull request #16637 from akemidx/lastnameemail 
Fixed #8188 - Added Last Name as an email format
 2025-04-09 21:27:10 +01:00
akemidx
1307146831 changing where translations live. coalescing 2025-04-09 16:21:48 -04:00
snipe
9daa09277d Added translations for skins 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-09 02:23:18 +01:00
akemidx
7701c6097f adding username split 2025-04-08 13:21:32 -04:00
akemidx
f659b7631d Merge branch 'develop' into lastnameemail 2025-04-08 13:10:26 -04:00
akemidx
443a5c2348 chaning username dropdown to be usernames and not emails 2025-04-07 19:25:32 -04:00
akemidx
f0bf77735d adding last name only as a email choice 2025-04-03 23:34:04 -04:00
akemidx
008b6f1db2 lastname.first initial 2025-02-05 20:11:33 -05:00
Brady Wetherington
f963b9a19f Fix selected-index of Countries drop-down 2024-09-18 13:24:26 +01:00
snipe
231bc1e2de Updated blade selectors 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-29 18:31:34 +01:00
snipe
5efddf6f5b Allow clear on country dropdown 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-22 11:01:39 +01:00
snipe
3ac0702094 Fixed #15344 - make select2 for countries freeform-ish 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-22 10:13:22 +01:00
snipe
f9172594b2 Clearer time example display 
Signed-off-by: snipe <snipe@snipe.net>
 2024-08-16 10:14:43 +01:00
snipe
bd1f43f9ee Added lastname.firstname as email format 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-20 13:36:48 +01:00
snipe
ddf81ba135 Wider country dropdown 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-20 11:00:06 +00:00
snipe
21e23baa37 Fixed ternary 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-18 21:28:46 +00:00
snipe
b049bb1d5c Check for null on select 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-11 14:55:49 +00:00
snipe
d73d15b8a2 Added form macro for name format 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:11:59 +01:00
snipe
8660d41aa3 Changed width of locale field 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:11:45 +01:00
snipe
9820ab34d7 Use today’s date for date format selectlist 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-14 22:44:29 +01:00
snipe
bd4061e023 Change text on dropdown 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-08 08:18:56 +01:00
snipe
018f71a157 Switched to translations for better autoglossonym support 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-05 11:46:42 -07:00
snipe
c39bf7b7e6 Added German (Informal) to select list 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-08 15:30:58 -07:00
snipe
d4e46ee41f Added comma in US currency format [ch16628] 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 16:14:32 -07:00
Laravel Shift
934afa036f Adopt Laravel coding style 
Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions.

You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started.

[1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer
[2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200
 2021-06-10 20:15:52 +00: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
snipe
069e9e52fe Try/catch barcodes so they don’t shit up the logs 
Signed-off-by: snipe <snipe@snipe.net>
 2021-03-17 22:19:10 -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
snipe
2ea805b7ed Added search/sort by Location OU, added to listing 2020-11-17 22:17:07 -08:00
snipe
5ba1659563 Removed dupe date 2020-11-16 23:56:48 -08:00
snipe
01a98c38dc Added welsh as an localization option 2020-10-06 19:16:29 -07:00
snipe
14a10f60d9 Undo previous change (it was an intentional choice) 2020-09-29 15:24:50 -07:00