Commit Graph

1854 Commits

Author SHA1 Message Date
snipe 9cf03e2e60 Better escaping on activity report page 2015-05-27 10:16:06 -07:00
snipe 212f09dd31 Fixes #806 2015-05-19 19:39:05 -07:00
snipe 8334e7b863 Removed extra open sans call 2015-05-19 19:37:34 -07:00
snipe a80d67c1ff Escaping on labels 2015-05-19 19:37:22 -07:00
snipe 7c95f4231e Fixes #799 - missing text in file delete confirmation 2015-05-14 20:52:19 -07:00
snipe 496a768013 Fixes #795 - add model name if no asset name 2015-05-11 19:23:11 -07:00
snipe 7415a5898f Twiddling column widths 2015-05-08 11:39:51 -07:00
snipe f1486bfee3 Nicer locations listing layout 2015-05-07 19:20:05 -07:00
snipe bc8521043b Bumped version 2015-05-07 18:21:48 -07:00
snipe 3597d71230 Eager load assigned asset locations 2015-05-07 18:21:39 -07:00
snipe d92e2eaebc Method for assigned asset locations 2015-05-07 18:21:27 -07:00
snipe 8cdea8a384 Fix for location totals 2015-05-07 18:21:10 -07:00
snipe 4457c7aec0 Removed extra commented stuff 2015-05-07 18:20:58 -07:00
snipe 95279f885b Fixes #759 - populate form with parent location info 2015-05-07 01:51:46 -07:00
snipe 75644eb894 Dashboard points to app url 2015-05-07 00:30:20 -07:00
snipe 2d7a348ab7 Fixed multi-level array nesting for locations 2015-05-07 00:15:44 -07:00
snipe 139dd13392 Super janky miulti-level menu on create - TODO: Fix this ish. 2015-05-04 18:13:26 -07:00
snipe 2f52369d07 Fixed location string 2015-05-04 15:13:04 -07:00
snipe aab52d0850 Fix for strict mode with location parent 2015-05-04 15:10:57 -07:00
snipe 71febc1c81 Added accessories and location 2015-05-04 13:31:47 -07:00
snipe 68d8b10b22 Changed text to icons for more compacted view 2015-05-04 13:31:38 -07:00
snipe 0d2333203a Display default location 2015-05-04 13:08:38 -07:00
snipe 3881e2e83e Fixes #784 - add "create accessory" to topnav 2015-05-04 11:24:25 -07:00
snipe 51eeee09d7 Fixes bug in #736 for new fields 2015-05-04 11:14:38 -07:00
snipe c487beeaca Asset counter for #759 (needs more work) 2015-05-04 03:05:22 -07:00
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 c8870ddcab Fixes #736 - more fields in bulk edit 2015-05-04 01:30:20 -07:00
snipe bbdbd5397c Check for valid asset before attempting to get name 2015-05-04 00:46:26 -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
v1.2.7
2015-05-02 12:28:34 -07:00
snipe 126121065c Merge branch 'patch-3' of https://github.com/DanielNemanic/snipe-it into develop
# Conflicts:
#	public/assets/css/compiled/user-profile.css
2015-05-02 12:27:40 -07:00
snipe 48ccf844fa Merge pull request #748 from DanielNemanic/patch-4
Update user-profile.css
2015-05-02 12:24:11 -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 9f9a9a51b3 Fixes #774 - layout issue on profiles 2015-04-29 23:21:04 -07:00
snipe a2dd2509fd Updated language strings for slack v1.2.7-beta 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 a0fce2e0fb Fixes #766
Should be refactored to make the Action logger into a base class and to use polymorphic relationships for the IDs, and migrate accessory_id into asset_id in the log table. This was quick and dirty.
2015-04-29 16:14:08 -07:00
snipe bce06543b2 Merge remote-tracking branch 'origin/master' into develop 2015-04-29 15:28:38 -07:00
snipe 9841dbbbc4 Fixed HTML so settings are saved correctly 2015-04-29 15:28:11 -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