7255a8bb0c
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/controllers/admin/AssetsController.php
2015-07-09 01:24:34 -07:00
f5d4eb5842
Merge pull request #897 from madd15/patch-2
...
Fix #896 - Only show Checkout/Checkin if deployable
2015-07-09 01:19:57 -07:00
7e5f32c9d8
Merge pull request #898 from madd15/Default-Layout-fix
...
Small UI fixes
2015-07-09 01:17:02 -07:00
e1724cf25f
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# .gitignore
# app/config/production/session.example.php
# app/config/staging/session.example.php
# app/config/version.php
# app/models/User.php
2015-07-09 01:02:49 -07:00
9936cf4a43
Better production default for #903
2015-07-09 00:53:58 -07:00
e9443a244c
Small fix to config value
2015-07-09 00:52:05 -07:00
f8be47dfbf
Fixes #903 - adds config variable for multi_login, overrides Sentry method
2015-07-09 00:41:46 -07:00
2d10931d6c
Use league/csv for export
2015-07-08 23:42:17 -07:00
4a5066054b
Display bugfixes for #819
2015-07-08 22:38:35 -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
c2d63915c3
Fixed insecure font call
2015-07-08 17:48:59 -07:00
fd59ca0802
Fixed spacing
2015-07-08 17:33:51 -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
05f0b94bf6
Fixed language string
2015-07-08 13:05:17 -07:00
f54c86db87
Command line asset importer
2015-07-08 13:05:05 -07:00
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
a22687abc5
Fix #896 - Only show Checkout/Checkin if deployable
2015-07-07 14:38:28 +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
snipe