Commit Graph

73 Commits

Author SHA1 Message Date
snipe f463cd6c8d Fixes for #759 - location heirarchy 2015-05-04 02:50:42 -07:00
snipe 5e7a4e8193 Fixes #599 - show groups in user list 2015-05-04 01:44:49 -07:00
snipe 527650d03b Merge branch 'patch-5' of https://github.com/DanielNemanic/snipe-it into DanielNemanic-patch-5
# Conflicts:
#	app/views/backend/models/view.blade.php
2015-05-02 12:28:34 -07:00
snipe 7556f989df Accessories Slack integration 2015-04-30 20:53:44 -07:00
snipe 8207597a58 Slack integration for Licenses 2015-04-30 20:37:23 -07:00
snipe 1137768f84 Escape notes 2015-04-30 19:23:41 -07:00
snipe 5f6925858b Richer slack integrations 2015-04-30 18:54:34 -07:00
snipe 77d1d93ebc Fixes #729 - CSS wordwrap for long licenses 2015-04-30 18:17:44 -07:00
snipe c95af84452 Fixes #750 because @uberbrady can't code 2015-04-30 17:14:31 -07:00
snipe 62b5ec5b02 Slack field validation and placeholder text 2015-04-30 16:58:33 -07:00
snipe a2dd2509fd Updated language strings for slack 2015-04-29 18:01:43 -07:00
snipe 3c00f38a0f Slack integration for asset checkin/checkout 2015-04-29 17:38:22 -07:00
snipe 767e2c69f3 Fixes #751 - ignore whether depreciation was selected or not to display purchase cost 2015-04-29 16:31:38 -07:00
snipe 3b491d4a6b Fixes #757 - use showAssetName method 2015-04-29 16:22:25 -07:00
snipe 179ef7f060 Removed unsupport languages 2015-04-29 16:17:13 -07:00
snipe d61506fcf7 Fixes for #766 - add activity report 2015-04-29 14:50:12 -07:00
snipe 6a7fcd5c40 Fixes #769 - set sort order for Accessory Category 2015-04-29 13:54:54 -07:00
snipe ba58e718b4 Resolved some deps from vendor changes 2015-04-16 22:18:35 -07:00
snipe 30c8fffa0a Loading string 2015-04-15 09:51:48 -07:00
snipe 9bbf933b05 Added missing search string 2015-04-08 16:25:34 -07:00
snipe 0cff78d127 Updated language strings 2015-04-02 15:42:58 -07:00
snipe e88a81141f Added view link to asset tag, since some assets won't have names 2015-04-02 15:40:41 -07:00
snipe c88ce0d14d Fixes for #722 datatables 2015-04-02 14:55:36 -07:00
snipe e4b45231ec Fix for bad seed data if Jon Doe doesn't get created 2015-04-01 17:22:48 -07:00
snipe 92a4f025d8 Fixes #718 - uppercase state/country abbreviations 2015-04-01 15:31:53 -07:00
snipe afdf00eacb Removed settings save for display fields 2015-03-27 22:34:39 -07:00
snipe 51148f1371 Removed additional settings, since all are displayable now 2015-03-27 22:32:38 -07:00
snipe d58cc8d490 Herp derp plural 2015-03-27 21:48:47 -07:00
snipe 0c827b318b Default location fix 2015-03-27 21:48:04 -07:00
snipe bbcc8aa9ac Update groups if unlocked 2015-03-25 14:26:12 -07:00
snipe 35bbea3052 Fixes #688 - show model if no asset name 2015-03-24 17:08:15 -07:00
snipe 75d5f494a3 Bypass site name validation if locked 2015-03-20 15:08:10 -07:00
snipe 40852f9a6a Update to settings edit 2015-03-20 15:00:05 -07:00
snipe 7f07f35beb Updated language strings 2015-03-20 14:56:12 -07:00
snipe 0c9bc4e59e Added link to Common Issues and Getting Help pages 2015-03-20 14:24:23 -07:00
snipe 80d2347095 Better label layout 2015-03-20 12:38:39 -07:00
snipe 139d206413 Select specific fields so Chumper has a smaller collection to parse 2015-03-17 18:05:01 -07:00
snipe 0292a0fee6 Checkall 2015-03-17 17:07:59 -07:00
snipe 8404736662 Added bulk edit button back into table footer 2015-03-17 16:52:10 -07:00
snipe c00086c740 Fix eager loading for user throttle 2015-03-17 15:36:11 -07:00
snipe c2c0196a3d Eager loading managers, licenses 2015-03-17 14:58:15 -07:00
snipe 3da652216b Possible fix for #652 - need to test mobile and Cinema display 2015-03-16 21:18:32 -07:00
snipe 0ffb5df40b Fixed changelog order 2015-03-16 20:22:32 -07:00
snipe 41dd7a2b2a Update to Senry 2.1.5 for security vulnerability 2015-03-16 18:39:13 -07:00
snipe c0b61991ba Smaller gap in header 2015-03-16 17:49:51 -07:00
snipe 1597461c02 More padding by filter 2015-03-16 17:42:01 -07:00
snipe e8355fe4ff Pulled code of conduct into its own file 2015-03-14 03:21:22 -07:00
snipe aabf879464 Added contributor code of conduct from http://contributor-covenant.org 2015-03-14 03:18:06 -07:00
snipe 41928e4bb9 Lighter colors on selected odd/even datables 2015-03-14 03:05:52 -07:00
snipe 6f38f76e4a Haha - TOTALLY cheated. But it works. Fixed ordering for linked names 2015-03-14 02:45:49 -07:00