DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-21 08:17:48 -07:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
545 commits 89 branches 265 tags 290 MiB
Commit graph

545 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 66adffe6d9 Moved include 2016-06-09 14:41:58 -07:00
snipe c91c1f92cd Fixes #2132 2016-06-09 13:27:50 -07:00
snipe bbb116f29c Fixes #2142 2016-06-09 12:25:51 -07:00
snipe a04d6293d1 Proper hypenation of Snipe-IT in footer 2016-06-09 03:08:42 -07:00
snipe 845b182fdf Fixes format for users in category view 2016-06-09 02:26:43 -07:00
snipe 2b5fb04ba9 Allow admin to add user on checkout screen 2016-06-09 00:36:52 -07:00
snipe bb758d618b Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-06-08 23:28:53 -07:00
snipe 9b2c7d749b Fixed barcode descriptions 2016-06-08 23:28:44 -07:00
snipe 51742d66df Removed uneeded size array 2016-06-08 23:28:21 -07:00
snipe 3a101aa0c8 Merge pull request #2131 from dmeltzer/fix-license-checkout 
Fix license Checkout.
 2016-06-08 18:01:16 -07:00
Drew Wilkinson 7f22d3f486 Fix margin for bottom to not be equal to side gutter, looks like a typo 2016-06-07 13:03:21 -04:00
Drew Wilkinson c9d6857c73 Swap bgutter and sgutter as they seem to be reversed. I assume s=side=horizontal and b=bottom=vertical... 2016-06-07 12:39:53 -04:00
Daniel Meltzer 9648c6f1d3 Fix license Checkout. 
A mistake in the sqlite porting led to "Please select an asset"
disappearing.  This centralizes that code in Helper, and uses the code
in Licensescontroller and componentscontroller.

Also use the proper name on the components checkout page.

AssetMaintencesController reuses the same underlying code as
licensescontroller, but we don't want "Please select an asset" to be an
option there, so I'm not changing that code.
 2016-06-07 07:58:08 -05:00
snipe 75eb2bbe09 Janky-ass form request stuff 2016-06-06 21:02:06 -07:00
snipe d4e231d5d4 Save permissions on new user 2016-06-06 18:56:43 -07:00
snipe 75dfb87671 Use form request for user add/edit to handle password and password confirmation 2016-06-06 14:15:50 -07:00
snipe 23936e465d Merge pull request #2123 from dmeltzer/fix-setup-on-windows 
Fix missing posix_getpwuid on windows.
 2016-06-06 12:31:30 -07:00
snipe 13d11bfdcc Merge pull request #2121 from dmeltzer/add-soft-pave 
Add a 'soft' delete option to the pave tool.
 2016-06-06 12:30:06 -07:00
snipe 21506f4101 Merge pull request #2120 from dmeltzer/add-clone-to-models-index 
Add clone action to Assetmodels index page.
 2016-06-06 12:29:54 -07:00
snipe 51ab8ce41c Merge pull request #2119 from dmeltzer/fix-category-lists 
Modify Helper::categoryList() to take a category type parameter.
 2016-06-06 12:29:31 -07:00
Daniel Meltzer ea3e11e011 Fix missing posix_getpwuid on windows. 
This isn't a perfect solution.  It basically just nullifies the check on
windows.  I'm not sure if IIS can run as a nonelevated user though, so
perhaps thats the best choice.  Regardless, this fixes the setup.
 2016-06-06 07:43:05 -05:00
Daniel Meltzer 6ba37a3a8d Add a 'soft' delete option to the pave tool. This leaves db structure and migrations in place but removes everything inside the db except the first user. 2016-06-05 10:24:42 -05:00
Daniel Meltzer a89511674b Add clone icon to Assetmodels index page. 2016-06-05 10:00:31 -05:00
Daniel Meltzer cd9cca9c6b Modify Helper::categoryList() to take a category type parameter. 
This allows for centralizing the category fetching code more and fixes
an error in asset model viewing (#2118).  Also add a few translated
strings and standardize on a base of 'Select a *' for the default value
in our lists.
 2016-06-05 09:47:44 -05:00
snipe 9f6eb02afc Don't purge users where show_in_list = 1 
This is necessary so hosted customers can't hard-delete my account :-/
 2016-06-03 12:13:59 -07:00
snipe f8ac9a3f77 Fixes #2110 2016-06-03 11:48:20 -07:00
snipe b28d966645 Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-06-02 21:16:48 -07:00
snipe 030b525535 Small readme changes 2016-06-02 21:16:43 -07:00
Brady Wetherington 093bcdfe4f Fix to Dockerfile build; backup path must've changed. 2016-06-02 21:10:50 -07:00
Brady Wetherington 5e0cc241a0 Forgot to add the new docker.env file 2016-06-02 20:35:05 -07:00
snipe 7d5c7991f4 Create backups directory 2016-06-02 19:45:59 -07:00
snipe 9ced24b127 Bumped version for RC-3 release 2016-06-02 19:06:54 -07:00
snipe fd32f6d4d5 New language strings 2016-06-02 19:01:09 -07:00
snipe c5d96812f3 Fixed erronerously removed save methods 2016-06-02 17:22:23 -07:00
snipe 6de6052185 Hardcoded page number to prevent error 2016-06-02 17:17:50 -07:00
snipe 402c955f1c Fixed title 2016-06-02 17:17:42 -07:00
snipe 2f8cbe4ac2 Better default mysqldump path 2016-06-02 17:17:33 -07:00
snipe 95f94c1cfb Fixed error when user has no permissions values 2016-06-02 17:16:22 -07:00
snipe 485fb26393 Fixes #1985 - disallow checkin/checkout if the asset is not in a deployable status 2016-06-02 14:04:54 -07:00
snipe 9551c07528 Fixes #2087 - bad route to maintenance edit 2016-06-02 11:18:17 -07:00
snipe 2d5a0deb31 Eager loading for requestable assets account page 2016-06-02 02:57:22 -07:00
snipe 7d2ea36997 Use permission gates on routes 2016-06-02 02:50:00 -07:00
snipe 97691726f0 Updates to permissions decoding 2016-06-02 02:49:32 -07:00
snipe dce549cc5c Updated debugbar prefs 2016-06-02 02:49:17 -07:00
snipe 049e13e365 Switch to gate for permission check 2016-06-02 02:48:52 -07:00
snipe dddb0f7267 Fixed group error message 2016-06-02 02:46:49 -07:00
snipe 5de6b8e016 Added gates to authservice provider for finer tuned permissions 2016-06-02 02:40:49 -07:00
snipe a3e9b3df86 Updated error page title 2016-06-02 02:39:44 -07:00
snipe 89e656e709 Switched to can/cannot for blade 2016-06-02 02:39:36 -07:00
snipe 5f5fddb7a4 Updated permissions array 2016-06-02 02:39:23 -07:00