snipe
|
4b303adda7
|
Merge pull request #10080 from uberbrady/upgrade_docker_php74
Upgrade Docker to PHP 7.4
|
2021-09-13 15:30:32 -07:00 |
|
Brady Wetherington
|
37fe4e91b1
|
Upgrade Docker to PHP 7.4
|
2021-09-13 15:24:30 -07:00 |
|
snipe
|
179f26ca2e
|
Merge pull request #10079 from inietov/fixes/archived_assets_showing_in_locations
Awesome, thanks!
|
2021-09-13 14:46:44 -07:00 |
|
Ivan Nieto Vivanco
|
1ae665b645
|
Use the property 'archived' so if the 'name' one changes it doesn't fails
|
2021-09-13 16:45:05 -05:00 |
|
Ivan Nieto Vivanco
|
1b433920f1
|
Delete an extra semicolon
|
2021-09-13 16:24:12 -05:00 |
|
Ivan Nieto Vivanco
|
2b64af0d34
|
Add a condition in the view 'print all assigned' from locations where it skips the assets in relation of if they're archived and that option is marked in the settings
|
2021-09-13 16:17:34 -05:00 |
|
snipe
|
7f31befe5d
|
Merge remote-tracking branch 'origin/develop'
|
2021-09-10 20:46:15 -07:00 |
|
snipe
|
a5409215fc
|
Merge pull request #10070 from snipe/fixes/update_status_label_color_via_api
Fixed #9969 - added color, show_in_nav, and default_label to status l…
|
2021-09-10 20:45:47 -07:00 |
|
snipe
|
80175cffdc
|
Fixed #9969 - added color, show_in_nav, and default_label to status labels API
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-10 20:44:49 -07:00 |
|
snipe
|
f8f969919e
|
Merge remote-tracking branch 'origin/develop'
|
2021-09-10 20:26:37 -07:00 |
|
snipe
|
fb68c49c44
|
Merge pull request #10069 from snipe/fixes/add_use_default_eula_to_category_endpoint
Fixed #9973 - add use_default_eula to category endpoint
|
2021-09-10 20:25:56 -07:00 |
|
snipe
|
514f9aa64a
|
Fixed #9973 - add use_default_eula to categories API endpoint
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-10 20:23:49 -07:00 |
|
snipe
|
0d633688a4
|
Merge pull request #10063 from jasonspriggs/develop
This looks good to me, thanks! I'm not as familiar with Heroku these days (it's been years and years since I've used it), but it seems okay?
|
2021-09-10 18:22:12 -07:00 |
|
Jason Spriggs
|
949454c6d4
|
Minor modifications to documentation for app.json
|
2021-09-09 16:55:26 -04:00 |
|
Jason Spriggs
|
d100a5de72
|
Add Papertrail logging addon
|
2021-09-08 21:11:46 -04:00 |
|
Jason Spriggs
|
acefb3d1b9
|
Add descriptions for some env vars
|
2021-09-08 20:51:43 -04:00 |
|
snipe
|
38a544ea42
|
Updated version branch to master
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-08 13:50:52 -07:00 |
|
snipe
|
a4e307c4db
|
Updated languages
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-08 13:49:33 -07:00 |
|
snipe
|
116bc4ece4
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-08 13:42:48 -07:00 |
|
snipe
|
14a8baecaa
|
Merge pull request #10059 from inietov/fixes/CSV_imports_checkout_to_location
Convert value of column 'checkout type' in CSV file to lowercase
|
2021-09-08 13:31:49 -07:00 |
|
Ivan Nieto Vivanco
|
f1b8b7d11d
|
Convert whatever value we get in column 'checkout type' to all lowercase
|
2021-09-08 12:49:29 -05:00 |
|
snipe
|
c6b3fc219c
|
Merge pull request #10023 from snipe/snyk-fix-deed9a63fc3bf8e6472c4aabe8c95f02
[Snyk] Security upgrade alpine from 3.13 to 3
|
2021-09-07 19:56:10 -07:00 |
|
snipe
|
cfaa6679af
|
Merge pull request #10031 from inietov/fixes/checkout_date_not_saved_in_asset_history
Fixed #10026: Checkout date not saved in asset history
|
2021-09-07 17:37:30 -07:00 |
|
snipe
|
bb5a04491d
|
Merge pull request #10053 from inietov/fixes/accepted_assets_still_showing_unaccepted_report
Fix Accepted Assets still showing on Unaccepted Asset Report
|
2021-09-07 12:15:17 -07:00 |
|
snipe
|
f9c0eee7c9
|
Merge pull request #10048 from inietov/fixes/blank_results_for_non_superadmins
Fix to PR #10009. The asset search now works as intended for normal users
|
2021-09-07 12:14:29 -07:00 |
|
Ivan Nieto Vivanco
|
27ff0be9a8
|
Delete checkout acceptances when an asset is checked in without response
|
2021-09-07 12:01:32 -05:00 |
|
Ivan Nieto Vivanco
|
b5525e6a21
|
Deleted additional bindings present also in the User model
|
2021-09-07 00:57:12 -05:00 |
|
Ivan Nieto Vivanco
|
c3eb7a3425
|
Remove aditional bindings that 'overflows' the generated queries
|
2021-09-07 00:15:21 -05:00 |
|
Jason Spriggs
|
48374f0854
|
Add PUBLIC_FILESYSTEM_DISK
|
2021-09-05 12:21:46 -04:00 |
|
Jason Spriggs
|
bae3c9ce93
|
Add Deploy to Heroku button to README
|
2021-09-05 10:34:48 -04:00 |
|
Jason Spriggs
|
b51392e4a5
|
Add base heroku changes
|
2021-09-05 10:33:13 -04:00 |
|
snipe
|
6bd18ebefa
|
Merge pull request #10043 from benwa/master
Use the new Issues form
|
2021-09-02 16:15:45 -07:00 |
|
Bennett Blodinger
|
034eb5fb07
|
no markdown?
|
2021-09-02 17:48:38 -05:00 |
|
Bennett Blodinger
|
563edddfc5
|
add a feature request
|
2021-09-02 17:47:32 -05:00 |
|
Bennett Blodinger
|
391d4f839a
|
formatting
|
2021-09-02 17:43:24 -05:00 |
|
Bennett Blodinger
|
51a359496a
|
unique IDs
|
2021-09-02 17:37:47 -05:00 |
|
Bennett Blodinger
|
43b7c844b0
|
multiline
|
2021-09-02 17:32:31 -05:00 |
|
Bennett Blodinger
|
a1674f8d58
|
Create config.yml
|
2021-09-02 17:29:36 -05:00 |
|
Bennett Blodinger
|
a8a6950b7e
|
Delete Feature_request.md
|
2021-09-02 17:28:01 -05:00 |
|
Bennett Blodinger
|
4598fcf666
|
Delete Bug_report.md
|
2021-09-02 17:27:46 -05:00 |
|
Bennett Blodinger
|
37eac18c69
|
Create bug_report.yml
Using the (currently in beta) https://docs.github.com/en/communities/using-templates-to-encourage-useful-issues-and-pull-requests/syntax-for-githubs-form-schema
|
2021-09-02 17:27:27 -05:00 |
|
Bennett Blodinger
|
ca3296b65a
|
Update issue templates
|
2021-09-02 16:58:18 -05:00 |
|
snipe
|
a79f49ade3
|
Merge pull request #10034 from snipe/features/ajaxify_depreciation
Fixed [ch15359] ajaxify the depreciation report
|
2021-09-01 18:26:10 -07:00 |
|
snipe
|
a26c227dcb
|
Merge pull request #10018 from jjasghar/patch-1
Fixed typo: Update README.md
|
2021-09-01 17:50:15 -07:00 |
|
snipe
|
94310e18b1
|
Presenters and Transformers for Depreciation report
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-01 17:33:59 -07:00 |
|
snipe
|
2f25eb598b
|
Allow the Assets API controller to handle depreciation reports
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-01 17:33:39 -07:00 |
|
snipe
|
387018c44e
|
Updated depreciation report blade to use server-side API
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-01 17:05:31 -07:00 |
|
snipe
|
67357e07f1
|
Added API route for depreciations report
RED FLAG: This will need to be updated for v6!!!!
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-01 17:05:00 -07:00 |
|
Ivan Nieto Vivanco
|
e621eaf456
|
Change date showed in the activity report view, the condition is now on action_date
|
2021-09-01 13:58:17 -05:00 |
|
Ivan Nieto Vivanco
|
ea1d7a42e2
|
Add condition to check if action_date have value and if it have assign it to created_at parameter
|
2021-09-01 13:08:08 -05:00 |
|