 snipe
|
27e43eebcb
|
Added asset tag to license index view
|
2014-07-18 23:29:05 -04:00 |
|
|
snipe
|
196dbb856e
|
Merge remote-tracking branch 'origin/develop'
|
2014-07-18 23:25:48 -04:00 |
|
|
snipe
|
3d91a43554
|
Added asset tag to asset list
|
2014-07-18 23:25:33 -04:00 |
|
|
snipe
|
9df9371ffe
|
Merge remote-tracking branch 'origin/develop'
|
2014-07-18 20:25:12 -04:00 |
|
|
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
|
7f48ca04b0
|
Updated changelog
|
2014-07-17 14:01:04 -04:00 |
|
|
snipe
|
39fff92bdb
|
Updated changelog
|
2014-07-17 13:57:58 -04:00 |
|
|
snipe
|
43b98eff92
|
Merge remote-tracking branch 'origin/develop'
v0.3.10-alpha
|
2014-07-17 13:54:10 -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
|
7d04ded02a
|
DB migration for #140
|
2014-07-17 08:32:11 -04:00 |
|
|
snipe
|
04ea0528a8
|
Merge remote-tracking branch 'origin/develop'
|
2014-07-16 18:21:42 -04:00 |
|
|
snipe
|
89000440f3
|
Added admin ability to unsuspend locked accounts #changelog
|
2014-07-16 18:21:22 -04:00 |
|
|
snipe
|
73b469621f
|
Merge remote-tracking branch 'origin/develop'
|
2014-07-13 07:35:28 -04:00 |
|
|
snipe
|
e94087d62b
|
Changed country to dropdown
|
2014-07-11 19:12:53 -04:00 |
|
|
snipe
|
21251b4623
|
Fixed #190, where depreciation on licenses would not be saved
|
2014-07-09 21:12:58 -04:00 |
|
|
snipe
|
381f99543f
|
Merge remote-tracking branch 'origin/develop'
|
2014-07-09 11:58:47 -04:00 |
|
|
snipe
|
6f2b78ad9f
|
Added DB migration for #15
|
2014-07-09 11:50:54 -04:00 |
|
|
snipe
|
6043321bed
|
Added checkbox for marking an asset as requestable
|
2014-07-09 10:35:15 -04:00 |
|
|
snipe
|
03dffa3541
|
Added language string for requestable field
|
2014-07-09 10:34:54 -04:00 |
|
|
snipe
|
99003e126a
|
Fixed bug with edit (supplier_id), added requestable field for assets
|
2014-07-09 10:34:39 -04:00 |
|
|
snipe
|
82a84310ed
|
Added links to documentation and issues in footer
|
2014-07-09 08:45:11 -04:00 |
|
|
snipe
|
9dc40a3a9c
|
Fixed a few CSS quirks
|
2014-07-09 08:45:02 -04:00 |
|
|
snipe
|
784f7e8dec
|
WTF is wrong with me this morning? Hurr.
|
2014-07-09 07:08:15 -04:00 |
|
|
snipe
|
deb9f42ec8
|
Added gitbook.io badge
|
2014-07-09 07:07:22 -04:00 |
|
|
snipe
|
beb4d6500a
|
Added back the line separators
|
2014-07-09 07:05:47 -04:00 |
|
|
snipe
|
45fa66b41e
|
Updated copy
|
2014-07-09 07:03:10 -04:00 |
|
|
snipe
|
8eb2523293
|
Updated README to point to new documentation URL/branch
|
2014-07-09 07:02:08 -04:00 |
|
|
snipe
|
2b9494ed82
|
Fixed inconsistent password requirements across admin user creation, user profile and forgotten password
|
2014-07-09 05:18:53 -04:00 |
|
|
snipe
|
66c9264fcb
|
More consistent spacing on forgotten password page (col-md-3)
|
2014-07-09 05:11:53 -04:00 |
|
|
snipe
|
f22f23f21d
|
Fixed button label on forgotten password page
|
2014-07-09 05:10:57 -04:00 |
|
|
snipe
|
90eb883b67
|
Fixed #187 - replaced dummy site name with site name from admin panel preferences
|
2014-07-09 05:04:49 -04:00 |
|
|
snipe
|
300358bc46
|
Link to demo
|
2014-07-09 03:38:09 -04:00 |
|
|
snipe
|
3cffff3415
|
Added "still maintained" badge
|
2014-07-09 03:22:02 -04:00 |
|
|
snipe
|
4253744d9d
|
Merge remote-tracking branch 'origin/develop'
|
2014-07-09 03:10:42 -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
|
43485e1a51
|
Fixed language definition
|
2014-07-09 02:50:58 -04:00 |
|
|
snipe
|
5cdceb1db1
|
Merge remote-tracking branch 'origin/develop'
|
2014-07-08 19:55:03 -04:00 |
|
|
snipe
|
0c285d64bc
|
Tightened up Bootstrap 3 design, took care of leftover elements from 2.3
|
2014-07-08 19:47:19 -04:00 |
|
|
snipe
|
38cdbf8804
|
Added submit button language file
|
2014-07-08 19:44:17 -04:00 |
|
|
snipe
|
9606834e14
|
Made password length match 10 character standard imposed by admin user creation
|
2014-07-08 19:44:06 -04:00 |
|
|
snipe
|
276b1553c1
|
Mark required form elements as required
|
2014-07-08 19:17:31 -04:00 |
|
|
snipe
|
182f2bfa62
|
Merge remote-tracking branch 'origin/develop'
|
2014-07-08 05:38:27 -04:00 |
|
|
snipe
|
5266d9a30a
|
Fixed title tag for user list view
|
2014-07-08 05:38:07 -04:00 |
|
|
snipe
|
6068a940bd
|
Added employee number to user view, per #183
|
2014-07-08 04:44:36 -04:00 |
|
|
snipe
|
fc032c95b4
|
Misc indenting
|
2014-07-08 04:40:09 -04:00 |
|
|
snipe
|
2265b9321e
|
Additional language strings for #151
|
2014-07-08 04:40:01 -04:00 |
|
|
snipe
|
a7b809cb91
|
Updated title/header for users, additional fixes for #151
|
2014-07-08 04:39:51 -04:00 |
|