 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
|
89000440f3
|
Added admin ability to unsuspend locked accounts #changelog
|
2014-07-16 18:21:22 -04:00 |
|
|
snipe
|
21251b4623
|
Fixed #190, where depreciation on licenses would not be saved
|
2014-07-09 21:12:58 -04:00 |
|
|
snipe
|
99003e126a
|
Fixed bug with edit (supplier_id), added requestable field for assets
|
2014-07-09 10:34:39 -04:00 |
|
|
snipe
|
6b5a552d95
|
Fixed #186 - Bug with select box not retaining selections on edit screen
|
2014-07-09 03:09:55 -04:00 |
|
|
snipe
|
af269b536e
|
Refactored users to use same form for edit/create
|
2014-07-08 04:35:23 -04:00 |
|
|
snipe
|
8b914102b7
|
Updated spacing for PSR-2
|
2014-06-24 17:49:39 -04:00 |
|
|
snipe
|
67d23bdb45
|
Janky url validator to add http://
|
2014-06-24 15:51:13 -04:00 |
|
|
snipe
|
b09aec67f1
|
Fixes #155
|
2014-06-23 23:46:14 -04:00 |
|
|
snipe
|
6f42b3045e
|
Resolves #155
|
2014-06-23 22:09:32 -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 |
|
|
snipe
|
08d05b481f
|
Fixes #158
|
2014-06-19 16:10:00 -04:00 |
|
|
Brad Coudriet
|
8f744e02fd
|
Improve License Editing to add or delete seats
|
2014-06-18 13:39:54 -04:00 |
|
|
snipe
|
dc256583d4
|
Fixes #144
|
2014-06-06 13:40:54 -04:00 |
|
|
snipe
|
607484b294
|
Fixes #141 for mysql with strict mode enabled
|
2014-05-27 19:51:24 -04:00 |
|
|
snipe
|
e512b8f7ef
|
Removed hardcoded USD symbol
|
2014-05-06 03:35:03 -04:00 |
|
|
snipe
|
ca0f5df63a
|
Reverting Pull Request #138
|
2014-05-06 00:48:09 -04:00 |
|
|
snipe
|
06067fc19c
|
Fixed CSV rexport
|
2014-05-06 00:10:19 -04:00 |
|
|
Jake McGraw
|
af603f0380
|
make text below asset tags configurable
|
2014-05-03 20:06:59 +00:00 |
|
|
snipe
|
a2f068eb8f
|
Missed one
|
2014-01-28 20:28:31 -05:00 |
|
|
snipe
|
580590b4c0
|
Fixed === to == (PHP is loosely typed)
|
2014-01-28 20:24:37 -05:00 |
|
|
Jake McGraw
|
01612652b5
|
use same dimensions in render and display
|
2014-01-28 05:33:03 +00:00 |
|
|
Jake McGraw
|
5cb0a1465e
|
added QR code route for asset controller
added QR code inclusion on asset controller getView action/template
|
2014-01-28 05:16:57 +00:00 |
|
|
Jake McGraw
|
55b54e0a42
|
added sql migration for qr_code in settings table
added baconqr to composer package list
added admin settings page for qr code
|
2014-01-28 04:25:58 +00:00 |
|
|
feeva
|
40d6ad09ae
|
Hard-coded English text strings should be moved to their language files
|
2014-01-04 17:55:19 +00:00 |
|
|
snipe
|
f6717d9f49
|
Added manager drop down for users, manager name in index
|
2013-12-12 01:49:38 -05:00 |
|
|
snipe
|
1cec46f997
|
Updated comment, made save on edit return to listing page
|
2013-12-10 05:17:15 -05:00 |
|
|
snipe
|
4468cbd096
|
Fixes #112
|
2013-12-10 04:48:40 -05: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
|
9308059230
|
Can't enforce unique here, or it will see itself and fail
|
2013-12-03 06:26:27 -05:00 |
|
|
snipe
|
ac9dfe2edc
|
DESC? WTF? Hurr.
|
2013-12-03 06:14:02 -05:00 |
|
|
snipe
|
194150bbf0
|
Hacky shit to fix pagination weirdness - will come back to this
|
2013-12-03 06:02:29 -05:00 |
|
|
snipe
|
b97f5fc043
|
Serial should be unique for hardware
|
2013-12-03 05:46:19 -05:00 |
|
|
snipe
|
965d329ae5
|
Order by name in user drop down list
|
2013-12-03 04:53:07 -05:00 |
|
|
snipe
|
9fe8ace39b
|
Order form lists by name
|
2013-12-03 02:41:16 -05:00 |
|
|
snipe
|
d591c1ea04
|
Fixed bug where RTD = 1 instead of 0
|
2013-12-03 02:14:05 -05:00 |
|
|
snipe
|
9c718dce59
|
Removed serial requirement
|
2013-12-03 01:11:23 -05:00 |
|
|
snipe
|
e09d250dd6
|
Removed name as required field
|
2013-12-03 00:19:22 -05:00 |
|
|
snipe
|
cfd6c4301c
|
Merge pull request #110 from flashingcursor/develop
Started implementing Datatables ... User table partially implemented.
|
2013-12-02 03:09:10 -08:00 |
|
|
Gil Rutkowski
|
a0267db832
|
Datatables partially implemented on user table.
|
2013-12-02 00:21:04 -06:00 |
|
|
Desmond Morris
|
c8e47ad00e
|
Adds fullname of user assigned user to report export
|
2013-12-01 22:16:16 -05:00 |
|
|
Desmond Morris
|
47b065208e
|
Implements first pass at csv exports of reports (#35)
|
2013-12-01 22:04:56 -05:00 |
|
|
snipe
|
2be6c6f5da
|
Hurr.
|
2013-11-29 16:57:49 -05:00 |
|