766b4b901f
Fixes #822 - make user notes field nullable default null
2015-06-09 17:34:52 -07:00
f671c89b14
Composer update for bin path
2015-06-09 17:31:28 -07:00
03bd1498e8
Added codeception
2015-06-09 16:52:08 -07:00
f743bacd0f
Updated language strings
2015-06-09 16:14:37 -07:00
309158352e
Added Korean translation
2015-06-09 16:14:28 -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
9ea8316d74
Merge remote-tracking branch 'origin/develop' into 1.3.0
...
# Conflicts:
# app/config/version.php
2015-06-01 17:52:39 -07:00
5939e46eee
Bumped version for fixed 1.2.7
2015-06-01 17:52:03 -07:00
a8a0a59982
Fixes #825 - title bar spacing issue
2015-06-01 17:51:20 -07:00
73a08c031c
Fixes #818 , and randomizes password for dummy user
2015-05-27 11:45:44 -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
5997dd9387
Missing string for action
2015-05-27 11:13:42 -07:00
9cf03e2e60
Better escaping on activity report page
2015-05-27 10:16:06 -07:00
c77e7bf725
Merge pull request #816 from tomcastleman/develop
...
Reassignable should default to true on create form
2015-05-24 10:49:41 -07:00
7a4299c724
Reassignable should default to true on create form
2015-05-24 13:35:28 +01:00
b9b0239837
Merge pull request #813 from tomcastleman/develop-1
...
Update develop following PR #809
2015-05-22 11:51:50 -07:00
a43ae71afd
Merge pull request #812 from tomcastleman/develop
...
Reassignable License Setting
2015-05-22 11:50:44 -07:00
c4339a5d94
Merge branch 'master' into develop
...
* master:
Removed debugbar:publish
2015-05-22 14:37:01 +01: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
735268034d
Merge pull request #809 from tomcastleman/patch-1
...
Removed debugbar:publish
2015-05-21 18:56:49 -07:00
aad473486f
Merge pull request #798 from DanielNemanic/patch-8
...
Generating Asset Name to Label Print
2015-05-21 18:56:36 -07:00
08970f2b7b
Removed debugbar:publish
...
As per:
```
NOTICE: Since laravel-debugbar 1.7.x, publishing assets is no longer necessary. The assets in public/packages/barryvdh/laravel-debugbar and maximebf/php-debugbar can be safely removed.
```
2015-05-21 16:59:20 +01:00
212f09dd31
Fixes #806
2015-05-19 19:39:05 -07:00
8334e7b863
Removed extra open sans call
2015-05-19 19:37:34 -07:00
a80d67c1ff
Escaping on labels
2015-05-19 19:37:22 -07:00
7c95f4231e
Fixes #799 - missing text in file delete confirmation
2015-05-14 20:52:19 -07:00
6e8ad5b085
Generating Asset Name to Label Print
...
Added the Asset Name to the Label printing page.
2015-05-13 10:51:06 +02:00
145d386ce2
Updated lock file
2015-05-12 15:13:18 -07:00
496a768013
Fixes #795 - add model name if no asset name
2015-05-11 19:23:11 -07:00
7415a5898f
Twiddling column widths
2015-05-08 11:39:51 -07:00
f1486bfee3
Nicer locations listing layout
2015-05-07 19:20:05 -07:00
bc8521043b
Bumped version
2015-05-07 18:21:48 -07:00
3597d71230
Eager load assigned asset locations
2015-05-07 18:21:39 -07:00
d92e2eaebc
Method for assigned asset locations
2015-05-07 18:21:27 -07:00
8cdea8a384
Fix for location totals
2015-05-07 18:21:10 -07:00
4457c7aec0
Removed extra commented stuff
2015-05-07 18:20:58 -07:00
95279f885b
Fixes #759 - populate form with parent location info
2015-05-07 01:51:46 -07:00
94bfab762b
Merge pull request #791 from DanielNemanic/patch-7
...
Updating Dashboard Link URL
2015-05-07 00:39:53 -07:00
20d8ad29e5
Updating Dashboard Link URL
...
Updating link to real application URL.
2015-05-07 09:38:16 +02:00
75644eb894
Dashboard points to app url
2015-05-07 00:30:20 -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
2f52369d07
Fixed location string
2015-05-04 15:13:04 -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
68d8b10b22
Changed text to icons for more compacted view
2015-05-04 13:31:38 -07:00
0d2333203a
Display default location
2015-05-04 13:08:38 -07:00
3881e2e83e
Fixes #784 - add "create accessory" to topnav
2015-05-04 11:24:25 -07:00
snipe