ef6eae63d8
Fixed error icon
2015-02-26 15:50:33 -08:00
19ad8970d7
Fixed arrow icon
2015-02-26 14:08:42 -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
f9f3b5b4f9
Smaller buttons
2015-02-26 02:42:25 -08:00
ca1351b704
Switched to all FA
2015-02-25 18:14:51 -08:00
d2438f9fdb
Fixes #502 - normalized statuses
2015-02-10 15:57:19 -08:00
51a7752771
Moved cancel text to buttons language file
2015-02-06 18:52:09 -08:00
dc1033025a
Fixed #151 - more complete translations
2014-07-19 17:53:04 -04:00
276b1553c1
Mark required form elements as required
2014-07-08 19:17:31 -04: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
c937796224
More language strings, per #151
2014-06-09 21:30:58 -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
c2bf033fb8
More form/button class changes
2013-11-29 07:11:33 -05:00
030db6e267
Upgrading to bootstrap 3
...
Ugh.
2013-11-29 04:10:25 -05:00
4142629665
Layout tweaks for mobile - related to #54
2013-11-28 19:22:39 -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
5fcbc9ba78
ALL THE DATATABLES!
2013-11-25 07:24:51 -05:00
e9bd8397d8
Added site settings into controllers for page_num, added site_name to blade
2013-11-22 18:03:57 -05:00
5fae91d4e9
Added status label functionality
...
remember to run artisan DB migrations to make this work
2013-11-20 22:06:41 -05:00
snipe