DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-19 03:54:16 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
12913 commits 97 branches 267 tags 296 MiB
Commit graph

12913 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 1e8c32fbdb Fixed - missing table prefix for location parent search 2018-02-21 04:33:47 -08:00
snipe 97bd87773c Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-21 02:40:23 -08:00
snipe b560828173 Bumped hash 2018-02-21 02:18:14 -08:00
snipe 0d7a43ab38 Fixed orderby parent location name 2018-02-21 02:17:18 -08:00
snipe 7865fbea7e Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-21 01:27:11 -08:00
snipe 5fcbf9091e Bumped version 2018-02-21 01:23:19 -08:00
snipe fedd2b638c Merge branch 'develop' 2018-02-21 01:20:48 -08:00
snipe 22f44e342f Fixed incorrect next audit date if asset override 2018-02-21 01:18:21 -08:00
snipe f7eb013935 Reverse order on activity report 2018-02-20 15:42:44 -08:00
snipe 1c28f893e7 Fixed #5027 - remove link to non-existant reports page 2018-02-20 14:44:29 -08:00
snipe 195dfd752d Updated translations 2018-02-20 14:41:12 -08:00
snipe cc788d3b62 Added Slovenian 2018-02-20 14:37:22 -08:00
snipe e54021e7be Added Venzuelan spanish 2018-02-20 14:37:12 -08:00
snipe 918db39eba Merge branch 'develop' 2018-02-19 18:06:58 -08:00
snipe 213fe2ecea Fixed #5044 - incorrect env values for SSL DB paths 2018-02-19 18:03:50 -08:00
snipe 6e70352d0b Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-02-17 01:05:20 -08:00
snipe d2403cdadb Added image preview for uploads 2018-02-17 00:51:22 -08:00
snipe 9a4f5e0ba8 Bumped hash 2018-02-16 22:10:06 -08:00
snipe 502e4d672a Use image upload partial in asset edit/create 2018-02-16 22:08:49 -08:00
snipe 99205bf72e Merge branch 'develop' 2018-02-16 21:39:15 -08:00
snipe b3d673b0aa Fixed #5037 - use line breaks in notes in table view 2018-02-16 21:38:56 -08:00
snipe baf51eb430 Merge branch 'develop' 2018-02-16 21:19:03 -08:00
snipe d8fc50c351 Fixed #5033 - use PHP’s max filesize for image uploads 2018-02-16 21:17:41 -08:00
snipe ba5057181e Check for model in asset view 2018-02-16 18:04:11 -08:00
snipe 4c4dee0bf1 Use dropifexists for rollback 2018-02-16 17:45:40 -08:00
snipe 589c3a2be3 Fixed #4668 - wrong gate on manufacturer save 2018-02-16 17:45:27 -08:00
snipe 991f182f89 Added drop table to migration 2018-02-16 15:36:33 -08:00
snipe f44b03f5a9 Updated sticky table header extenion 2018-02-16 15:36:21 -08:00
snipe 5fd50040d3 Fixed weird migration 2018-02-16 15:31:47 -08:00
snipe 5302108556 Update to master 2018-02-16 13:27:03 -08:00
snipe 592c62de75 Merge branch 'develop' 
# Conflicts:
#	README.md
#	config/version.php
 2018-02-16 13:26:53 -08:00
snipe 27c1bc0271 Bumped hash 2018-02-16 13:24:47 -08:00
snipe 3744a68daf
Features/better table options (#5018) 
* Added CSS for table toolbar

* Use maintenances API for table listings

* NIcer layout for allowed_columns in maintenances API

* Fixed #5014 - bootstrap cookie issues

* Fixed #5015 - bug when saving settings

* Refactored datatable code to use data attributes

* Updated dashboard with new table code

* Added - Order by group user count

* Updated groups to use new table attributes

* New license listing table code

* More bootstrap table implementations

* More BS table refactoring

* Improved bootstrap assigned assets

* New bootstrap for reports

* Misc BS fixes

* FIxed small issue with asset history display

* Removed multisort option

* JS refactor
 2018-02-16 13:22:55 -08:00
dl1l c209b7bb5d Update edit.blade.php (#5019) 2018-02-15 14:59:54 -08:00
snipe f04493c1ab Added firstname_lastname as possible username format 2018-02-13 20:31:51 -08:00
snipe 62edf14893 Refactored method to generate usernames from full names 2018-02-13 20:31:11 -08:00
snipe 0d11e32523 Fixed issue where group with no permissions would crash view page 2018-02-13 17:14:30 -08:00
snipe 5484b06df8 Fixed #4923 - invalid check for location object in Ldap Sync 2018-02-13 17:06:42 -08:00
snipe 9f3116e4e3 Added - Deep linking in Bootstrap tabs 2018-02-13 17:04:50 -08:00
snipe f144d671ff Fixed #4988 - incorrect variable name in asset checkout API method 2018-02-12 19:13:33 -08:00
snipe b294635e17 Updated packages 2018-02-08 09:29:12 -08:00
snipe 36234cc0e8 Add @seanmcilvenna as a contributor 2018-02-08 09:29:12 -08:00
snipe 5c87003196 Added code triage badge 2018-02-08 09:29:12 -08:00
Sean McIlvenna cc5d36f8be Addng "Category" column to "view assets" and re-organizing columns (#4970) 2018-02-05 17:36:35 -06:00
README Bot 1359a4f88a Add CodeTriage badge to snipe/snipe-it (#4968) 
Adds a badge showing the number of people helping this repo on CodeTriage.

[![Open Source Helpers](https://www.codetriage.com/snipe/snipe-it/badges/users.svg)](https://www.codetriage.com/snipe/snipe-it)

## What is CodeTriage?

CodeTriage is an Open Source app that is designed to make contributing to Open Source projects easier. It works by sending subscribers a few open issues in their inbox. If subscribers get busy, there is an algorithm that backs off issue load so they do not get overwhelmed

[Read more about the CodeTriage project](https://www.codetriage.com/what).

## Why am I getting this PR?

Your project was picked by the human, @schneems. They selected it from the projects submitted to https://www.codetriage.com and hand edited the PR. How did your project get added to [CodeTriage](https://www.codetriage.com/what)? Roughly 4 months ago, [@imjennyli](https://github.com/imjennyli) added this project to CodeTriage in order to start contributing. Since then, 8 people have subscribed to help this repo.

## What does adding a badge accomplish?

Adding a badge invites people to help contribute to your project. It also lets developers know that others are invested in the longterm success and maintainability of the project.

You can see an example of a CodeTriage badge on these popular OSS READMEs:

- [![](https://www.codetriage.com/rails/rails/badges/users.svg)](https://www.codetriage.com/rails/rails) https://github.com/rails/rails
- [![](https://www.codetriage.com/crystal-lang/crystal/badges/users.svg)](https://www.codetriage.com/crystal-lang/crystal) https://github.com/crystal-lang/crystal

## Have a question or comment?

While I am a bot, this PR was manually reviewed and monitored by a human - @schneems. My job is writing commit messages and handling PR logistics.

If you have any questions, you can reply back to this PR and they will be answered by @schneems. If you do not want a badge right now, no worries, close the PR, you will not hear from me again.

Thanks for making your project Open Source! Any feedback is greatly appreciated.
 2018-02-05 15:22:52 -06:00
snipe 1e1362bdbc Merge branch 'develop' 2018-02-02 09:42:50 -06:00
snipe 813106efd3 Default to only changing default location in bulk edit 2018-02-02 09:42:34 -06:00
snipe 08d129c2ea Fixed #4951 - updating asset location in bulk edit 2018-02-02 09:36:40 -06:00
snipe 8491e57258 Merge branch 'develop' 2018-02-02 09:32:00 -06:00
snipe d86fb098a8 Fixed sort ordering on dashboard 2018-02-02 09:31:43 -06:00