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
f9f3b5b4f9
Smaller buttons
2015-02-26 02:42:25 -08:00
ca1351b704
Switched to all FA
2015-02-25 18:14:51 -08:00
8b914102b7
Updated spacing for PSR-2
2014-06-24 17:49:39 -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
b627c5cfbf
More translation substitutions
2014-05-06 03:39:02 -04:00
329980c6c6
Unsquished blade for group display
2013-12-04 12:05:37 -05:00
c11510fdca
Removes sorting from actions column. Fixes #56
2013-12-01 20:54:43 -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
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
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
d2427bdea2
Cosmetic tweaks
2013-11-18 06:54:12 -05:00
b554a9f9db
Updated blades with new style buttons
2013-11-18 04:49:54 -05:00
2e132331e7
Refactoring
...
Removes extraneous create.blade.php, cleaned up some functions
2013-11-16 03:25:40 -05:00
feda21a6e3
Initial laravel import
2013-11-13 01:59:39 -05:00
snipe