e714def74a
Fix Reports showing class="active"
2015-07-08 11:46:11 +09:30
a9e169261c
Add 5px margin to left of search box
2015-07-08 11:41:14 +09:30
665ffa6571
Update Hardware Submenu
...
Correctly identify the status from the url
2015-07-08 11:37:20 +09:30
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
32a0f6eb92
Merge pull request #892 from madd15/patch-4
...
Fix Model Validation for create and edit
2015-07-06 18:07:30 -07:00
1301119c9a
Remove unique from modelno validation rule
2015-07-07 09:50:43 +09:30
c7f2dc83db
Remove $new and replace with Input::all()
2015-07-07 09:50:00 +09:30
82892a38b8
Merge pull request #891 from madd15/patch-3
...
Fix #873 - Remove serial, assigned_to & macaddress when cloning asset
2015-07-06 16:50:58 -07:00
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
f855bfd4ef
Better error checking for eol data
2015-07-06 14:09:48 -07:00
674348b5a5
Smaller text requirement for address2
2015-07-06 14:06:31 -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
552bdfdc2d
Switched defaultLoc to belongsTo relationship
2015-07-02 16:51:52 -07:00
d4af197b0e
Merge pull request #886 from madd15/Fix---Edit-user
...
Fix - Edit User
2015-07-01 19:51:33 -07:00
be685467eb
Merge pull request #883 from madd15/patch-2
...
Update Category Types Array to include Consumable
2015-07-01 19:50:36 -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
6915987239
Added demo language string
2015-06-30 22:38:19 -07:00
3a44a7e8bb
Disable logo upload for demo
2015-06-30 22:38:12 -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
95920be8ea
Fixed weird commenting
2015-06-30 22:04:05 -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
1fb2878772
Updated activity report for consumables
2015-06-25 18:47:03 -07:00
84e130d6aa
Fixes #869 - compatibility mode for IE
2015-06-25 16:22:07 -07:00
edfa064fd4
Disable emailing imported users if demo mode
2015-06-23 18:38:21 -07:00
3caded990a
Added parent string
2015-06-23 18:32:06 -07:00
3bca2566d7
Added missing create/update consumable string
2015-06-23 16:35:38 -07:00
1aa4841868
Remove extra debugging
2015-06-23 16:30:29 -07:00
fc1e8a4e4e
Minor comment tweak
2015-06-23 15:05:21 -07:00
bf3cb73070
Include location ID on user import
2015-06-23 15:05:11 -07:00
d77e763f86
Change badge to label
2015-06-23 15:04:35 -07:00
8ef3d00f22
Fixed language string for users
2015-06-23 14:10:15 -07:00
5266c22890
Show consumable checkout date
2015-06-23 14:10:04 -07:00
26540b1aac
Updated bad data string
2015-06-23 14:02:01 -07:00
39a3b93537
Pagination on user history
2015-06-23 14:01:48 -07:00
ba13101f64
Bad data language string
2015-06-23 13:48:56 -07:00
ce55b7ab2f
Tightened up history snapshot on dashboard
2015-06-23 13:46:06 -07:00
28a9f90a72
Lazy eager load history for optimized queries
2015-06-23 13:44:49 -07:00
f2a2ccdab4
Nicer display for profile
2015-06-23 12:59:55 -07:00
madd15