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
139dd13392
Super janky miulti-level menu on create - TODO: Fix this ish.
2015-05-04 18:13:26 -07:00
aab52d0850
Fix for strict mode with location parent
2015-05-04 15:10:57 -07:00
71febc1c81
Added accessories and location
2015-05-04 13:31:47 -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
c487beeaca
Asset counter for #759 (needs more work)
2015-05-04 03:05:22 -07:00
f463cd6c8d
Fixes for #759 - location heirarchy
2015-05-04 02:50:42 -07:00
5e7a4e8193
Fixes #599 - show groups in user list
2015-05-04 01:44:49 -07:00
c8870ddcab
Fixes #736 - more fields in bulk edit
2015-05-04 01:30:20 -07:00
7556f989df
Accessories Slack integration
2015-04-30 20:53:44 -07:00
8207597a58
Slack integration for Licenses
2015-04-30 20:37:23 -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
c95af84452
Fixes #750 because @uberbrady can't code
2015-04-30 17:14:31 -07:00
62b5ec5b02
Slack field validation and placeholder text
2015-04-30 16:58:33 -07:00
3c00f38a0f
Slack integration for asset checkin/checkout
2015-04-29 17:38:22 -07:00
767e2c69f3
Fixes #751 - ignore whether depreciation was selected or not to display purchase cost
2015-04-29 16:31:38 -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
d61506fcf7
Fixes for #766 - add activity report
2015-04-29 14:50:12 -07:00
6a7fcd5c40
Fixes #769 - set sort order for Accessory Category
2015-04-29 13:54:54 -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
afdf00eacb
Removed settings save for display fields
2015-03-27 22:34:39 -07:00
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
bbcc8aa9ac
Update groups if unlocked
2015-03-25 14:26:12 -07:00
865c302f71
Prevent changing user email/pass/groups if locked
2015-03-25 14:26:00 -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
a9f15fbcae
Convert Categories View to use Datatables, and fix Model View missing comma
2015-03-25 12:03:49 +10:30
7d266fdc4e
Convert Models View to use Datatables
2015-03-25 12:03:48 +10:30
7f03c7538f
Convert Accessories View to use Datatable
2015-03-25 12:03:47 +10:30
7881e70afb
Update Model Check in Hardware Edit and move to API
2015-03-25 12:03:45 +10:30
678b7700b4
Add use Datatable
2015-03-25 12:03:44 +10:30
1d1c14ae21
Add use Datatable
2015-03-25 12:03:43 +10:30
3e98f05564
Convert Models and Categories Index to use Datatables
2015-03-25 12:02:32 +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
75d5f494a3
Bypass site name validation if locked
2015-03-20 15:08:10 -07:00
40852f9a6a
Update to settings edit
2015-03-20 15:00:05 -07:00
snipe