DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 01:54:09 -08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity
12944 commits 96 branches 267 tags 295 MiB
Commit graph

12944 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe b5d3843b7c New LDAP model 2016-07-13 05:48:16 -07:00
snipe 026f099ba3 Fixed indenting 2016-07-13 05:47:32 -07:00
snipe ff6c3cfa17 Added LDAP settings check in settings page 2016-07-13 05:47:23 -07:00
Daniel Meltzer bf88cd8233 Check for variables to exist and not null rather than assuming it does. Fixes #2247. (#2248) 2016-07-12 21:03:23 -07:00
snipe c8351ae01b Reverting back to or die 2016-07-11 18:25:29 -07:00
snipe 7a4cbce460 Use trans instead of lang:: 2016-07-10 21:07:59 -07:00
snipe 3f835ba847 Updated lang to trans 2016-07-10 21:04:49 -07:00
snipe f87fbbdb1d Removed unused use statement 2016-07-10 21:01:11 -07:00
snipe caee42e843 More valid composer name 2016-07-10 20:57:12 -07:00
snipe 4e38f96f97 Switched or and and to || and && for code quality 2016-07-10 20:55:44 -07:00
snipe 814f8ea5fb Added favicon 2016-07-10 18:53:25 -07:00
Daniel Meltzer ab3b9dcf5d Add a clone button the the user table. (#2241) 
Also preserve permissions when cloning a user, instead of nulling them by default.
 2016-07-10 18:43:10 -07:00
Daniel Meltzer f683c78a69 Fix adding an image to an asset when public/uploads/assets does not exist (#2240) 
* Fix adding an image to an asset when public/uploads/assets does not exist.

 First check to see if we can create directory and do so.  If any errors occur, display the error string as an error on the page.

* Add the public/uploads/assets directory to new installs.

* Add some comments explaining this code so I remember what it does next time.
 2016-07-10 18:43:00 -07:00
snipe 642be61007 Remove old asset importer 2016-07-09 19:35:42 -07:00
snipe 8d71e6b268 Fixed indenting 2016-07-09 18:20:57 -07:00
snipe 6bdc88cfea Removed extra space 2016-07-09 18:20:14 -07:00
snipe 7ff77981f6 Fixed indenting 2016-07-09 18:19:51 -07:00
snipe a9f060e768 Removed extraneous comments 2016-07-09 18:19:19 -07:00
snipe 6de943b226 Use latest spatie/laravel-backup 2016-07-07 05:04:45 -07:00
snipe 262fe62409 Updated composer lock 2016-07-07 04:51:58 -07:00
snipe 9f4e0491ed Fixes error in license checkout 2016-07-07 04:13:08 -07:00
snipe 7ee135826f Updated composer with more accurate info 2016-07-07 02:07:42 -07:00
snipe 5e8d8d6df0 Nicer date display 2016-07-07 02:07:31 -07:00
snipe f2ddc7b0ae Added purchase cost and purchase date to listing 2016-07-07 02:07:21 -07:00
snipe 01b01c6479 Fixes #2149 2016-07-07 01:13:31 -07:00
snipe 3bb5479efd Move print statement to LOG 2016-07-01 16:24:58 -07:00
snipe 85606d830d Merge remote-tracking branch 'origin/v3' into v3-master 2016-07-01 01:06:41 -07:00
snipe 8fe1b88947 Disable email alerts on backups by default 2016-07-01 01:05:45 -07:00
snipe 9144605b57 Updated php codesniffer 2016-07-01 01:05:32 -07:00
snipe a7a748385f Longer cookie 2016-07-01 01:05:22 -07:00
snipe d4628b5c0f Merge remote-tracking branch 'origin/v3' into v3-master 2016-06-29 04:31:42 -07:00
snipe 0c65b6cad1 Nicer bulk delete layout 2016-06-29 04:30:21 -07:00
snipe 0c98390eef Hide bulk actions, checkbox and checkout/in if deleted 2016-06-29 04:19:37 -07:00
Brady Wetherington 345a0da337 Add Unix Socket support to standard .env configurations for DB (#2208) 2016-06-28 20:15:03 -07:00
snipe 38a7bfecf6 Merge remote-tracking branch 'origin/v3' into v3-master 2016-06-28 14:52:58 -07:00
snipe 6d5bc64b2b Another fix for status label types 
This is a little janky, as it breaks up the errors into multiple screens if you don't have a status label type AND don't have a name. This is because the model-level validation won't work since we transmogrify that dropdown list of status label types into  boolean values for the DB. Should eventually find a less clunky way to handle this, but needed to get a fix in now.
 2016-06-28 14:52:11 -07:00
snipe 7c4b2caadf Merge remote-tracking branch 'origin/v3' into v3-master 2016-06-28 12:40:31 -07:00
snipe 6633366b29 Small fix for status label types 2016-06-28 12:40:20 -07:00
snipe 64dbcf7c92 Merge remote-tracking branch 'origin/v3' into v3-master 2016-06-28 12:19:36 -07:00
snipe 483bf1b309 Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-06-28 12:19:19 -07:00
snipe 0e96a0aa3e Updated comment 2016-06-28 12:19:14 -07:00
snipe e4275bd3d3 Fixes status label inline creation 2016-06-28 12:19:05 -07:00
Daniel Meltzer 52c89ca889 Hide Delete action if user is deleted. (#2205) 
Issue: 1493
 2016-06-28 11:50:11 -07:00
Daniel Meltzer d484636bba Add model number column to the hardware list. (#2204) 
* Add model number column to the hardware list and allow searching based on model number.   Column is hidden by default.

* Fix sorting.  Add scope to order by model number.
 2016-06-27 22:32:40 -07:00
snipe 084db22cd5 Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-06-27 21:15:18 -07:00
snipe 081179a4fd Removed old JS libraries that aren't needed by v3 2016-06-27 21:15:11 -07:00
snipe 82d19fc704 Merge pull request #2201 from dmeltzer/fix-user-creation-values 
UserController::postCreate - Store all request information.
 2016-06-27 21:12:49 -07:00
Daniel Meltzer b1c28d7965 Move checks back into methods instead of having an extra helper method. Also remove unnecessary lock_passwords checks because there is a check at the top of the method that does this already. 2016-06-28 00:11:59 -04:00
snipe 6ea74f9fc3 Merge pull request #2203 from dmeltzer/display-error-if-import-upload-fails 
If the move of the uploaded import file fails, return an error message.
 2016-06-27 20:55:51 -07:00
Daniel Meltzer 278be52f7b Show the exception message if APP_DEBUG is enabled. 2016-06-27 23:54:45 -04:00