 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
|
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
|
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
|
6043321bed
|
Added checkbox for marking an asset as requestable
|
2014-07-09 10:35:15 -04:00 |
|
|
snipe
|
82a84310ed
|
Added links to documentation and issues in footer
|
2014-07-09 08:45:11 -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
|
6b5a552d95
|
Fixed #186 - Bug with select box not retaining selections on edit screen
|
2014-07-09 03:09:55 -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
|
276b1553c1
|
Mark required form elements as required
|
2014-07-08 19:17:31 -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
|
a7b809cb91
|
Updated title/header for users, additional fixes for #151
|
2014-07-08 04:39:51 -04:00 |
|
|
snipe
|
af269b536e
|
Refactored users to use same form for edit/create
|
2014-07-08 04:35:23 -04:00 |
|
|
snipe
|
c782f29f5a
|
Pulled account sub-nav into top menu to free up UI space. #changelog
|
2014-07-02 13:56:12 -04:00 |
|
|
snipe
|
2825bcb431
|
Fixed #179 - account page to show assets checked out to the logged in user
|
2014-07-02 13:55:34 -04:00 |
|
|
leostat
|
a170efae27
|
fix for #167
|
2014-06-26 11:10:13 +01:00 |
|
|
leostat
|
919119c5b9
|
Sanatise fullname class #167
|
2014-06-26 10:45:31 +01:00 |
|
|
snipe
|
d24c4ed7eb
|
Widened column for nicer layout
|
2014-06-24 18:22:26 -04:00 |
|
|
snipe
|
a0f7083e9c
|
Improved bootstrap nav for mobile
|
2014-06-24 18:04:15 -04:00 |
|
|
snipe
|
8b914102b7
|
Updated spacing for PSR-2
|
2014-06-24 17:49:39 -04:00 |
|
|
snipe
|
77f4848d6e
|
Missed a few
|
2014-06-24 17:45:21 -04:00 |
|
|
snipe
|
afabd28142
|
Additional fixes for #167
|
2014-06-24 16:28:20 -04:00 |
|
|
snipe
|
124acc89c4
|
Resolves #174
|
2014-06-24 14:15:39 -04:00 |
|
|
snipe
|
47a8363f1d
|
Merge pull request #173 from madd15/develop
Remove Double 'Display QR Codes' and change triple =
|
2014-06-23 23:48:15 -04:00 |
|
|
snipe
|
b09aec67f1
|
Fixes #155
|
2014-06-23 23:46:14 -04:00 |
|
|
madd15
|
82f0c6f00c
|
Change to Triple = and no '
|
2014-06-24 13:02:13 +09:30 |
|
|
madd15
|
9fe76a21f6
|
Remove double 'Display QR Codes'
|
2014-06-24 12:46:37 +09:30 |
|
|
madd15
|
3b9f96419b
|
Check boxes not showing correct settings
|
2014-06-24 12:31:43 +09:30 |
|
|
madd15
|
164ca5f77b
|
Change Back Button Icon on Update Supplier
|
2014-06-24 12:12:45 +09:30 |
|
|
snipe
|
a142afe177
|
Oops. Forgot zip code.
|
2014-06-23 22:38:19 -04:00 |
|
|
snipe
|
15d48c903e
|
Helpful links for hardware view
|
2014-06-23 22:33:42 -04:00 |
|
|
snipe
|
cbd3420327
|
Better phrasing
|
2014-06-23 22:23:14 -04:00 |
|
|
snipe
|
380417953b
|
Fixed missing string
|
2014-06-23 22:17:07 -04:00 |
|
|
snipe
|
6f42b3045e
|
Resolves #155
|
2014-06-23 22:09:32 -04:00 |
|
|
snipe
|
3e7a9e45d1
|
Fixes PR #168 and #167
|
2014-06-23 19:40:09 -04:00 |
|
|
Josh Deakin
|
7ddf84adf7
|
Change Warning to Info User no results
|
2014-06-21 12:43:18 +09:30 |
|
|
Josh Deakin
|
57628d725e
|
User No Results
Change No Results on user page to general no results
|
2014-06-21 12:37:51 +09:30 |
|
|
snipe
|
08d05b481f
|
Fixes #158
|
2014-06-19 16:10:00 -04:00 |
|
|
snipe
|
8aebaaf502
|
Few more localization strings for #151
|
2014-06-10 04:15:50 -04:00 |
|
|
snipe
|
c937796224
|
More language strings, per #151
|
2014-06-09 21:30:58 -04:00 |
|
|
snipe
|
74653d3480
|
More refactoring of language structure, language strings per #151
|
2014-06-09 19:56:47 -04:00 |
|
|
snipe
|
cd0f42c508
|
Alphabetized language files, more for #151, refactoring language string hierarchy.
|
2014-06-09 17:45:52 -04:00 |
|
|
snipe
|
2fe66c1bdc
|
More internationalization per #151
|
2014-06-09 16:01:44 -04:00 |
|