snipe
5ff1b5fd50
Increased throttle
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 19:39:50 -07:00
snipe
57720cb978
Added comment block
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 19:12:57 -07:00
snipe
284dbb7553
Set higher threshhold, moved throttle settings
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 19:11:39 -07:00
snipe
791f77f641
Fixed throttle variables
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 18:41:12 -07:00
snipe
a758e825ed
Dev assets
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-15 13:45:33 -07:00
snipe
e935a34946
Merge remote-tracking branch 'origin/develop'
2022-06-14 16:25:50 -07:00
snipe
cc6a2f2d49
Use the Deja Vu font to be able to support cyrllic, etc
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-14 16:23:30 -07:00
snipe
1806dacb9d
Bumped hash on master to 6.0.4
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
2022-06-13 23:59:43 -07:00
snipe
abb7f23ca5
Bumped version to 6.0.4
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-13 23:58:53 -07:00
snipe
3e8837dd6e
Bumped dev branch to 6.0.3
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-13 22:13:18 -07:00
snipe
ea1ff1e8bb
Bumped version to 6.0.3
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-13 22:12:40 -07:00
snipe
3dedd51b84
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
2022-06-05 17:16:21 -07:00
snipe
711c713ab8
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 17:15:29 -07:00
snipe
089704c4f9
Merge remote-tracking branch 'origin/develop'
2022-05-31 14:17:23 -07:00
snipe
c031686825
Fixed path
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-25 15:12:38 -07:00
snipe
791c39d977
Starter Livewire config (for subdirectories)
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-25 15:10:20 -07:00
snipe
2db6cf85a7
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
2022-05-24 15:10:46 -07:00
snipe
72799973e7
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-24 14:41:44 -07:00
snipe
b8e6df545a
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-23 18:55:57 -07:00
snipe
b32fba7f8a
Switch to master
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-16 15:33:26 -07:00
snipe
7573a03cc5
Bumped minor version
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-16 15:32:57 -07:00
Brady Wetherington
0ddb0f2c81
Switch the barcode backend to SVG, and fix the two-factor middleware
2022-05-13 14:22:27 -07:00
snipe
293e3e02e4
Updated cookie name
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 12:07:00 -07:00
snipe
64dc6fbd9c
Switched branch to master
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 11:52:27 -07:00
snipe
e55aac7fea
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 11:51:41 -07:00
snipe
ef1eb15a91
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/permissions.php
2022-05-12 09:31:42 -07:00
snipe
c0ef27fc9e
Removed kit checkout permission - it’s just confusing
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-11 19:02:11 -07:00
snipe
816437b4d8
Updated hash
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-10 17:28:11 -07:00
snipe
a43b54cc8d
Bumped hash for clarity
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 02:13:56 -07:00
snipe
31f2b73e5a
Bumped version to GM
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-05 10:55:29 -07:00
snipe
57ed3afcc4
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2022-05-04 16:50:50 -07:00
snipe
150724b744
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-28 17:51:27 +01:00
Christian Weirich
4be6288ae3
Possibility to set region for AWS (SES)
2022-04-27 15:26:33 +02:00
snipe
e4ef970934
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-15 12:26:58 +01:00
snipe
61f5825c69
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2022-04-11 15:37:38 +01:00
Brady Wetherington
6756dd193e
SCIM integration using the 're-do-the routes' approach, which seems like a dead-end
...
Cleaning up routes to match laravel-scim-server's recommended implementation
Some actually *working* changes for SCIM support?!
Whoops, forgot my route file
Fix public SCIM routes
Removed Ziggy, removed old generated file, yanked Ziggy references
Resolves the first set of comments for SCIM
Ensure all /api routes have baseUrl prepended
Fix the parent:: call to be, uh, actually correct :P
Clarify the route-ordering, as it is quite tricky
This gets it so that users can actually be saved..
Work around the lack of callbacks with some inheritance
Mapped a bunch more fields from SCIM into Snipe-IT's user table
More baseUrl shenanigans since we yanked Ziggy :/
Properly map job title and work with some other necessary attributes
Map more fields...
Finalized basic mapping for core and enterprise namespaces
Latest tuned settings for SCIM config to work with Azure (and others)
2022-04-05 20:26:37 +01:00
snipe
f7cd21a007
Sigh.
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-29 22:59:52 +01:00
snipe
a937bd34f6
Merge master back down into develop
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-29 16:28:43 +01:00
Godfrey Martinez
fe6a6740db
Merge branch 'develop' into feature/sc-15014/asset-acceptance-and-signed-eula-as-pdf
2022-03-22 10:10:56 -07:00
snipe
c0451fe17a
Bumped version to v6.0.0-RC-5
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-16 18:10:17 +00:00
snipe
349715576a
Bumped RC version
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 22:23:24 -08:00
snipe
b876d0abb0
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# .env.example
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Kernel.php
# app/Http/Transformers/ActionlogsTransformer.php
# app/Importer/AssetImporter.php
# app/Models/Accessory.php
# app/Models/Consumable.php
# app/Presenters/AccessoryPresenter.php
# app/Presenters/ComponentPresenter.php
# app/Presenters/ConsumablePresenter.php
# app/Providers/AuthServiceProvider.php
# composer.json
# composer.lock
# config/app.php
# config/cors.php
# config/version.php
# package-lock.json
# public/js/build/app.js
# public/js/build/app.js.LICENSE.txt
# public/js/dist/all.js
# public/mix-manifest.json
# resources/views/accessories/view.blade.php
# resources/views/consumables/view.blade.php
# resources/views/settings/saml.blade.php
# routes/api.php
2022-03-03 21:59:38 -08:00
snipe
afd83311aa
Fixed version number (vV)
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 20:58:54 -08:00
snipe
fa576bc78f
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2022-03-03 20:45:34 -08:00
snipe
336d8e6574
Updated version
2022-02-24 18:17:15 -08:00
Godfrey M
533670f3f1
faulty method for converting asset acceptance to pdf
2022-02-24 14:50:16 -08:00
snipe
50f55b4308
Fixes broken API throttling
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-24 13:10:10 -08:00
snipe
a8028e7dd0
Merge pull request #10727 from uberbrady/master
...
Fix for negative CORS/SAML interaction
2022-02-23 11:17:17 -08:00
Brady Wetherington
15abc84ab0
Migrate to Fruitcake/laravel-cors which has path-exclusion built-in
2022-02-23 11:06:19 -08:00
snipe
42fcd29200
Fixed #10436 on master, applies #10449
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-22 21:06:54 -08:00
Brady Wetherington
cd2c92fd6c
Cors should respect the .env var for CORS domains
2022-02-22 19:00:59 -08:00
snipe
784bf6f223
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-20 13:30:24 -08:00
snipe
8624531f78
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-13 12:01:37 -07:00
snipe
e032cf1fda
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-11 13:07:26 -08:00
snipe
d2655c1092
Bumped RC version
...
Signed-off-by: snipe <snipe@snipe.net>
2022-02-01 18:54:46 -08:00
snipe
a0d0645453
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-28 12:38:42 -08:00
snipe
cfb64be9a4
More specific RC version number
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-13 21:41:04 -08:00
snipe
91017aed52
Bumped to RC-1
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-13 21:38:10 -08:00
snipe
ae50f86c39
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-12 20:52:30 -08:00
snipe
bc10761b49
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2022-01-11 12:44:16 -08:00
Alex Janes
edef640d35
Merge branch 'develop' into features/lock_logins_to_saml
2022-01-11 09:05:14 -05:00
Brady Wetherington
3c7f2e89ec
Merge branch 'develop' into remove_old_ldap
...
Had to re-do the composer install because the conflicts were too complicated.
2022-01-03 12:56:58 -08:00
Alex Janes
74de91c31a
Merge pull request #1 from snipe/develop
...
Develop
2021-12-17 14:51:03 -05:00
snipe
04f4bb83e9
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-16 20:37:22 -08:00
snipe
6be98638ed
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-16 14:29:38 -08:00
Alex Janes
6898119891
Replaced env() with config() to check environment variables
...
Made the app.php description for 'REQUIRE_SAML' a bit more... descriptive.
2021-12-16 16:56:39 -05:00
Alex Janes
3c8d70c5fb
Add option to environment to require SAML for a more secure installation.
2021-12-16 11:44:07 -05:00
snipe
02be4773de
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-13 12:07:34 -08:00
snipe
e5f4048e9e
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-12-13 11:01:02 -08:00
snipe
8028b39b43
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-24 19:58:43 -08:00
snipe
78809c0fe7
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-16 12:02:45 -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
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
960028b376
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-11-03 16:04:39 -07:00
Brady Wetherington
4dda28de9e
WIP: cleaning up LDAP
2021-10-28 18:19:50 -07:00
snipe
aa8f1378c9
Merge remote-tracking branch 'origin/master' into develop
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# README.md
# app/Http/Controllers/Accessories/AccessoriesController.php
# app/Http/Controllers/Api/AssetMaintenancesController.php
# app/Http/Controllers/Api/AssetModelsController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetMaintenancesController.php
# app/Http/Controllers/Assets/AssetFilesController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Assets/BulkAssetsController.php
# app/Http/Controllers/Components/ComponentsController.php
# app/Http/Controllers/Consumables/ConsumablesController.php
# app/Http/Controllers/Licenses/LicenseFilesController.php
# app/Http/Controllers/Licenses/LicensesController.php
# app/Http/Controllers/Users/UserFilesController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Http/Transformers/LicensesTransformer.php
# app/Importer/UserImporter.php
# app/Models/Asset.php
# config/app.php
# config/version.php
# package-lock.json
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/lang/en/admin/users/message.php
# resources/lang/is/button.php
# resources/lang/ja/admin/kits/general.php
# resources/lang/ro/admin/users/general.php
# resources/lang/zh-HK/admin/depreciations/general.php
# resources/lang/zh-HK/admin/models/general.php
# resources/views/hardware/qr-view.blade.php
# resources/views/hardware/view.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/users/view.blade.php
# routes/web.php
# routes/web/hardware.php
# routes/web/models.php
# routes/web/users.php
2021-10-20 17:26:41 -07:00
snipe
a88f622ec3
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-10-18 16:45:51 -07:00
snipe
61f16f47a2
Use Helper alias
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-28 19:44:55 -07:00
Brady Wetherington
f380da3f19
Try to ensure all currency output is formatted correctly.
2021-09-28 16:45:47 -07:00
snipe
38a544ea42
Updated version branch to master
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-08 13:50:52 -07:00
snipe
116bc4ece4
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-09-08 13:42:48 -07:00
snipe
5c92ddb2c6
Fixed version back to develop from master downmerge
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-30 12:57:06 -07:00
snipe
f99602c039
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
2021-08-18 00:47:33 -07:00
snipe
0aa328f908
Updated hash
...
Signed-off-by: snipe <snipe@snipe.net>
2021-08-18 00:45:35 -07:00
snipe
615bdd0499
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net>
2021-07-15 13:29:07 -07:00
snipe
5b5b70e639
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
2021-06-28 11:01:45 -07:00
snipe
6521f16b80
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-28 11:00:34 -07:00
snipe
2e6bac7db5
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-23 18:36:43 -07:00
snipe
335f4e50a5
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
2021-06-23 16:07:01 -07:00
snipe
1808986bf5
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-23 16:06:30 -07:00
snipe
a67ce965ec
Update version.php
2021-06-22 20:13:03 -07:00
snipe
aebb30cea8
Fixed Cors wildcard
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-12 00:23:51 -07:00
snipe
2cddd7faf0
Fixed filesystem config
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-11 14:26:10 -07:00
snipe
a5f144b4e0
Merge branch 'shift-46327' into develop-v6-integration
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
2021-06-11 14:10:10 -07:00
snipe
a8123092af
Misc fixes for shift
...
// TODO - re-fix the exception handler
Signed-off-by: snipe <snipe@snipe.net>
2021-06-11 14:07:50 -07:00
snipe
aae6a8fc6c
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-06-10 17:42:29 -07:00
Laravel Shift
7e93086dd4
Default config files
...
In an effort to make upgrading the constantly changing config files
easier, Shift defaulted them and merged your true customizations -
where ENV variables may not be used.
2021-06-10 20:18:10 +00:00
Laravel Shift
cc3c59bf97
Shift config files
2021-06-10 20:18:10 +00: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
snipe
7d5a9180e6
Updated hash
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-26 15:57:56 -07:00
snipe
aa98e4ea7a
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
2021-05-05 00:04:17 -07:00
snipe
6935d94184
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net>
2021-05-05 00:03:33 -07:00
snipe
a1bc984d17
Generate production assets, bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-26 17:34:02 -07:00
snipe
31944cd4d4
Bumped version
...
Signed-off-by: snipe <snipe@snipe.net>
2021-04-26 17:28:38 -07:00
Renee Margaret McConahy
e6c3d7fe57
Restore LOG_CHANNEL environment variable. ( #9464 )
...
This allows selecting the Monolog channel with the LOG_CHANNEL variable.
2021-04-21 11:40:23 -07:00
Brady Wetherington
792a31cc7f
Merge branch 'develop'
2021-04-06 20:10:22 -07:00
Tetrachloromethane250
157d9e4ebb
Added #5977 : Add permission to view files attached to licenses ( #9264 )
...
* Add permission to view and modify files for licenses
* Actually use the permission
2021-04-05 21:51:47 -07:00
snipe
b2a3a80f96
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# composer.lock
# config/version.php
2021-03-17 20:04:43 -07:00
snipe
afb7fcfa3e
Bumped hash
...
Signed-off-by: snipe <snipe@snipe.net>
2021-03-17 20:02:54 -07:00
snipe
9f3a8a43cc
Merge remote-tracking branch 'origin/develop'
...
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# composer.lock
2021-03-17 19:41:02 -07:00
snipe
72f7baf5ee
Removed unused class references
2021-03-17 16:56:32 -07:00
snipe
ab092fd209
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# app/Providers/AppServiceProvider.php
# config/logging.php
# config/services.php
2021-03-15 12:29:29 -07:00
snipe
3fc24b4e61
Set spatie encryption to null
2021-03-09 21:07:41 -08:00
snipe
0fa07a4bca
Bumped point version
2021-03-09 16:19:21 -08:00
snipe
c3871c98df
Updated rollbar package
2021-03-09 16:16:57 -08:00
snipe
f05a8d782c
Added spatie encryption line
2021-03-09 13:38:53 -08:00
snipe
e9ee9ea2e9
Fixed rollbar integration
2021-03-09 12:40:00 -08:00
snipe
fcd805638e
Changed branch from develop to master
2021-02-25 16:54:23 -08:00
snipe
6373ef3283
Bumped version
2021-02-25 16:53:37 -08:00
snipe
db3f80bb9b
Fixed #9198 - added stdout as a log driver
2021-02-24 09:10:03 -08:00
snipe
a5731a3088
Updated hash
2021-02-19 10:09:22 -08:00
snipe
681c41bd18
Bumped version
2021-02-05 14:28:31 -08:00
snipe
fdde844ce5
Bumped version to 5.1.0
2021-02-02 21:48:42 -08:00
snipe
bf7a856fa6
Update minimum PHP requirements to 7.2.5
2021-02-02 21:05:37 -08:00
snipe
f871759753
Bumped version to 5.0.13-pre
2021-01-26 20:08:44 -08:00
snipe
8e17818f1e
Bumped version to 5.0.13-pre
2021-01-26 20:08:08 -08:00
snipe
01d3606c42
Merge remote-tracking branch 'origin/develop'
2021-01-26 12:20:57 -08:00
Ivan Nieto
79549dbfb9
Use the correct env variables in config/auth.php file. ( #9048 )
2021-01-26 12:04:41 -08:00
snipe
eb423c252a
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# config/version.php
2021-01-04 09:09:39 -08:00
snipe
4a5cb94d94
Switch version file back to develop
2020-12-14 17:47:02 -08:00
Alexander Chibrikin
fb37dbed92
use supported package for slack ( #8867 )
...
* Updated version.php to master
* use supported package for slack
Co-authored-by: snipe <snipe@snipe.net>
2020-12-14 17:45:00 -08:00
snipe
adc0d3a6ac
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# config/version.php
2020-12-08 16:53:43 -08:00
snipe
8b15841c4b
Bumped version
2020-12-07 19:16:42 -08:00
snipe
60d269afb5
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# config/version.php
2020-11-30 17:28:46 -08:00
snipe
e2cb7a0242
Bumped version
2020-11-30 17:28:03 -08:00
snipe
74b26a349c
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# config/version.php
2020-11-24 13:54:02 -08:00
snipe
e9bfb157bb
Bumped version. Again.
2020-11-24 13:53:28 -08:00
snipe
02fef7049f
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# config/version.php
2020-11-24 12:17:38 -08:00
snipe
712363f861
Bumped version
2020-11-23 12:33:07 -08:00
snipe
124af6ac6b
Merge remote-tracking branch 'origin/develop'
2020-11-17 14:33:35 -08:00
snipe
7f126969d0
Fixed #8601 - Switched to “attachment” from “base64”
2020-11-17 14:33:16 -08:00
snipe
e5f0a12c25
Updated version.php to master
2020-11-17 00:14:28 -08:00
snipe
3237411b5d
Bumped version
2020-11-16 23:57:17 -08:00
snipe
58c476195b
Bumped hash
2020-11-13 14:14:27 -08:00
snipe
dcd98a7bf1
Bumped hash
2020-11-13 14:13:44 -08:00
snipe
2aa9412565
Bumped version
...
# Conflicts:
# config/version.php
2020-11-09 23:09:46 -08:00
snipe
35ab5c7df0
Bumped version
2020-11-09 23:09:10 -08:00
snipe
b7cc12a466
Merge remote-tracking branch 'origin/develop'
2020-11-09 22:53:23 -08:00
snipe
5abfbdd1d2
Allow API token expiration in years to be configured via env
2020-11-09 22:52:55 -08:00
snipe
b59269d5e2
Bumped version
2020-11-09 21:46:42 -08:00
snipe
8bbf8409b1
Bumped hash
2020-11-09 21:46:08 -08:00
snipe
d76eea53c4
Bumped hash
2020-11-09 19:45:27 -08:00
snipe
e0103a7fbd
Fixed #8595 - Updated spatie settings
2020-11-03 14:50:02 -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
9f4a212b44
Bumped hash
2020-11-03 11:47:58 -08:00
snipe
12667f41b9
bumped hash
2020-11-03 11:47:13 -08:00
snipe
b29f794b35
password.expire updated for forgotten password token expiration
2020-11-02 23:58:09 -08:00
snipe
001bb3cbe2
Bumped version to “pre”
2020-10-26 15:04:22 -07:00
snipe
2844800caf
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# config/version.php
2020-10-26 14:26:05 -07:00
snipe
7937258f6e
Bumped version
2020-10-26 14:24:19 -07:00
snipe
c93f4ef0d5
Merge remote-tracking branch 'origin/develop'
2020-10-23 19:50:56 -07:00
snipe
2602e4d602
Exclude the config directory from backups
...
Everything there is handled via .env anyway
2020-10-23 18:21:32 -07:00
snipe
79a4acae1a
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# config/version.php
2020-10-23 14:29:40 -07:00
snipe
91e0b26bbb
Bumped version
2020-10-23 14:28:55 -07:00
snipe
f182ce1c89
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# config/version.php
2020-10-23 01:12:54 -07:00
snipe
c6dde67e86
Bumped version
2020-10-23 01:12:19 -07:00
snipe
810f6a3970
Merge remote-tracking branch 'origin/develop'
...
# Conflicts:
# config/version.php
2020-10-21 12:03:23 -07:00
snipe
33236f16ac
Bumped minor version
2020-10-21 12:01:36 -07:00
Folke Ashberg
1687e4b850
Fix for Issue #8543
...
* trustedproxy.php sets 'proxies' again according to
env('APP_TRUSTED_PROXIES') again
2020-10-21 10:36:27 +02:00
snipe
870b097f03
Derp. Should be master
2020-10-19 17:49:56 -07:00
snipe
a62e8413ba
Updated version
2020-10-19 16:36:25 -07:00
snipe
2dc027e479
Bumped GM version
2020-10-09 17:29:31 -07:00
snipe
4dbf1f58e3
Bumped RC to GM
2020-10-06 19:11:34 -07:00
snipe
b0e9875a50
Counting is hard. :(
2020-09-24 14:20:29 -07:00
snipe
7314bc4c4e
Bumped hash for newest RC
2020-09-24 14:19:34 -07:00
Bennett Blodinger
83dfa2a28c
Merge branch 'develop' into gmaps-8465
2020-09-22 17:41:38 -05:00
snipe
b9e19468e5
Bumped version for v4.9.5
2020-09-15 18:43:19 -07:00
snipe
426897c902
Bumped hash
2020-09-15 10:13:55 -07:00
snipe
24a52eaeae
Bumped hash
2020-09-12 10:04:36 -07:00
snipe
e321aeabae
Merge branch 'master' into integrations/2020-08-31-v5-rc
...
# Conflicts:
# .all-contributorsrc
# .nvmrc
# README.md
# app/Console/Commands/LdapSync.php
# app/Http/Controllers/Api/ConsumablesController.php
# app/Http/Controllers/Api/ImportController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/LoginController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/UsersController.php
# app/Importer/import_mappings.md
# app/Models/Ldap.php
# app/Models/Loggable.php
# composer.json
# composer.lock
# config/version.php
# public/css/build/all.css
# public/css/dist/all.css
# public/css/skins/skin-contrast.css
# public/css/skins/skin-contrast.css.map
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/dist/all.js
# public/mix-manifest.json
# resources/assets/js/components/importer/importer-file.vue
# resources/assets/less/overrides.less
# resources/macros/macros.php
# resources/views/custom_fields/fieldsets/view.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/labels.blade.php
# resources/views/hardware/view.blade.php
# resources/views/layouts/default.blade.php
# resources/views/modals/model.blade.php
# resources/views/modals/user.blade.php
# resources/views/users/index.blade.php
# routes/api.php
# routes/web/fields.php
# tests/unit/UserTest.php
2020-08-31 12:14:44 -07:00
snipe
5aaa2430b4
Fixes for backups
2020-08-28 14:10:43 -07:00
snipe
daf748e531
Bumped hash
2020-07-17 12:32:01 -07:00
snipe
ec6ed256fb
Bumped minor version
2020-07-06 18:45:43 -07:00
snipe
05b3a9ad7e
Config variable for HSTS
2020-06-22 23:17:27 -07:00
snipe
af06e42056
Bumped version
2020-06-17 11:17:25 -07:00
snipe
7a785b4952
Updated a few flysystem settings
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-28 01:54:29 -07:00
snipe
42fe1ea398
Set public files specifically to public
...
Signed-off-by: snipe <snipe@snipe.net>
2020-05-27 02:30:43 -07:00
Brady Wetherington
b03f8a2425
Tweak to Flysystem's filesystems.php to make it work with Snipe-IT
2020-05-11 21:41:56 -07:00
Johnson Yi
b2930d6069
Added #542 : add saml authentication
2020-05-06 00:06:19 +10:00
snipe
87464e6ec0
Merge branch 'develop' into integrations/2020-04-15-v5-merge
...
# Conflicts:
# README.md
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/ComponentsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Controllers/UsersController.php
# app/Http/Requests/AssetRequest.php
# app/Http/Requests/ImageUploadRequest.php
# app/Models/LicenseSeat.php
# app/Models/Location.php
# app/Models/Setting.php
# composer.json
# composer.lock
# config/database.php
# config/version.php
# npm-shrinkwrap.json
# package.json
# public/css/AdminLTE.css
# public/css/AdminLTE.css.map
# public/css/overrides.css
# public/css/overrides.css.map
# public/css/skins/skin-blue-light.css
# public/css/skins/skin-blue.css
# public/css/skins/skin-green-dark.min.css
# public/js/app.js
# public/js/bootstrap-table.js
# public/js/bootstrap/js/bootstrap.js
# public/js/bootstrap/js/bootstrap.min.js
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/demo.js
# public/js/ekko-lightbox.js
# public/js/ekko-lightbox.min.js
# public/js/extensions/export/bootstrap-table-export.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js
# public/js/extensions/toolbar/bootstrap-table-toolbar.min.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# public/js/plugins/timepicker/bootstrap-timepicker.js
# public/js/plugins/timepicker/bootstrap-timepicker.min.js
# public/js/vue.js
# public/mix-manifest.json
# resources/assets/js/bootstrap-js.js
# resources/assets/js/bootstrap.min.js
# resources/assets/js/ekko-lightbox.js
# resources/assets/js/ekko-lightbox.min.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# resources/assets/js/plugins/chartjs/Chart.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js
# resources/assets/less/AdminLTE.less
# resources/assets/less/overrides.less
# resources/assets/less/skins/_all-skins.less
# resources/assets/less/skins/skin-black.less
# resources/assets/less/skins/skin-blue.less
# resources/assets/less/skins/skin-green.less
# resources/assets/less/skins/skin-purple.less
# resources/assets/less/skins/skin-red.less
# resources/assets/less/skins/skin-yellow.less
# resources/assets/less/variables.less
# resources/js/components/importer/importer-file.vue
# resources/lang/en/auth/message.php
# resources/lang/en/passwords.php
# resources/lang/es-CO/general.php
# resources/lang/es-ES/general.php
# resources/lang/es-VE/general.php
# resources/less/skins/skin-black-dark.less
# resources/less/skins/skin-blue-dark.less
# resources/less/skins/skin-contrast.less
# resources/less/skins/skin-green-dark.less
# resources/less/skins/skin-orange-dark.less
# resources/less/skins/skin-orange.less
# resources/less/skins/skin-purple-dark.less
# resources/less/skins/skin-red-dark.less
# resources/less/skins/skin-yellow-dark.less
# resources/views/accessories/checkin.blade.php
# resources/views/accessories/checkout.blade.php
# resources/views/accessories/edit.blade.php
# resources/views/account/profile.blade.php
# resources/views/account/view-assets.blade.php
# resources/views/asset_maintenances/edit.blade.php
# resources/views/auth/passwords/email.blade.php
# resources/views/auth/passwords/reset.blade.php
# resources/views/categories/edit.blade.php
# resources/views/companies/edit.blade.php
# resources/views/components/checkin.blade.php
# resources/views/components/checkout.blade.php
# resources/views/components/edit.blade.php
# resources/views/consumables/checkout.blade.php
# resources/views/consumables/edit.blade.php
# resources/views/custom_fields/fields/edit.blade.php
# resources/views/custom_fields/fieldsets/edit.blade.php
# resources/views/dashboard.blade.php
# resources/views/departments/edit.blade.php
# resources/views/groups/edit.blade.php
# resources/views/hardware/audit.blade.php
# resources/views/hardware/bulk-checkout.blade.php
# resources/views/hardware/bulk.blade.php
# resources/views/hardware/checkin.blade.php
# resources/views/hardware/checkout.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/index.blade.php
# resources/views/hardware/quickscan.blade.php
# resources/views/hardware/view.blade.php
# resources/views/importer/import.blade.php
# resources/views/layouts/basic.blade.php
# resources/views/layouts/default.blade.php
# resources/views/layouts/edit-form.blade.php
# resources/views/licenses/checkin.blade.php
# resources/views/licenses/checkout.blade.php
# resources/views/licenses/edit.blade.php
# resources/views/locations/edit.blade.php
# resources/views/manufacturers/edit.blade.php
# resources/views/modals/upload-file.blade.php
# resources/views/models/bulk-edit.blade.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/models/edit.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/address.blade.php
# resources/views/partials/forms/edit/asset-select.blade.php
# resources/views/partials/forms/edit/category-select.blade.php
# resources/views/partials/forms/edit/category.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# resources/views/partials/forms/edit/company.blade.php
# resources/views/partials/forms/edit/department-select.blade.php
# resources/views/partials/forms/edit/depreciation.blade.php
# resources/views/partials/forms/edit/email.blade.php
# resources/views/partials/forms/edit/image-upload.blade.php
# resources/views/partials/forms/edit/item_number.blade.php
# resources/views/partials/forms/edit/location-profile-select.blade.php
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/location.blade.php
# resources/views/partials/forms/edit/maintenance_type.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/manufacturer.blade.php
# resources/views/partials/forms/edit/minimum_quantity.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/model_number.blade.php
# resources/views/partials/forms/edit/name.blade.php
# resources/views/partials/forms/edit/notes.blade.php
# resources/views/partials/forms/edit/order_number.blade.php
# resources/views/partials/forms/edit/phone.blade.php
# resources/views/partials/forms/edit/purchase_cost.blade.php
# resources/views/partials/forms/edit/purchase_date.blade.php
# resources/views/partials/forms/edit/quantity.blade.php
# resources/views/partials/forms/edit/serial.blade.php
# resources/views/partials/forms/edit/status.blade.php
# resources/views/partials/forms/edit/submit.blade.php
# resources/views/partials/forms/edit/supplier-select.blade.php
# resources/views/partials/forms/edit/supplier.blade.php
# resources/views/partials/forms/edit/user-select.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/alerts.blade.php
# resources/views/settings/asset_tags.blade.php
# resources/views/settings/barcodes.blade.php
# resources/views/settings/branding.blade.php
# resources/views/settings/general.blade.php
# resources/views/settings/labels.blade.php
# resources/views/settings/ldap.blade.php
# resources/views/settings/localization.blade.php
# resources/views/settings/security.blade.php
# resources/views/setup/user.blade.php
# resources/views/suppliers/edit.blade.php
# resources/views/users/bulk-edit.blade.php
# resources/views/users/edit.blade.php
# resources/views/users/ldap.blade.php
# resources/views/users/print.blade.php
# resources/views/users/view.blade.php
# routes/api.php
# routes/web/hardware.php
# webpack.mix.js
2020-04-20 23:20:34 -07:00
snipe
48dfc699d7
Bumped version
2020-04-09 10:49:50 -07:00
snipe
be3e572440
Bumped version
2020-04-08 11:24:30 -07:00
snipe
be79a1f3d6
Bumped hash
2020-04-02 19:27:41 -07:00
snipe
a2fae76eaf
Bumped version
2020-03-04 22:37:17 -08:00
snipe
803f5ad0ab
Fixed #7870 : fixed SSL connectivity for PaaS DBs ( #7874 )
2020-03-04 19:39:23 -08:00
snipe
03c5a42f5a
Fixes for flysystem paths :(
2020-02-11 20:22:55 -08:00
snipe
5ef40340fb
Bumped version
2019-12-11 19:38:04 -08:00
snipe
296de34e8a
WIP: Upgrade develop to Laravel 6.6.1 ( #7637 )
...
I'm going ahead and merging this, since the upgrade doesn't break Flysystem any worse than the current develop is broken, so far as I can tell.
* Upgraded framework to Laravel 6
### TO DO:
- Fix password restriction rules- the old library isn’t compatible with Laravel 6 :(
- Figure out why in-app API calls are returning “Unauthorized”
* More updates from Input:: to Request:: helper
* Switch to Request:: from Input
* Added passport config
* Fixed goofy password minimum in seeder
* Added laravel/helpers
* Changed ($item) to ($item->id) in forms
I have no idea why this is necessary
* Changed ($item) to ($item->id) in forms
* Updated API middleware to auth:api
* Updated with added laravel auth.php values
* FIxed *&!^$%^&$^%!!!! ajax issue
* Switch to Request::get from Input::get
* Switched to Request facade
* Added password security minimums back in
The package we were using has not been updated to Laravel v6, so I created custom validators instead
* Added language strings for error messages for password rules
* Fixed `($item)` issue in formActions for partials
2019-12-10 19:32:50 -08:00
snipe
91bb76fd8a
Bumped version
2019-12-06 13:05:20 -08:00
snipe
c635db0a76
Fixed upload parh for asset models
2019-12-04 15:23:49 -08:00