231e465898
Added category types to view
2015-02-26 16:00:52 -08:00
68c3e88343
Few more error icons
2015-02-26 15:52:38 -08:00
afe2eb736c
Added category type
2015-02-26 15:48:44 -08:00
97d97fc4df
Merge branch 'develop' of github.com:snipe/snipe-it into develop
...
Conflicts:
app/views/backend/categories/edit.blade.php
app/views/backend/depreciations/edit.blade.php
app/views/backend/groups/create.blade.php
app/views/backend/groups/edit.blade.php
app/views/backend/hardware/bulk.blade.php
app/views/backend/hardware/checkin.blade.php
app/views/backend/hardware/checkout.blade.php
app/views/backend/hardware/edit.blade.php
app/views/backend/licenses/checkin.blade.php
app/views/backend/licenses/checkout.blade.php
app/views/backend/licenses/edit.blade.php
app/views/backend/locations/edit.blade.php
app/views/backend/manufacturers/edit.blade.php
app/views/backend/models/edit.blade.php
app/views/backend/statuslabels/edit.blade.php
app/views/backend/suppliers/edit.blade.php
app/views/frontend/account/change-email.blade.php
app/views/frontend/account/change-password.blade.php
app/views/frontend/account/profile.blade.php
app/views/frontend/auth/forgot-password-confirm.blade.php
app/views/frontend/auth/signin.blade.php
2015-02-26 10:26:04 -08:00
379f6bef6c
catergories lang and serveral icons
2015-02-26 23:48:17 +10:30
59ea144b28
Minor UX tweaks
2015-02-26 03:07:19 -08:00
ca1351b704
Switched to all FA
2015-02-25 18:14:51 -08:00
ad39ec1dc3
Added markdown to EULA
2015-02-25 11:25:10 -08:00
097bb38a23
Fixes #163 - accept acceptance + eula
...
TODO: Language strings, check that the accepting user is the one that should be allowed to accept.
2015-02-24 22:15:36 -08:00
80e10c4c98
Fixes #387 - sortable asset view by manufacturer
2015-02-11 04:57:59 -08:00
c89be34503
Fixes #329 and #454 - added category asset view
2015-02-11 03:51:01 -08:00
51a7752771
Moved cancel text to buttons language file
2015-02-06 18:52:09 -08:00
0dfc9660ca
alpha 0.4.0 release candidate
2014-08-11 17:13:43 +09:00
87c2a4c9c0
initial commit
2014-08-10 16:42:40 +09:00
8b914102b7
Updated spacing for PSR-2
2014-06-24 17:49:39 -04:00
3e7a9e45d1
Fixes PR #168 and #167
2014-06-23 19:40:09 -04:00
cd0f42c508
Alphabetized language files, more for #151 , refactoring language string hierarchy.
2014-06-09 17:45:52 -04:00
75590b6852
More internationalization strings for #151
2014-06-09 00:49:52 -04:00
610c405aa5
More fixes for #151
2014-06-09 00:25:45 -04:00
94016678f8
More internationalization per #151
2014-06-09 00:02:31 -04:00
cdddbcf695
Using URL::previous to determine back button address
2013-12-12 00:50:56 -05:00
c11510fdca
Removes sorting from actions column. Fixes #56
2013-12-01 20:54:43 -05:00
2e916d0246
MOAR BOOTSTRAP
2013-11-29 08:39:10 -05:00
809e176908
Updating for bootstrap3
2013-11-29 07:39:41 -05:00
030db6e267
Upgrading to bootstrap 3
...
Ugh.
2013-11-29 04:10:25 -05:00
196710dac8
Fixed bug in error validation display
2013-11-26 14:55:04 -05:00
ee3fb2785e
Fixed XSS on modal
...
Weird thing. The values were being escaped on the way out but something in the modal javascript was parsing them out as if they weren't. Using data-html="false" seemed to have no effect on the modal. *shrug* Problem for another time.
2013-11-26 07:05:04 -05:00
3ba2880a35
Layout tweaks
2013-11-25 10:12:41 -05:00
e9bd8397d8
Added site settings into controllers for page_num, added site_name to blade
2013-11-22 18:03:57 -05:00
34bbf460ee
Added modal confirm-delete
2013-11-20 00:56:39 -05:00
f409ade3a5
So wow. Missed tables disappoint. Such code.
2013-11-18 12:51:20 -05:00
b554a9f9db
Updated blades with new style buttons
2013-11-18 04:49:54 -05:00
cfb37dcec0
Replaced english text with language reference on buttons
2013-11-17 20:05:12 -05:00
cf59ec8c67
Fixed pagination bug
...
Code required
@if ($models->getTotal() > 10)
NOT
@if (count($models) > 10)
2013-11-16 11:32:18 -05:00
c1e1323e68
cleanup
2013-11-16 08:12:25 -05:00
2e132331e7
Refactoring
...
Removes extraneous create.blade.php, cleaned up some functions
2013-11-16 03:25:40 -05:00
31b90cf2a3
removed ID column. No one cares about the ID
2013-11-15 22:33:02 -05:00
79da13dff7
Fixed layout for category view
2013-11-15 05:07:34 -05:00
b8d4823cae
Removed created_at column in results.
...
No one cares when a category or manufacturer was created.
2013-11-15 05:06:26 -05:00
51cd0b0208
only paginate if there are > 10 results, added parentname output
2013-11-15 04:30:38 -05:00
1bd87cca05
removed excess white space
2013-11-15 04:27:26 -05:00
0fcd64c386
categories dropdown in create/edit form
2013-11-14 22:32:16 -05:00
590dbb2bd5
Create form
...
I will probably make these modals later - the UX is a little clumsy this way
2013-11-14 21:46:13 -05:00
54cd3d04b1
Added buttons for edit/delete
2013-11-14 21:45:33 -05:00
a8d192d263
updated category view
2013-11-13 17:47:16 -05:00
dd8d23bcf7
category view blades
2013-11-13 17:01:52 -05:00
snipe