ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,992 Commits 84 Branches 293 Tags
f363e742e69f03eef0c90227d6c7ac361bacb09a
Commit Graph

406 Commits

Author SHA1 Message Date
madd15 f363e742e6 Add getFreeLicense 
Picks free seat for license and redirects to checkout specific seat
 2015-07-07 12:30:55 +09:30
snipe 1edce0a4fa Merge branch '2.0' of github.com:snipe/snipe-it into 2.0 2015-07-06 19:29:22 -07:00
snipe 7da7907fbd Merge remote-tracking branch 'origin/develop' into 2.0 
# Conflicts:
#	app/controllers/admin/AssetsController.php
 2015-07-06 19:29:06 -07:00
madd15 c7f2dc83db Remove $new and replace with Input::all() 2015-07-07 09:50:00 +09:30
madd15 3664e75c47 Change validation to work correctly 2015-07-07 08:51:38 +09:30
madd15 61836f20c5 Clear Mac Address on Clone 2015-07-07 08:23:51 +09:30
madd15 62d382d704 Remove serial and assigned_to when cloning asset 2015-07-07 08:19:58 +09:30
snipe 3746bc333b Better checking for model name and category name 2015-07-06 14:12:49 -07:00
snipe ccde517c88 Use showAssetName to get asset name 2015-07-06 14:10:24 -07:00
snipe 7d5810b656 Merge remote-tracking branch 'origin/develop' into 2.0 
# Conflicts:
#	app/config/version.php
#	app/controllers/admin/AssetsController.php
 2015-07-02 17:23:06 -07:00
snipe 1601bdd4eb Added rtd_location_id back into selected columns 2015-07-02 16:52:08 -07:00
snipe d4af197b0e Merge pull request #886 from madd15/Fix---Edit-user 
Fix - Edit User
 2015-07-01 19:51:33 -07:00
madd15 7a0b3a7350 Allow saving of Username and Email changes 
I noted that i was unable to change the username or email fields, but also that the username validation would not allow the form to save as it was checking against itself for being unique.
 2015-07-02 12:16:01 +09:30
madd15 55f544829d Update Category Types Array to include Consumable 2015-07-01 17:28:58 +09:30
snipe bb7ce83c48 Merge remote-tracking branch 'origin/develop' into 2.0 2015-06-30 22:42:00 -07:00
snipe 1d4cfcfd58 Only save uploaded logo if not in demo mode 2015-06-30 22:38:40 -07:00
snipe f2abbd0e8f Deny editing users on demo 2015-06-30 22:10:23 -07:00
snipe 62f8d002e3 Temp commented out some stuff 2015-06-30 22:05:21 -07:00
snipe 0766ae2d17 Disallow group edit for demo 2015-06-30 22:04:48 -07:00
snipe 588ff742fe Add manufacturer to models listing for clarity 2015-06-30 19:15:43 -07:00
snipe a8cb5c1e7d Beginning QR mobile interface 2015-06-30 19:07:44 -07:00
snipe edfa064fd4 Disable emailing imported users if demo mode 2015-06-23 18:38:21 -07:00
snipe bf3cb73070 Include location ID on user import 2015-06-23 15:05:11 -07:00
snipe 28a9f90a72 Lazy eager load history for optimized queries 2015-06-23 13:44:49 -07:00
snipe c87d4ad801 Eager load dashboard queries 2015-06-23 11:52:18 -07:00
snipe 826d3ccae8 Eager loading user info 2015-06-22 17:57:55 -07:00
snipe fd7d4eb3f2 Removed checkin for consumables 2015-06-22 17:57:44 -07:00
snipe 818d1769b8 Automated backup to dump SQL and zip uploaded files 
Usage:

`php artisan snipeit:backup`

This can be set on a cron or scheduled task
 2015-06-22 15:52:26 -07:00
snipe 221ae62ea5 Example configs 2015-06-19 17:38:06 -07:00
snipe ec10526d69 Center envelope in user listing 2015-06-18 15:00:32 -07:00
snipe 2be1d64de3 Merge remote-tracking branch 'origin/develop' into 1.3.0 2015-06-16 12:56:14 -07:00
snipe c3c4e9def2 Fixes #852 - localized string for file types, added zip and rar for asset upload 2015-06-16 12:54:53 -07:00
snipe 16ec68e0b6 Hide email icon if no email address is provided 2015-06-16 01:45:34 -07:00
snipe d943408f44 Location and email not required, username required 2015-06-15 18:39:34 -07:00
snipe c4375f9fbc Merge remote-tracking branch 'origin/develop' into 1.3.0 
# Conflicts:
#	app/controllers/admin/UsersController.php
 2015-06-15 11:30:40 -07:00
snipe 7820efc121 Fixes #822 and #847 - added notes field on import for MySQL strict mode 2015-06-15 11:20:09 -07:00
snipe d0189fb076 Added consumables to user matrix for #782 2015-06-09 20:05:24 -07:00
snipe e4517a8782 Removed checkin for #782, since that doesn't exist in consumables 2015-06-09 19:58:22 -07:00
snipe 19604480bb Consumables section 
TODO:

- Add checkout to location
- Drop Checkin (doesn't really exist in this context)
- Add missing strings - consolidate where possible. Lots of dupes :-/
 2015-06-09 19:50:34 -07:00
snipe 2540ac09ec Fixes #822 2015-06-09 16:02:10 -07:00
snipe af2decea9d Merge remote-tracking branch 'origin/master' into 1.3.0 
# Conflicts:
#	app/controllers/admin/AssetsController.php
 2015-06-09 02:10:29 -07:00
snipe c69038d3ae Fixes #836 2015-06-09 02:00:55 -07:00
snipe 123caf42c2 Merge remote-tracking branch 'origin/develop' into 1.3.0 
# Conflicts:
#	app/views/backend/hardware/labels.blade.php
#	app/views/backend/layouts/default.blade.php
 2015-05-27 11:17:14 -07:00
Tom Castleman b161a38e9b Add licenses.reassignable migration 
Implement licenses.reassignable

View edit for licenses.reassignable

Add licenses.reassignable to LicensesController

Disable Check In when !license->reassignable

Validate license check-in post
 2015-05-22 14:11:36 +01:00
snipe 3597d71230 Eager load assigned asset locations 2015-05-07 18:21:39 -07:00
snipe 95279f885b Fixes #759 - populate form with parent location info 2015-05-07 01:51:46 -07:00
snipe 2d7a348ab7 Fixed multi-level array nesting for locations 2015-05-07 00:15:44 -07:00
snipe 139dd13392 Super janky miulti-level menu on create - TODO: Fix this ish. 2015-05-04 18:13:26 -07:00
snipe aab52d0850 Fix for strict mode with location parent 2015-05-04 15:10:57 -07:00
snipe 71febc1c81 Added accessories and location 2015-05-04 13:31:47 -07:00