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
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
a22687abc5
Fix #896 - Only show Checkout/Checkin if deployable
2015-07-07 14:38:28 +09:30
7da7907fbd
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/controllers/admin/AssetsController.php
2015-07-06 19:29:06 -07:00
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
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
bb7ce83c48
Merge remote-tracking branch 'origin/develop' into 2.0
2015-06-30 22:42:00 -07:00
62f8d002e3
Temp commented out some stuff
2015-06-30 22:05:21 -07:00
a8cb5c1e7d
Beginning QR mobile interface
2015-06-30 19:07:44 -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
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
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
0d2333203a
Display default location
2015-05-04 13:08:38 -07:00
51eeee09d7
Fixes bug in #736 for new fields
2015-05-04 11:14:38 -07:00
c8870ddcab
Fixes #736 - more fields in bulk edit
2015-05-04 01:30:20 -07:00
1137768f84
Escape notes
2015-04-30 19:23:41 -07:00
5f6925858b
Richer slack integrations
2015-04-30 18:54:34 -07:00
3c00f38a0f
Slack integration for asset checkin/checkout
2015-04-29 17:38:22 -07:00
a0fce2e0fb
Fixes #766
...
Should be refactored to make the Action logger into a base class and to use polymorphic relationships for the IDs, and migrate accessory_id into asset_id in the log table. This was quick and dirty.
2015-04-29 16:14:08 -07:00
1c2e5ecc0f
Remove space after concat to fix SQL FUNCTION CONCAT NOT EXIST error
2015-04-28 15:19:00 +08:00
e88a81141f
Added view link to asset tag, since some assets won't have names
2015-04-02 15:40:41 -07:00
33e7ce6761
Fixes for #722 localization
2015-04-02 14:28:11 -07:00
0a734d8502
Missing semicolons
2015-04-01 15:44:13 -07:00
46781c94cd
Fix #715 - Missing $modelCheck api call
2015-04-02 09:10:07 +10:30
5d946b19cb
Fixed checkmodel at route level
2015-03-27 17:44:49 -07:00
605d0ed8e1
Moved checkModel into model from controller
2015-03-27 13:45:37 -07:00
8685e90513
Merge pull request #689 from madd15/feat/more-tables
...
Convert to Datatables - Models, Categories and Accessories
2015-03-24 18:45:34 -07:00
7881e70afb
Update Model Check in Hardware Edit and move to API
2015-03-25 12:03:45 +10:30
35bbea3052
Fixes #688 - show model if no asset name
2015-03-24 17:08:15 -07:00
2c6597c5fb
Add deleted_at to select array for datatable
2015-03-23 18:17:41 +10:30
80d2347095
Better label layout
2015-03-20 12:38:39 -07:00
fa794d7a15
Basic QR code printing
2015-03-19 18:06:50 -07:00
61d916d94d
Update for dynamic mac address field
2015-03-19 09:43:34 +10:30
139d206413
Select specific fields so Chumper has a smaller collection to parse
2015-03-17 18:05:01 -07:00
fdb92a2012
Change to use eager loaded userloc not assetloc
2015-03-18 10:50:52 +10:30
c14761b9a1
Re-fix button not showing
2015-03-18 10:27:04 +10:30
9edcc39de2
Fix restore button now showing
2015-03-18 10:15:57 +10:30
94afe20c20
Removed throttle eager load, added userlocation
2015-03-17 16:36:20 -07:00
c00086c740
Fix eager loading for user throttle
2015-03-17 15:36:11 -07:00
6f38f76e4a
Haha - TOTALLY cheated. But it works. Fixed ordering for linked names
2015-03-14 02:45:49 -07:00
ab0a8b3b61
Added bulk edit back in (it looks like ass right now)
2015-03-14 02:09:21 -07:00
4243710378
Added location to new assets view
2015-03-14 01:30:12 -07:00
snipe