Commit Graph

741 Commits

Author SHA1 Message Date
diwanicki 6d057846a1 again 2014-11-02 10:45:33 -05:00
diwanicki ba9f8c61f1 more 2014-11-02 10:41:52 -05:00
diwanicki d3266dd4e8 still more 2014-11-02 10:40:10 -05:00
diwanicki 9143ac461f and more 2014-11-02 10:37:32 -05:00
diwanicki 7199d6fd22 more adjustments 2014-11-02 10:29:24 -05:00
diwanicki 2b21b26950 more layout adjustments 2014-11-02 10:24:34 -05:00
diwanicki c122cc2647 layout adjustments
layout adjustment to Notes field, hide Notes from asset creation log
display
2014-11-02 10:06:23 -05:00
diwanicki ced8610833 cleanup, reorder, restore Asset view and edit
reordered fields on Asset Add/Edit form to flow more logically.
reordered fields on Asset View to flow more logically. Restored serial
number to Asset View. Added Asset specific notes field to Asset View
(they are in the log as part of the initial asset creation, but need to
be more prominent, especially if the device has a lot of history.
adjusted wording in EN lang template for clarity.
2014-11-02 08:48:42 -05:00
snipe af63d34412 Updated language strings 2014-11-01 19:06:44 -04:00
snipe 9e85dcb9fc Fixes #315 - add EOL as display option in settings (run migrations) 2014-11-01 18:38:24 -04:00
snipe 687c629953 Bootstrap HTML cleanup 2014-11-01 17:45:28 -04:00
snipe 13b3e2c4d4 HTML cleanup 2014-11-01 17:42:15 -04:00
snipe 4d8e663bd1 Replaced hard-coded month string for languag support 2014-11-01 17:27:07 -04:00
snipe 3e11ea70da Reverting to old page title 2014-11-01 17:24:57 -04:00
snipe 86b7b6946f Fixes #316 - added model name back to view 2014-11-01 17:14:36 -04:00
snipe 3184c3e03b Updated language files 2014-10-30 07:51:11 -04:00
snipe 55eb4325bc Merge pull request #309 from madd15/patch-2
Allow checkout to user or asset
2014-10-29 23:15:18 -04:00
madd15 cf4804a994 Added constraint to image to prevent upsizing 2014-10-30 10:34:52 +10:30
madd15 22590e2a43 Change file name to str_random(25) 2014-10-30 09:52:20 +10:30
madd15 d9f86df05f Uncomment User section 2014-10-30 09:34:55 +10:30
madd15 636eb29421 Change rule back to asset_id required_without 2014-10-30 09:33:31 +10:30
madd15 672e2e5fd4 Add gravatar_email 2014-10-30 09:06:13 +10:30
madd15 42ad3da3d3 Moved part of gravatar label to new line
<small> was conflicting with @lang
2014-10-30 09:04:47 +10:30
snipe 676155eacb Added translation link to footer 2014-10-29 17:50:21 -04:00
snipe 5abc4467df New placeholder language files for translations 2014-10-29 17:38:24 -04:00
snipe ffe095d64b Updates to language files 2014-10-29 17:38:07 -04:00
madd15 84cb51b4c3 Allow spaces in category name 2014-10-29 21:59:51 +10:30
madd15 30428cb858 Vars for lang - Image 2014-10-29 17:34:47 +10:30
madd15 26ab53c02c Added Location and Website 2014-10-29 17:33:10 +10:30
madd15 d8815b5ef5 Change to Vars for labels 2014-10-29 17:32:19 +10:30
madd15 e8737b156a Add image and avatar lang vars 2014-10-29 17:19:27 +10:30
madd15 f200e81334 Remove circle effect from image 2014-10-29 15:58:39 +10:30
madd15 03f3294873 Add images to models
Appropriate changes to views and controllers
includes migration and folder
2014-10-29 15:54:55 +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
madd15 fb46a04d78 Change Locations to sort by name asc 2014-10-28 16:01:11 +10:30
madd15 16420dafa9 Change paginate to get for Index
Fixes #261 - Pagination appears to work correctly after this change
2014-10-27 12:14:55 +10:30
rob 22f81912e4 Fixes #299 2014-10-24 17:08:50 -04:00
snipe e61f93deb8 Merge pull request #297 from madd15/patch-4
Changed rtd_location_id for edit to match create
2014-10-24 16:38:18 -04:00
madd15 b11a0cb436 Changed to == on $setting->qr_code 2014-10-25 00:27:25 +10:30
madd15 dd923984ef Changed rtd_location_id for edit to match create
Forgot to change postEdit
2014-10-24 15:17:07 +10:30
madd15 bbfc87dddf Change rtd_location_id to allow no location set 2014-10-24 14:50:27 +10:30
snipe 90497bb6a4 Updated spanish translations 2014-10-23 23:37:15 -04:00
snipe 309772e67d Fixed operator for setting bool display 2014-10-23 22:43:06 -04:00
snipe 139a0a2e2a Merge branch 'develop' of github.com:snipe/snipe-it into develop 2014-10-23 22:39:55 -04:00
snipe e17de3d34f Merge branch 'patch-2' of github.com:madd15/snipe-it into madd15-patch-2 2014-10-23 22:38:11 -04:00
madd15 a6cd7c0bab Changed to only one date for checkout date 2014-10-24 13:07:57 +10:30
snipe 062d16b2c0 Merge branch 'patch-2' of github.com:madd15/snipe-it into madd15-patch-2 2014-10-23 22:22:55 -04:00
madd15 7f44d6dd47 Add display_checkout_date to settings table 2014-10-24 12:48:04 +10:30
madd15 9125def119 Add checkout_date 2014-10-24 12:41:25 +10:30