DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-20 15:57:41 -07:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
1733 commits 89 branches 265 tags 290 MiB
Commit graph

1733 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 9c637ba62c Merge branch 'develop' of github.com:snipe/snipe-it into develop 2017-04-06 21:03:47 -07:00
snipe ef42bcc223 Update Crowdin configuration file 2017-04-06 20:59:24 -07:00
snipe 120c08b3a3 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2017-04-06 20:08:52 -07:00
snipe e32d2f98b5 Added nameUrl presenters (for now) 2017-04-06 20:08:47 -07:00
snipe aa354e883e Removed erroneous comments 2017-04-06 20:08:38 -07:00
itsupportcmsukorg 89ba221765 fix upload hour so it's 24hr instead of always AM (#3480) 
correct an error where logUpload was trying to save 12-hr time to a 24-hr field, e.g. 15:00 (3pm) was becoming 3:00 (3am)
 2017-04-06 19:48:15 -07:00
snipe c7acbc0eee Stunning hook 2017-04-06 19:45:47 -07:00
snipe 961c019554 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2017-03-31 15:48:49 -07:00
snipe b2e122c1e9 Add @HinchK as a contributor 2017-03-31 15:46:42 -07:00
Kasey 5663429280 applying PR #3456 changes to develop branch (#3472) 
* updating with changes made to master

apply PR # 3456 to develop as well

* updating develop with changes made to master

apply PR # 3456 to develop as well

* updating paveit with passport-created oauth tables
 2017-03-31 15:43:37 -07:00
Daniel Meltzer 1bb89db451 A few fixes (#3437) 
* This method was renamed, so we need to rename the eager load

* Readd tinker to the composer dev packages.

* Update sql dump for functional tests.
 2017-03-31 13:48:31 -07:00
Andrea Bergamasco 7ee172888d /api_tests: Completed tests for basic CRUD for Assets and Components (#3426) 
* Refactored AssetsTransformer

Casted all ids to int, escaped all text values,

* Added warranty_expires attribute to Asset model

$asset->warranty_expires contains a Carbon object with the warranty
expiration date. Returns null when either purchase_date or
warranty_months are not set.

* Ignoring php-cs cache files

* Restored asset tests expectations

Work in progress - tests still fail

* API controller refactoring, fixed HTTP status codes in responses

* Restored $request->get - debugging

* Added further checks in ApiAssetsCest::updateAssetWithPatch

* /api_tests: Fixed bugs in update() method + code formatting

* /api_tests: Minor code formatting

* /api_tests: Mirrored test code for PATCH and PUT methods

* Removed repeated code

* Test cleanup

* Fixed issues with update() through PATCH and PUT methods

* Added API test suite to .travis.yml
 2017-03-31 13:48:11 -07:00
snipe 45ac1de6bb Merge branch 'develop' of github.com:snipe/snipe-it into develop 2017-03-14 16:21:49 -07:00
snipe f45a3fedca Remove circle-ci config 2017-03-14 16:21:37 -07:00
Andrea Bergamasco 99cc8293ef Fixed undefined metod in unit/PermissionTest (#3422) 
* Refactored AssetsTransformer

Casted all ids to int, escaped all text values,

* Added warranty_expires attribute to Asset model

$asset->warranty_expires contains a Carbon object with the warranty
expiration date. Returns null when either purchase_date or
warranty_months are not set.

* Ignoring php-cs cache files

* Restored asset tests expectations

Work in progress - tests still fail

* API controller refactoring, fixed HTTP status codes in responses

* Restored $request->get - debugging

* Added further checks in ApiAssetsCest::updateAssetWithPatch

* Fixed undefined method

* Fixed initial underscore trimmed by str_slug

* CustomFieldTest now works where intl PHP extension is not installed

If a server doesn't have the intl php extension installed, the custom fields tests failed. Now the tests perform the same check done in the CustomField class.
 2017-03-14 08:39:03 -07:00
Andrea Bergamasco e03ebc3fd0 AssetTransformer refactoring, restored tests (#3407) 
* Refactored AssetsTransformer

Casted all ids to int, escaped all text values,

* Added warranty_expires attribute to Asset model

$asset->warranty_expires contains a Carbon object with the warranty
expiration date. Returns null when either purchase_date or
warranty_months are not set.

* Ignoring php-cs cache files

* Restored asset tests expectations

Work in progress - tests still fail

* API controller refactoring, fixed HTTP status codes in responses

* Restored $request->get - debugging

* Added further checks in ApiAssetsCest::updateAssetWithPatch
 2017-03-14 08:37:39 -07:00
snipe 0469a44582 Bumped codeception version to fix travis breakage 
Tests are still failing, but for the right reasons now
 2017-03-11 17:12:21 -08:00
snipe 6f269e18fe Remove useless validation for custom CSS 2017-03-11 15:34:54 -08:00
snipe c5dd33f213 Switch to post 2017-03-11 15:25:19 -08:00
snipe c8c5c05351 Added asset checkin/checkout API methods 2017-03-11 14:04:52 -08:00
snipe c3cc2c924f Updated route for asset display 2017-03-11 12:14:41 -08:00
snipe 70761b8157 Status label view 2017-03-11 12:14:19 -08:00
snipe 8dbd9fb299 Added additional permissions for checkin/checkout buttons 2017-03-11 12:14:10 -08:00
snipe 00aa06882c Fixed incorrect route for components 2017-03-11 12:13:35 -08:00
snipe e475ccc1d4 Use new presenter for colum headers 2017-03-11 12:13:14 -08:00
snipe 542adfa926 Updated sidenav to use proper status labels 2017-03-11 12:12:10 -08:00
snipe 36ad82a041 Updated todo for user_can_checkout 2017-03-11 12:11:39 -08:00
snipe 79197a719e Fixes BS tables for items that don’t have a checkin 2017-03-11 12:11:24 -08:00
snipe 742e3d044e API improvements 
Components still need some work here
 2017-03-11 10:05:50 -08:00
snipe a4697f046e Some model/manufacturer cleanup 2017-03-11 08:53:02 -08:00
snipe 2c3b9426fe Update @uberbrady as a contributor 2017-03-11 08:21:37 -08:00
snipe ae6828a0fa Removed dumb code comment 2017-03-11 08:03:30 -08:00
snipe 2a4bf65883 Basic sanity checking on some of the API controllers 2017-03-11 08:03:16 -08:00
snipe 9027bd1d9d Added in/out to model view display 2017-03-11 08:01:22 -08:00
snipe f079be5e2f More small README changes 2017-03-11 08:01:05 -08:00
snipe 343da2968a Small README updates 2017-03-11 07:59:45 -08:00
snipe 35705813b3 Add @rashivkp as a contributor 2017-03-11 07:53:03 -08:00
snipe 5e3daee212 Add @abrahamvegh as a contributor 2017-03-11 07:52:39 -08:00
snipe 25d7345bbd Add @peelman as a contributor 2017-03-11 07:52:20 -08:00
snipe 76f5b6c0f0 Add @desmondmorris as a contributor 2017-03-11 07:52:03 -08:00
snipe 9da84a1d4d Add @flashingcursor as a contributor 2017-03-11 07:51:46 -08:00
snipe 2523072b1d Add @feeva as a contributor 2017-03-11 07:51:32 -08:00
snipe f38ef8db7f Add @FleischKarussel as a contributor 2017-03-11 07:51:03 -08:00
snipe d2b79ce39e Add @jakemcgraw as a contributor 2017-03-11 07:50:53 -08:00
snipe 6b47b0480e Add @archpoint as a contributor 2017-03-11 07:45:40 -08:00
snipe a916cbb0d0 Add @buzzedword as a contributor 2017-03-11 07:45:25 -08:00
snipe 5f7c7503ec Add @leostat as a contributor 2017-03-11 07:45:05 -08:00
snipe e6b88fa565 Add @technogenus as a contributor 2017-03-11 07:44:50 -08:00
snipe db1730ae06 Add @burlito as a contributor 2017-03-11 07:44:34 -08:00
snipe 1366d0bfb9 Add @rrdial as a contributor 2017-03-11 07:44:21 -08:00