Ivan Nieto Vivanco
|
e5cc6ec972
|
Fixes error 500 if checkout_acceptances table have a created_at null column
|
2022-08-17 22:02:13 -05:00 |
|
snyk-bot
|
e97c526050
|
fix: upgrade webpack from 5.73.0 to 5.74.0
Snyk has created this PR to upgrade webpack from 5.73.0 to 5.74.0.
See this package in npm:
https://www.npmjs.com/package/webpack
See this project in Snyk:
https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=referral&page=upgrade-pr
|
2022-08-15 23:41:31 +00:00 |
|
|
snyk-bot
|
7b45328fcc
|
fix: upgrade @fortawesome/fontawesome-free from 6.1.1 to 6.1.2
Snyk has created this PR to upgrade @fortawesome/fontawesome-free from 6.1.1 to 6.1.2.
See this package in npm:
https://www.npmjs.com/package/@fortawesome/fontawesome-free
See this project in Snyk:
https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=referral&page=upgrade-pr
|
2022-08-15 23:41:27 +00:00 |
|
snipe
|
40bc13a946
|
Merge pull request #11676 from snipe/fixes/added_category_to_model_info
Adds the category in the side info on Models > View
|
2022-08-14 14:03:09 -07:00 |
|
|
snipe
|
368bd5da3f
|
Adds the category in the side info on Models > View
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-14 14:01:58 -07:00 |
|
|
snipe
|
1763bbfbd3
|
Merge pull request #11662 from octobunny/patch-1
Fixed #6899 Docker container's php configuration isn't congruent with snipe-it uploads setting size.
|
2022-08-14 13:46:38 -07:00 |
|
|
snipe
|
7b44afc43c
|
Merge pull request #11666 from snipe/features/add_null_option_for_purchase_expected_dates
Added `null` option for `purchase_date` and `expected_checkin` dates
|
2022-08-14 13:43:03 -07:00 |
|
|
snipe
|
13b6c281df
|
Merge pull request #11675 from snipe/revert-11663-fixes/user_cant_be_deleted_if_has_consumables
Revert "Prevent to delete a user if still has consumables associated to them"
|
2022-08-14 13:42:45 -07:00 |
|
|
snipe
|
5feea17f8d
|
Revert "Prevent to delete a user if still has consumables associated to them"
|
2022-08-14 13:42:14 -07:00 |
|
|
snipe
|
60d1578a01
|
Merge pull request #11663 from inietov/fixes/user_cant_be_deleted_if_has_consumables
Prevent to delete a user if still has consumables associated to them
|
2022-08-14 13:41:09 -07:00 |
|
Chris Hartjes
|
07585809b3
|
Got unit and browser tests working, added documentation
|
2022-08-12 13:00:26 -04:00 |
|
Kyle Gordon
|
98a111796b
|
Declare DB_PORT in all .env files
|
2022-08-12 15:07:02 +01:00 |
|
|
snipe
|
7b3be076b4
|
Make location field the same width
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-11 18:38:34 -07:00 |
|
|
snipe
|
2c68ec927a
|
Use trans_choice for string
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-11 18:30:59 -07:00 |
|
|
snipe
|
a0ba33ed7c
|
Added checkboxes
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-11 18:25:22 -07:00 |
|
|
snipe
|
70bb4cd746
|
Added translation
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-11 18:25:15 -07:00 |
|
|
snipe
|
91e824c5b0
|
Check for nullifying checkboxes
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-11 18:25:07 -07:00 |
|
|
snipe
|
491cdd4de6
|
Merge pull request #11664 from snipe/snyk-upgrade-bcc306620433a4ebeaaed8c3e4d4c9eb
[Snyk] Upgrade acorn from 8.7.1 to 8.8.0
|
2022-08-11 16:59:45 -07:00 |
|
|
snyk-bot
|
3454cdd2a0
|
fix: upgrade acorn from 8.7.1 to 8.8.0
Snyk has created this PR to upgrade acorn from 8.7.1 to 8.8.0.
See this package in npm:
https://www.npmjs.com/package/acorn
See this project in Snyk:
https://app.snyk.io/org/snipe/project/3d53e1dd-b8bf-46b5-ba61-18ce26933166?utm_source=github&utm_medium=referral&page=upgrade-pr
|
2022-08-11 23:58:21 +00:00 |
|
|
Ivan Nieto Vivanco
|
db53a00d3f
|
Prevent to delete a user if still has consumables associated to them
|
2022-08-11 17:01:52 -05:00 |
|
octobunny
|
8324b94022
|
Change PHP post_max_size
Must change post_max_size in addition to upload_max_filesize to increase total upload size to greater than 8MB.
|
2022-08-11 17:07:46 -04:00 |
|
|
Ivan Nieto Vivanco
|
a33ca39237
|
Figure out declined notifications
|
2022-08-11 16:00:21 -05:00 |
|
|
Ivan Nieto Vivanco
|
98bcd82108
|
Add the mail recipient from configuration in the CheckoutAcceptance model
|
2022-08-11 15:33:18 -05:00 |
|
|
Ivan Nieto Vivanco
|
d2c486bb1e
|
Create the mail template for the acceptance
|
2022-08-11 15:28:30 -05:00 |
|
|
snipe
|
8c579d693a
|
Merge pull request #11660 from Godmartinz/departments_location_and_company_updates_with_null
Fixes Departments update/store to allow company and/or location ids to be null
|
2022-08-11 13:04:45 -07:00 |
|
Godfrey M
|
814992eb7d
|
allows company and location ids to be null
|
2022-08-11 12:47:40 -07:00 |
|
|
Ivan Nieto Vivanco
|
267997f0a6
|
Customize the notifications with the needed data
|
2022-08-11 14:01:11 -05:00 |
|
|
Ivan Nieto Vivanco
|
0172fe6403
|
Add Notifiable trait to the CheckoutAcceptance Model
|
2022-08-11 13:02:25 -05:00 |
|
|
Ivan Nieto Vivanco
|
509bbbc685
|
Create Notifications classes for accepted and declined and add some necesary lang strings
|
2022-08-11 13:01:21 -05:00 |
|
|
Ivan Nieto Vivanco
|
8cee5060af
|
Remove unused DB statement
|
2022-08-10 19:16:04 -05:00 |
|
|
Ivan Nieto Vivanco
|
a7de97f060
|
Found a better place for the where condition
|
2022-08-10 19:13:28 -05:00 |
|
|
Ivan Nieto Vivanco
|
c1074000f9
|
Add a concat to search for full name when the relationship search in the users table
|
2022-08-10 18:27:28 -05:00 |
|
|
snipe
|
c7d9baad8e
|
Merge remote-tracking branch 'origin/master' into develop
|
2022-08-10 16:11:29 -07:00 |
|
|
snipe
|
c77d763f05
|
Merge pull request #11650 from snipe/fixes/6877_add_notes_to_consumables
Fixed #6877 - Added notes to consumables, components on checkout
|
2022-08-10 16:11:08 -07:00 |
|
|
snipe
|
ef099aa644
|
Reverted notes to note since pivot
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 16:09:56 -07:00 |
|
|
snipe
|
acd666fdf5
|
Added notes to user consumables tab
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 15:34:07 -07:00 |
|
|
snipe
|
8de7e9a2ab
|
Use route name in case the user biffs the checkout twice
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 15:17:52 -07:00 |
|
|
snipe
|
dd0260c3be
|
Use old note on validation failure
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 15:15:29 -07:00 |
|
|
snipe
|
512348cc5a
|
Added withInput()
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 15:15:09 -07:00 |
|
|
snipe
|
fb3d7bf82e
|
Made button wider
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 15:07:58 -07:00 |
|
|
snipe
|
e3293151a2
|
Added note on checkout
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 15:04:59 -07:00 |
|
|
snipe
|
3ec77724d8
|
Added note pivot
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 15:04:34 -07:00 |
|
|
snipe
|
024a014298
|
Changed notes to note
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 15:04:19 -07:00 |
|
|
snipe
|
c1e5d03340
|
Added pivot for note
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 15:03:41 -07:00 |
|
|
snipe
|
fb2fe61daf
|
Use a less stupid URL for this endpoint
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 15:03:26 -07:00 |
|
|
snipe
|
0d9eccb7eb
|
Addeed note field
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 15:03:12 -07:00 |
|
|
snipe
|
f9956cc5df
|
Added DB migration
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 14:54:33 -07:00 |
|
|
snipe
|
f7cceaedd5
|
Merge pull request #11649 from snipe/features/add_url_in_export
Fixed #8928 - add URL and ID to custom asset report
|
2022-08-10 13:58:22 -07:00 |
|
|
snipe
|
e7c47408a7
|
Derp
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 13:57:42 -07:00 |
|
|
snipe
|
637604dfaf
|
Fixed #8928 - add URL and ID to custom asset report
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-10 13:51:47 -07:00 |
|