2d10931d6c
Use league/csv for export
2015-07-08 23:42:17 -07:00
84ffc1a728
Migration for location-specific currency, updated views for #819
...
This isn't done yet though. All kinds of busted stuff.
2015-07-08 20:35:40 -07:00
74429d9075
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/lang/en/general.php
# app/start/artisan.php
# app/views/backend/hardware/edit.blade.php
# app/views/backend/layouts/default.blade.php
2015-07-08 18:07:53 -07:00
de23ec5785
Fixes #544 - disable checking an asset out to a user if it is not a deployable status
2015-07-08 17:18:46 -07:00
1edce0a4fa
Merge branch '2.0' of github.com:snipe/snipe-it into 2.0
2015-07-06 19:29:22 -07:00
7da7907fbd
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/controllers/admin/AssetsController.php
2015-07-06 19:29:06 -07:00
c7f2dc83db
Remove $new and replace with Input::all()
2015-07-07 09:50:00 +09:30
3664e75c47
Change validation to work correctly
2015-07-07 08:51:38 +09:30
61836f20c5
Clear Mac Address on Clone
2015-07-07 08:23:51 +09:30
62d382d704
Remove serial and assigned_to when cloning asset
2015-07-07 08:19:58 +09:30
3746bc333b
Better checking for model name and category name
2015-07-06 14:12:49 -07:00
ccde517c88
Use showAssetName to get asset name
2015-07-06 14:10:24 -07:00
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
1601bdd4eb
Added rtd_location_id back into selected columns
2015-07-02 16:52:08 -07:00
d4af197b0e
Merge pull request #886 from madd15/Fix---Edit-user
...
Fix - Edit User
2015-07-01 19:51:33 -07:00
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
55f544829d
Update Category Types Array to include Consumable
2015-07-01 17:28:58 +09:30
bb7ce83c48
Merge remote-tracking branch 'origin/develop' into 2.0
2015-06-30 22:42:00 -07:00
1d4cfcfd58
Only save uploaded logo if not in demo mode
2015-06-30 22:38:40 -07:00
f2abbd0e8f
Deny editing users on demo
2015-06-30 22:10:23 -07:00
62f8d002e3
Temp commented out some stuff
2015-06-30 22:05:21 -07:00
0766ae2d17
Disallow group edit for demo
2015-06-30 22:04:48 -07:00
588ff742fe
Add manufacturer to models listing for clarity
2015-06-30 19:15:43 -07:00
a8cb5c1e7d
Beginning QR mobile interface
2015-06-30 19:07:44 -07:00
edfa064fd4
Disable emailing imported users if demo mode
2015-06-23 18:38:21 -07:00
bf3cb73070
Include location ID on user import
2015-06-23 15:05:11 -07:00
28a9f90a72
Lazy eager load history for optimized queries
2015-06-23 13:44:49 -07:00
c87d4ad801
Eager load dashboard queries
2015-06-23 11:52:18 -07:00
826d3ccae8
Eager loading user info
2015-06-22 17:57:55 -07:00
fd7d4eb3f2
Removed checkin for consumables
2015-06-22 17:57:44 -07:00
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
221ae62ea5
Example configs
2015-06-19 17:38:06 -07:00
ec10526d69
Center envelope in user listing
2015-06-18 15:00:32 -07:00
2be1d64de3
Merge remote-tracking branch 'origin/develop' into 1.3.0
2015-06-16 12:56:14 -07:00
c3c4e9def2
Fixes #852 - localized string for file types, added zip and rar for asset upload
2015-06-16 12:54:53 -07:00
16ec68e0b6
Hide email icon if no email address is provided
2015-06-16 01:45:34 -07:00
d943408f44
Location and email not required, username required
2015-06-15 18:39:34 -07:00
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
7820efc121
Fixes #822 and #847 - added notes field on import for MySQL strict mode
2015-06-15 11:20:09 -07:00
d0189fb076
Added consumables to user matrix for #782
2015-06-09 20:05:24 -07:00
e4517a8782
Removed checkin for #782 , since that doesn't exist in consumables
2015-06-09 19:58:22 -07:00
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
2540ac09ec
Fixes #822
2015-06-09 16:02:10 -07:00
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
c69038d3ae
Fixes #836
2015-06-09 02:00:55 -07:00
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
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
3597d71230
Eager load assigned asset locations
2015-05-07 18:21:39 -07:00
95279f885b
Fixes #759 - populate form with parent location info
2015-05-07 01:51:46 -07:00
2d7a348ab7
Fixed multi-level array nesting for locations
2015-05-07 00:15:44 -07:00
snipe