snipe
|
c949a1f5f2
|
renamed Tests to tests
|
2021-12-02 15:08:26 -08:00 |
|
|
snipe
|
9536f836f0
|
Beginning of CompanyTest fixes (not done yet)
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-02 15:02:46 -08:00 |
|
|
snipe
|
064e0b7a1c
|
Removed dd for debugging
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-02 15:02:25 -08:00 |
|
|
snipe
|
37033fb2f7
|
Removed some defaul values to handle validation
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-02 15:02:11 -08:00 |
|
|
snipe
|
77d6649e38
|
One more case change because I have NOTHING else to do
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-02 14:26:31 -08:00 |
|
|
snipe
|
f61f386f31
|
Fixed again because I suck
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-02 14:07:48 -08:00 |
|
|
snipe
|
d20a0f7c6d
|
Update composer autoload for test case case
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-02 14:05:35 -08:00 |
|
|
snipe
|
406aed6b07
|
Case sensitive dir stuff
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-02 14:03:32 -08:00 |
|
|
snipe
|
5555553307
|
renamed again for git to accept case
|
2021-12-02 14:02:16 -08:00 |
|
|
snipe
|
00b63fe7c7
|
Fixed category factory methods
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-02 13:40:16 -08:00 |
|
|
snipe
|
44b6907919
|
Updated phpunit.xml
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-02 11:44:32 -08:00 |
|
|
snipe
|
406211d2fe
|
Move mockery to require-dev
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-02 11:22:46 -08:00 |
|
|
snipe
|
fb06c136b9
|
Added mockery (because reasons?)
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-02 11:11:14 -08:00 |
|
|
snipe
|
957d092844
|
Upgraded phpunit to v9
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-02 11:04:04 -08:00 |
|
|
snipe
|
ed2797afdd
|
Small fixes
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-01 23:33:20 -08:00 |
|
|
snipe
|
ad6d70b86f
|
Removed unused Str
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-01 23:30:48 -08:00 |
|
|
snipe
|
17bd6d71e7
|
Fixed location unit test
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-01 22:45:39 -08:00 |
|
|
snipe
|
d96e95abd6
|
Small mods to configs, removed old faker, added new
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-01 13:46:21 -08:00 |
|
|
snipe
|
bc355e1f26
|
Remve unused use Hash statements
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-30 20:47:02 -08:00 |
|
|
snipe
|
d8234d5a0b
|
Trying to unfuck the TestCase
A lot has changed between versions
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-30 20:46:44 -08:00 |
|
|
snipe
|
f3f6a04c43
|
Use hash::
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-30 20:46:20 -08:00 |
|
|
snipe
|
fe2cd8b708
|
Switched back to sqlite for unit
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-30 20:45:54 -08:00 |
|
|
snipe
|
e73373a75a
|
Removed empty tests
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-30 20:45:42 -08:00 |
|
|
snipe
|
d08c1787a1
|
First steps at getting dusk working
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-30 20:09:29 -08:00 |
|
|
snipe
|
4c2d47e7c6
|
Merge pull request #10354 from inietov/fixes/customfields_with_date_format_doesnt_display_default_value
Fixes Default Values - Date not applying
|
2021-11-24 19:41:51 -08:00 |
|
|
snipe
|
29bbfad693
|
Applied escaping fix from master to develop
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-24 19:38:27 -08:00 |
|
Ivan Nieto Vivanco
|
741eb28622
|
Add the call to defaultValue() function in custom fields with date format
|
2021-11-23 17:11:21 -06:00 |
|
|
snipe
|
ef8f646ab2
|
Merge pull request #10349 from snipe/chore/sc-17719/add-sodium-as-a-requirement-in-upgrade-php
Update upgrade.php with newer requires
|
2021-11-22 15:32:51 -08:00 |
|
|
snipe
|
686e58806f
|
Update upgrade.php with newer requires
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-22 15:31:23 -08:00 |
|
|
snipe
|
df0b240a05
|
Merge pull request #10288 from uberbrady/composer_install_under_phpv8
[sc-17645] Composer install under phpv8
|
2021-11-18 15:28:54 -08:00 |
|
|
snipe
|
3e83b2ff2f
|
Merge pull request #10334 from snipe/feature/sc-17704/make-all-currency-values-right-aligned
Added text-right to presenters for money values
|
2021-11-18 15:10:19 -08:00 |
|
|
snipe
|
c49c5f4164
|
Added text-right to presenters for money values
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-18 15:09:17 -08:00 |
|
|
snipe
|
6d545ff11b
|
Merge pull request #10333 from snipe/bug/sc-17711/v6-bug-500-server-error-when-trying-to-checkin
Fixed v6 bug 500 server error when trying to checkin
|
2021-11-18 14:38:17 -08:00 |
|
|
snipe
|
250f6b6fb8
|
Fixed v6 bug 500 server error when trying to checkin [sc-17711]
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-18 14:37:12 -08:00 |
|
|
snipe
|
f6d5d6cc09
|
Merge pull request #10316 from snipe/bug/sc-17684/v6-bug-error-when-editing-model-with-no-custom
v6 bug - Error when editing model with no custom
|
2021-11-17 18:38:48 -08:00 |
|
|
snipe
|
bbb0d1be17
|
Possible fix for asset model editing when no custom fieldset is associated
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-15 21:09:35 -08:00 |
|
|
snipe
|
476e17055b
|
Escape custom fields in API response
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-15 20:31:01 -08:00 |
|
|
snipe
|
db45de5da2
|
Fixed old style user routes
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-15 20:26:07 -08:00 |
|
|
snipe
|
207c785b1d
|
Added missing use statements for Laravel 8 routes
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-15 20:20:10 -08:00 |
|
|
snipe
|
8a747be3a0
|
Fixed routes for newer format (l8)
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-15 20:16:40 -08: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
|
46d2f8a81d
|
Disallow file upload to backups on demo
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-15 19:42:02 -08:00 |
|
|
snipe
|
92b7aaf44b
|
Log the user out upon successful restore
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-15 19:40:01 -08:00 |
|
|
snipe
|
8bf11e9417
|
Bummped hash fpr v6-pre-alpha
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-15 19:31:20 -08:00 |
|
|
snipe
|
174d23a42a
|
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-15 19:29:57 -08:00 |
|
|
snipe
|
f2f8f96991
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Importer/ConsumableImporter.php
# app/Models/Consumable.php
# config/version.php
# package-lock.json
# package.json
# 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/views/custom_fields/fieldsets/view.blade.php
# resources/views/layouts/default.blade.php
# routes/web.php
# routes/web/fields.php
|
2021-11-15 19:24:38 -08:00 |
|
|
snipe
|
ce69e54202
|
Merge pull request #10297 from snipe/features/backup_importer_ui
v6 Feature - Added backup restore from GUI
|
2021-11-15 19:09:37 -08:00 |
|
|
snipe
|
e75a5f13ec
|
Merge pull request #10303 from inietov/fixes/weird_field_showing_up
Added the current_value string to correspondig 'en' language directory
|
2021-11-15 14:29:34 -08:00 |
|
|
snipe
|
cf4e13f4df
|
Merge pull request #10312 from andrewshulgin/patch-1
Fixed: #10311: Docker: ldap_client_tls.{key,cert} are located in /var/www/html/storage instead of /var/lib/snipeit/keys
|
2021-11-15 14:28:59 -08:00 |
|
|
snipe
|
8e7565cbe9
|
Merge pull request #10313 from snipe/snyk-fix-d1fb08ebb2899913c99652bb6e188696
[Snyk] Security upgrade bootstrap-table from 1.18.3 to 1.19.1
|
2021-11-15 14:28:37 -08:00 |
|