DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 06:04:08 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
14492 commits 101 branches 268 tags 320 MiB
Commit graph

69 commits

Author SHA1 Message Date
snipe 910e98b573 [Snyk] Upgrade bootstrap-table from 1.22.5 to 1.23.0 #15131 
Signed-off-by: snipe <[email protected]>
 2024-07-22 10:45:35 +01:00
snipe 20868b9ede Load the english file again in case BS table doesn’t have a translation 
Signed-off-by: snipe <[email protected]>
 2024-07-22 10:30:42 +01:00
snipe 4a9bd95ed3 Added language support for select2 
Signed-off-by: snipe <[email protected]>
 2024-07-16 18:40:10 +01:00
snipe 86c0a3ecad Added localization for bootstrap-tables 
Signed-off-by: snipe <[email protected]>
 2024-07-08 15:12:37 +01:00
Marcus Moore 43616d1874
Remove alpine reference from webpack 2024-05-29 12:30:20 -07:00
Brady Wetherington 65e21faa3e Merge branch 'develop' into snipeit_v7_laravel10 
Hopefully, last merge?
 2024-04-02 20:34:04 +01:00
snipe 9c1b1bc2b5 Removed fre-order columns - it’s not currently used 
Signed-off-by: snipe <[email protected]>
 2024-03-26 10:15:46 +00:00
snipe 566ba4783e Fixed #14483 - adds deeplinking to search/sort/pagination 
Signed-off-by: snipe <[email protected]>
 2024-03-26 09:50:01 +00:00
Brady Wetherington f734e196e5 Merge branch 'develop' into snipeit_v7_laravel10 2024-01-08 18:57:55 +00:00
spencerrlongg 58d2f0a41e quick note 2023-12-12 15:49:57 -06:00
spencerrlongg 4367fc54bf remove vue from webpack steps 2023-12-12 13:43:05 -06:00
spencerrlongg 65cbba3c2e completely kill vue 2023-12-11 18:09:22 -06:00
Marcus Moore 4a975ebe29
Remove jquery-ui-dist 2023-11-28 15:01:41 -08:00
Marcus Moore 810abb5c30
Replace jquery-ui-bundle with jquery-ui-dist 2023-11-28 14:24:21 -08:00
Marcus Moore f02ff62a08
Install jquery-validation package 2023-11-13 18:15:18 -08:00
Brady Wetherington 7a5714cc85 Merge branch 'develop' into snipeit_v7_laravel10 2023-10-03 20:37:17 +01:00
snipe 1acb14a39f Moved dragtable css 
Signed-off-by: snipe <[email protected]>
 2023-09-28 15:12:44 +01:00
snipe bb7a41628a Fixed #13662 - added clipboard.js 
Signed-off-by: snipe <[email protected]>
 2023-09-28 15:06:55 +01:00
snipe 2a638e66f0 Added column re-ordering 
Signed-off-by: snipe <[email protected]>
 2023-09-15 21:53:34 +01:00
snipe 3ba8b60f54 Fixed regression that disabled sticky headers 
Signed-off-by: snipe <[email protected]>
 2023-09-15 20:28:28 +01:00
Brady Wetherington 8b52bad16f Merge branch 'develop' into snipeit_v7_laravel10 2023-08-15 21:25:16 +01:00
Grant Le Roux b1464e028c
Merge branch 'develop' into develop 2023-07-31 07:57:29 +08:00
Brady Wetherington 21d08ff742 Whoops! Forgot to commit this before 2023-05-01 18:05:06 -07:00
Brady Wetherington 6e031727fa Updated Node version, and various packages to more recent 2023-05-01 17:05:10 -07:00
snipe 3bd87a2785 Removed iCheck 
Signed-off-by: snipe <[email protected]>
 2023-04-03 22:52:54 -07:00
snipe 868615d5e7 Removed iCheck from snipeit.js and webpack 
Signed-off-by: snipe <[email protected]>
 2023-04-03 12:17:31 -07:00
Cram42 67d021e457 Add alpinejs to deferred scripts 2022-11-11 11:25:41 +08:00
snipe b98af0f50f Upgrade font-awesome to v6 
Signed-off-by: snipe <[email protected]>
 2022-07-07 14:22:08 -07:00
snipe 784bf4d784 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <[email protected]>

# Conflicts:
#	.github/ISSUE_TEMPLATE/feature_request.yml
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/ReportsController.php
#	config/version.php
#	package-lock.json
#	package.json
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/views/users/print.blade.php
#	webpack.mix.js
 2022-05-06 01:52:43 -07:00
snipe a5760cfe7b Update BS tables and table export to latest 
Signed-off-by: snipe <[email protected]>
 2022-05-05 12:22:20 -07:00
Wächtler, Yannick b77e7f88d4 fix(bootstrap-table): adds locale env to table init, adds bootstrap-table-locale-all to webpack-mix 2022-01-09 17:35:28 +01:00
snipe f4ef828332 Fixex js table export 
Signed-off-by: snipe <[email protected]>
 2021-12-24 11:17:36 -08:00
snipe 8738451685 Fixed font awesome caret 
Signed-off-by: snipe <[email protected]>
 2021-09-25 23:17:35 -07:00
snipe dbe93d91cd Updated fontawesome icons 
Signed-off-by: snipe <[email protected]>
 2021-09-24 06:07:46 -07:00
Brady Wetherington 9456a03a88 Almost finished with the routes which is...hopefully? The last thing? 2021-06-22 16:58:23 -07:00
Brady Wetherington 5b42481d8f Get it so that we can re-build assets. 2021-06-11 21:54:29 -07:00
snipe d5894a4d64 Generated dev assets 
Signed-off-by: snipe <[email protected]>
 2021-04-26 17:27:28 -07:00
Joel Pittet af8509c4d0
Allow NPM packages to build for production (#9171) 
* add back changes before compiling assets

* new css location and mix manifest

* update papaparse, most vunerabilities attached to it

* update axios and papaparse for security releases

* removing security fixes that still allow npm run production to work

* Update lodash
 2021-04-05 22:01:11 -07:00
snipe 75b8c3455c Fixed #8609 - custom fieldsets not draggable anymore (regression) 2020-11-12 23:38:12 -08:00
snipe 2e0f7921a8
Removed commented out javascript 2020-09-03 16:58:16 -07:00
snipe b433b49469
Ficing webpack, CSS and JS (*whew* that sucked) 
Signed-off-by: snipe <[email protected]>
 2020-04-27 22:41:33 -07:00
snipe b0d848caec
Updated wedbpack to only pull from resources or node_modules 
Signed-off-by: snipe <[email protected]>
 2020-04-22 07:13:32 -07:00
snipe cb71bcc4af
Switch to old() helper 2020-04-21 03:58:31 -07:00
snipe 58f6b2da5a
Fixing assets 2020-04-21 03:42:35 -07:00
snipe b670371e0b
Ugggh… fixing a donked merge 2020-04-21 03:30:21 -07:00
snipe f532e9b462
Fixing assets :( 
Not sure what happened in tbis merge exactly
 2020-04-21 03:07:11 -07:00
snipe 19f71face9
Added filtering to settings page 2020-04-06 20:11:13 -07:00
snipe 8787f228d9 Fixed asset build 2020-03-28 00:16:28 -07:00
snipe 03cde9a72c Added less processing for skin files 2020-03-28 00:08:21 -07:00
Daniel Meltzer f16ce09a7a Importer again (#4702) 
* If a user id is provided in the name column of an import, we should assume that it is a user id and check out to it.

* Fix build of vue files.  The location is public/js/build, not public/build

* Ensure a status type is set before allowing submission of an import.

Also expand the status text label to change color based on success/failure.

Fixes #4658

* Use right key to lookup emails when importing users.  Fixes 4619.

* Import serial for components, and make unique matches based on the serial as well as the name.  Fixes #4569

* Set the location_id when importing an item properly.

This moves as well to using the Asset::checkout() method, which should consolidate the logic into a useful spot.
Fixes #4563 (I think)

* Production assets.

* Case insensitive field map guessing and repopulate when changingin import type.
 2017-12-28 20:08:45 -08:00