 snipe
|
ca24ef1cd8
|
Merge branch 'refs/heads/feature/add-asset-to-software' into develop
Conflicts:
app/controllers/admin/LicensesController.php
|
2014-07-18 20:24:51 -04:00 |
|
|
snipe
|
ac4c905c42
|
Fixed #140
|
2014-07-18 20:09:58 -04:00 |
|
|
snipe
|
e203fc516f
|
Fixes #194
|
2014-07-17 13:51:58 -04:00 |
|
|
snipe
|
ff61705a8f
|
More edits for #140
|
2014-07-17 13:38:53 -04:00 |
|
|
snipe
|
aa8bbb88e9
|
Updated MVC for #140, ability to assign software to asset (incomplete)
|
2014-07-17 08:33:30 -04:00 |
|
|
snipe
|
21251b4623
|
Fixed #190, where depreciation on licenses would not be saved
|
2014-07-09 21:12:58 -04:00 |
|
|
snipe
|
8b914102b7
|
Updated spacing for PSR-2
|
2014-06-24 17:49:39 -04:00 |
|
|
snipe
|
bef5170b7c
|
More cleanup
|
2014-06-19 22:19:20 -04:00 |
|
|
snipe
|
a4c931e4fd
|
Cleanup
|
2014-06-19 22:14:54 -04:00 |
|
|
snipe
|
d1499deecd
|
Provisions for strict mode, fixed license deletion bug
|
2014-06-19 22:13:59 -04:00 |
|
|
Brad Coudriet
|
8f744e02fd
|
Improve License Editing to add or delete seats
|
2014-06-18 13:39:54 -04:00 |
|
|
snipe
|
607484b294
|
Fixes #141 for mysql with strict mode enabled
|
2014-05-27 19:51:24 -04:00 |
|
|
feeva
|
40d6ad09ae
|
Hard-coded English text strings should be moved to their language files
|
2014-01-04 17:55:19 +00:00 |
|
|
snipe
|
dd701d253c
|
Set values to null if they are 0
|
2013-12-06 04:59:24 -05:00 |
|
|
snipe
|
299393aa26
|
Set the log to track the license_id instead of seat id
|
2013-12-06 02:09:46 -05:00 |
|
|
snipe
|
56b52392e8
|
honor user soft-deletes
|
2013-11-29 09:28:45 -05:00 |
|
|
snipe
|
e23f1f10b7
|
Switched validation to alpha_space on notes
|
2013-11-28 20:02:11 -05:00 |
|
|
snipe
|
012a889444
|
Corrected license seat count associated with license. Fixes #75
|
2013-11-27 14:13:29 -05:00 |
|
|
snipe
|
aa38d83ba6
|
Fixes #63 and #70
|
2013-11-27 02:38:16 -05:00 |
|
|
snipe
|
dc5ad87686
|
Fixes #59
|
2013-11-26 11:57:14 -05:00 |
|
|
snipe
|
4d1dd1c446
|
Fixed #50 - MOAR VALIDATION!
|
2013-11-26 02:09:37 -05:00 |
|
|
snipe
|
3ea0ad87c8
|
Fixes #22
|
2013-11-25 12:39:47 -05:00 |
|
|
snipe
|
03edbc008c
|
Fixes #43
|
2013-11-25 04:28:51 -05:00 |
|
|
snipe
|
0d9184870c
|
More license tweaks - view blade, asset log
|
2013-11-25 03:48:54 -05:00 |
|
|
snipe
|
faae6a21d3
|
More license tweaks
|
2013-11-25 03:22:38 -05:00 |
|
|
snipe
|
1b01074b9e
|
Changed license structure to use join table to handle multiple seats
|
2013-11-25 01:04:39 -05:00 |
|
|
snipe
|
e9bd8397d8
|
Added site settings into controllers for page_num, added site_name to blade
|
2013-11-22 18:03:57 -05:00 |
|
|
snipe
|
f3114dec7a
|
Prevent licenses, models and assets from being deleted if they are assigned to something else
|
2013-11-20 06:48:25 -05:00 |
|
|
snipe
|
8daffa82fe
|
Added logging to license checkin/checkout
|
2013-11-19 17:32:50 -05:00 |
|
|
snipe
|
48e180c691
|
Fixed asset bug caused by unique validation in assets model
Pulled validation back out into the controller for asset tag
|
2013-11-18 04:50:28 -05:00 |
|
|
snipe
|
7bc7ffb728
|
Fixed some error reporting/required fields around checkout/checkin
|
2013-11-18 01:16:08 -05:00 |
|
|
snipe
|
ec4239693d
|
Checkin/Checkout for licenses
|
2013-11-18 00:55:05 -05:00 |
|
|
snipe
|
ea571535b0
|
extra whitespace
|
2013-11-17 22:14:32 -05:00 |
|
|
snipe
|
7bdd5505fd
|
Moved validation to model
|
2013-11-17 22:14:02 -05:00 |
|
|
snipe
|
f62fdd9aeb
|
Email validation if the license_email field is filled in
|
2013-11-17 18:41:16 -05:00 |
|
|
snipe
|
38d85afc2b
|
Added where clause for physical = 0 for non-physical assets
|
2013-11-17 01:51:19 -05:00 |
|
|
snipe
|
2e132331e7
|
Refactoring
Removes extraneous create.blade.php, cleaned up some functions
|
2013-11-16 03:25:40 -05:00 |
|
|
snipe
|
4f0a1789db
|
Fixed license blades
|
2013-11-16 01:14:52 -05:00 |
|
|
snipe
|
abd060679e
|
License CRUD
|
2013-11-15 15:47:34 -05:00 |
|