 snipe
|
e434616db8
|
Merge pull request #436 from rashivkp/fix-435
fixed #435. using namespace with route groups to increase the readability
v1.2
|
2015-01-04 21:50:07 -06:00 |
|
|
snipe
|
8a7b7418db
|
Merge pull request #433 from thehereward/tidy-up-models
Tidy up models
|
2015-01-04 21:49:57 -06:00 |
|
|
Mohamed Rashid
|
533be7f942
|
fixed #435. using namespace with route groups to increase the readability
|
2015-01-05 01:24:16 +05:30 |
|
|
Hereward Mills
|
094ec50a68
|
TidyUp: Commonise the depreciate method of Asset and License.
|
2014-12-24 23:03:06 +00:00 |
|
|
Hereward Mills
|
98a29e460d
|
TidyUp: Remove excess whitespace.
|
2014-12-24 22:34:16 +00:00 |
|
|
snipe
|
27fabfd110
|
Updated readme
|
2014-12-23 14:50:34 -05:00 |
|
|
snipe
|
dce1d47228
|
Updated language files
|
2014-12-23 14:48:43 -05:00 |
|
|
snipe
|
9bbec53635
|
Added --no-dev to composer for CI
|
2014-12-23 14:19:46 -05:00 |
|
|
snipe
|
82232a34ee
|
Merge pull request #415 from svpernova09/feature/software-maintenance-additions
Feature/software maintenance additions Working on #232
|
2014-12-23 14:11:20 -05:00 |
|
|
Svpernova09
|
3d1795e312
|
Add process handling of new maintained and termination_date fields to the licenses methods for creating and editing licenses. Also add array for getCreate and getEdit to easily display maintained options in drop down
|
2014-12-10 07:45:53 -06:00 |
|
|
Svpernova09
|
d858861d0f
|
Add termination_date and maintained fields to the License edit form. Add field labels to language file.
|
2014-12-10 07:44:47 -06:00 |
|
|
Svpernova09
|
eec36cb13a
|
Add migration to add maintained and termination_date fields to licenses table
|
2014-12-10 07:43:57 -06:00 |
|
|
snipe
|
cee966e76e
|
Merge pull request #408 from svpernova09/feature/add-asset-from-model-view
Feature/add asset from model view for #365
|
2014-12-03 15:25:56 -05:00 |
|
|
Svpernova09
|
dcf2b428da
|
If we are passing along an id of a previously selected model, use that as the default selection. Otherwise we should fall back to Input::old()
|
2014-12-03 14:06:33 -06:00 |
|
|
Svpernova09
|
80d8432c35
|
Check the optional parameter and if there is a value, grab that model and pass along to the view. Refactored the view return to be easier to read and able to interject if our parameter was set.
|
2014-12-03 14:05:42 -06:00 |
|
|
Svpernova09
|
8ec5934af5
|
Add menu option in dropdown to create new hardware. Add optional parameter in create/hardware route to handle the parameter in the incoming link
|
2014-12-03 14:04:02 -06:00 |
|
|
snipe
|
31f77dcb4b
|
Merge pull request #407 from svpernova09/bug/500-error-when-viewing-asset
Check if ->adminuser->id isset before trying to print the fullName so we...
|
2014-12-03 14:08:09 -05:00 |
|
|
Svpernova09
|
0663ccb99f
|
Check if ->adminuser->id isset before trying to print the fullName so we can catch when a user that created an asset has been deleted. Fixes #349
|
2014-12-03 07:46:29 -06:00 |
|
|
snipe
|
19189f688f
|
Merge pull request #405 from svpernova09/enhancement/make-notes-field-textarea
Enhancement/make notes field textarea
|
2014-12-02 11:21:36 -05:00 |
|
|
Svpernova09
|
7849320db0
|
Convert note fields to text areas for licenses views
|
2014-12-02 06:59:16 -06:00 |
|
|
Svpernova09
|
cc8ca54b3f
|
Convert note fields to text areas for hardware views
|
2014-12-02 06:59:01 -06:00 |
|
|
Svpernova09
|
ecb4d0d948
|
Add jetbrains IDE's config folders to gitignore
|
2014-12-02 06:51:50 -06:00 |
|
|
snipe
|
f20566f222
|
Merge pull request #393 from madd15/patch-1
Fix #388 - License not showing checked out in view
|
2014-11-23 19:36:28 -05:00 |
|
|
madd15
|
73dd339772
|
Fix #388 - License not showing checked out in view
|
2014-11-24 11:05:24 +10:30 |
|
|
snipe
|
5e6c4a250a
|
Updated composer lock
|
2014-11-21 07:34:06 -05:00 |
|
|
snipe
|
bf96aae9d9
|
Truncate license in report
|
2014-11-21 07:32:12 -05:00 |
|
|
snipe
|
daefc86e58
|
Formattig fixes for #386
|
2014-11-21 06:10:30 -05:00 |
|
|
snipe
|
64c16a0bac
|
Fixes #386 and #273 - altered column type to text
|
2014-11-21 05:47:49 -05:00 |
|
|
snipe
|
89a2b87e42
|
Fixes #367 - added model number to dropdown
|
2014-11-21 05:20:08 -05:00 |
|
|
snipe
|
1b41c974cf
|
Fixes #348 - remove constraints on license keys
|
2014-11-20 18:43:33 -05:00 |
|
|
snipe
|
d6a0249c60
|
Fixed #373 - added ability to auto-increment asset tags
|
2014-11-20 18:28:45 -05:00 |
|
|
snipe
|
6a6676b1e7
|
Merge pull request #383 from madd15/patch-1
Fix half #377 - Checkout users last_name, first_name
|
2014-11-20 17:19:44 -05:00 |
|
|
madd15
|
1024816313
|
Fix #377 - Checkout users last_name, first_name
|
2014-11-21 08:47:19 +10:30 |
|
|
snipe
|
6905d82fc4
|
Fixes #374 to keep the requirement to PHP 5.4
|
2014-11-20 16:38:50 -05:00 |
|
|
snipe
|
22746db8b7
|
Newest translations
|
2014-11-20 16:28:38 -05:00 |
|
|
snipe
|
b826673d0d
|
Added username field for #377
|
2014-11-20 16:17:48 -05:00 |
|
|
snipe
|
637009054c
|
Fixed typo in english
|
2014-11-20 16:09:30 -05:00 |
|
|
snipe
|
5f5be6aa2a
|
Removed line break
|
2014-11-20 16:09:21 -05:00 |
|
|
snipe
|
a863cf1615
|
Merge pull request #364 from madd15/patch-1
Remove Double </label>
|
2014-11-13 18:30:40 -05:00 |
|
|
madd15
|
05d8ff0252
|
Remove Double </label>
|
2014-11-14 09:57:02 +10:30 |
|
|
snipe
|
b73ae3147a
|
Fixes #362, reduced asset name to 2 char min
|
2014-11-13 16:26:39 -05:00 |
|
|
snipe
|
81b2ce33c2
|
Polish, german and spanish translation strings
|
2014-11-12 21:13:46 -05:00 |
|
|
snipe
|
501e1749b3
|
Updated localization strings
|
2014-11-12 17:38:56 -05:00 |
|
|
snipe
|
53f279f55f
|
Language string for "generate"
|
2014-11-12 17:34:22 -05:00 |
|
|
snipe
|
f5fb2525de
|
Merge branch 'develop' of github.com:snipe/snipe-it into develop
|
2014-11-12 17:32:58 -05:00 |
|
|
snipe
|
53951c8bbc
|
Nicer custom reports form layout
|
2014-11-12 17:32:48 -05:00 |
|
|
snipe
|
00755eadf0
|
Merge pull request #359 from madd15/patch-1
Fix Lang for Reports
|
2014-11-12 17:17:07 -05:00 |
|
|
madd15
|
13b173409f
|
Fix License form langs
|
2014-11-13 08:44:47 +10:30 |
|
|
madd15
|
7ddc6d497a
|
Fix Report Langs
|
2014-11-13 08:43:42 +10:30 |
|
|
snipe
|
2829eeca7c
|
New reports language files
|
2014-11-12 17:05:46 -05:00 |
|