Commit Graph

20 Commits

Author SHA1 Message Date
madd15 d9b9224045 Fix mobile unable to click sign in 2015-03-25 13:02:02 +10:30
snipe 3da652216b Possible fix for #652 - need to test mobile and Cinema display 2015-03-16 21:18:32 -07:00
madd15 1d3d41b808 Remove forgot password link from above form 2015-03-14 15:01:04 +10:30
madd15 fc81e404ca Fix #652 - Change UX of signin form 2015-03-14 15:00:02 +10:30
snipe 7047af44f6 Fixed layout for remember me button 2015-02-28 13:30:14 -08:00
snipe ef6eae63d8 Fixed error icon 2015-02-26 15:50:33 -08:00
snipe 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
madd15 379f6bef6c catergories lang and serveral icons 2015-02-26 23:48:17 +10:30
snipe 59ea144b28 Minor UX tweaks 2015-02-26 03:07:19 -08:00
snipe ca1351b704 Switched to all FA 2015-02-25 18:14:51 -08:00
snipe ec1ab6913e Merged layout blades for unified nav 2015-02-16 12:55:32 -08:00
snipe 51a7752771 Moved cancel text to buttons language file 2015-02-06 18:52:09 -08: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 0c285d64bc Tightened up Bootstrap 3 design, took care of leftover elements from 2.3 2014-07-08 19:47:19 -04:00
snipe 8b914102b7 Updated spacing for PSR-2 2014-06-24 17:49:39 -04:00
snipe ddf0997a93 Signin BS3 2013-11-29 09:05:30 -05:00
snipe 030db6e267 Upgrading to bootstrap 3
Ugh.
2013-11-29 04:10:25 -05:00
Nick Peelman 8d3d337820 Change input type to email where relevant (better mobile support) 2013-11-27 08:42:31 -05:00
snipe feda21a6e3 Initial laravel import 2013-11-13 01:59:39 -05:00