ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,491 Commits 84 Branches 293 Tags
04735f1affd2fdff9d6cf96ed583ece895cfb341
Commit Graph

40 Commits

Author SHA1 Message Date
snipe ef6eae63d8 Fixed error icon 2015-02-26 15:50:33 -08:00
snipe 31df29cac8 Fixed funky layout from datatables 2015-02-26 13:05:10 -08:00
snipe 3e189d3502 Fixes #538 - sortable tables 2015-02-26 12:59:40 -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 88ce0abe85 more icons 2015-02-27 01:32:24 +10:30
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 6ab95ff387 Prevent auth changes on demo 2015-02-25 10:37:39 -08:00
snipe 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
snipe de94311c47 Add ability to prevent passwords from being changed 2015-02-24 11:57:46 -08:00
snipe 4e4144ea74 Fixed blade reference 2015-02-16 19:43:22 -08:00
snipe ec1ab6913e Merged layout blades for unified nav 2015-02-16 12:55:32 -08:00
snipe ab1c921443 Requestable assets views and controllers 2015-02-10 23:55:06 -08:00
snipe 51a7752771 Moved cancel text to buttons language file 2015-02-06 18:52:09 -08:00
snipe 2fbef7f561 Updated field name for asset log 2015-02-06 18:42:48 -08:00
madd15 42ad3da3d3 Moved part of gravatar label to new line 
<small> was conflicting with @lang
 2014-10-30 09:04:47 +10:30
madd15 d8815b5ef5 Change to Vars for labels 2014-10-29 17:32:19 +10:30
madd15 239370058c changed to avatar 2014-10-29 14:28:24 +10:30
madd15 0b4c1b8d83 Feature Avatars 
Appropriate changes to views and controllers
User Avatar Migration
Add intervention/image
 2014-10-29 14:18:54 +10:30
root b8a4c7e4d6 Initial COMMIT to set the file modified tracking. No changes made. 2014-08-05 13:22:08 +09: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 276b1553c1 Mark required form elements as required 2014-07-08 19:17:31 -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
snipe 8b914102b7 Updated spacing for PSR-2 2014-06-24 17:49:39 -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 11c657ffa4 Fixes #36 2013-11-29 16:08:18 -05: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 54894227f0 Removed unneeded 2013-11-25 01:02:27 -05:00
snipe e3fa628bac Reskin files 2013-11-18 04:04:06 -05:00
snipe e4443b8988 Removing unnecessary cruft 2013-11-16 06:38:51 -05:00
snipe 86087b2c4f merged fronted with backend 2013-11-15 22:08:36 -05:00
snipe fc6e41e464 Removing extraneous nav 
This view/nav will probably go away, since we don't really have a frontend, everything is behind a login
 2013-11-13 05:54:23 -05:00
snipe feda21a6e3 Initial laravel import 2013-11-13 01:59:39 -05:00