Commit Graph

81 Commits

Author SHA1 Message Date
Abdullah Alansari 6bf2a2875f Add initial support for multiple companies
You can find screenshots and other files
related to the feature on Dropbox here:
https://www.dropbox.com/sh/wugnzqepwgzwlnh/AAAwNWA5hIKrP0y2VTu-LMHHa?dl=0

https://github.com/snipe/snipe-it/issues/23
2015-11-07 15:22:10 +03:00
snipe 28fcd2b8ab Fixed indenting 2015-10-21 21:31:38 -07:00
snipe cffd87c5a3 Fix user display if no location was provided 2015-09-15 10:52:12 -07:00
snipe 611da2ffbd Only show location map if $user->userloc is valid 2015-09-15 02:59:19 -07:00
madd15 dd2b9e15a6 Fix #1109 - Asset names are missing when viewing user history 2015-08-28 14:44:10 +09:30
snipe b3249dcf48 Merge remote-tracking branch 'origin/develop' into 2.0
# Conflicts:
#	app/controllers/admin/UsersController.php
#	app/models/Model.php
#	app/views/backend/hardware/edit.blade.php
#	app/views/backend/users/index.blade.php
#	composer.lock
2015-08-11 13:20:25 -07:00
snipe 3c0cc94652 Fixed route
TODO:

- add modal button
2015-08-06 04:53:23 -07:00
snipe 5dcc795aa2 Fixes #1024 - delete option added to user dropdown 2015-08-06 04:33:34 -07:00
madd15 336858e4ed Fix #1022 - Missing Lang on viewing deleted user 2015-08-06 09:33:53 +09:30
snipe 3bb296db78 Fixed language string for notes (when the hell did THAT break?) 2015-07-30 15:10:59 -07:00
snipe 2b2e6a8829 Additional localization strings 2015-07-25 00:20:17 -07:00
snipe cf3619d766 Fixes #937 - bug in which type of asset 2015-07-24 18:09:11 -07:00
madd15 616af831a7 Add title and content to delete modal 2015-07-10 09:54:14 +09:30
madd15 1e730078c1 Add file uploads to Users 2015-07-10 09:23:34 +09:30
snipe d77e763f86 Change badge to label 2015-06-23 15:04:35 -07:00
snipe 5266c22890 Show consumable checkout date 2015-06-23 14:10:04 -07:00
snipe 39a3b93537 Pagination on user history 2015-06-23 14:01:48 -07:00
snipe ba13101f64 Bad data language string 2015-06-23 13:48:56 -07:00
snipe 28a9f90a72 Lazy eager load history for optimized queries 2015-06-23 13:44:49 -07:00
snipe f2a2ccdab4 Nicer display for profile 2015-06-23 12:59:55 -07:00
snipe 9f9a9a51b3 Fixes #774 - layout issue on profiles 2015-04-29 23:21:04 -07:00
snipe 92a4f025d8 Fixes #718 - uppercase state/country abbreviations 2015-04-01 15:31:53 -07:00
madd15 3782531f57 Fix missing </div> 2015-03-19 16:13:14 +10:30
madd15 25dea384fe Change layout and add notes 2015-03-18 16:46:00 +10:30
madd15 4fd17f267a update icon 2015-03-10 14:10:55 +10:30
madd15 70c770a975 update icon 2015-03-10 14:08:02 +10:30
madd15 cbf1fc1988 Missing </div> 2015-03-10 14:05:12 +10:30
rashivkp f62f22b4bf ref #599. showing groups in user detail view. fixes a small design bug
with group edit view
2015-03-09 02:01:02 +05:30
snipe 817384b761 Fixes #597 - print-friendly view on users 2015-03-04 17:06:07 -08:00
snipe 7d5ee9750f Added #596 fix for accessories 2015-03-04 15:21:31 -08:00
snipe 1c333e4a24 Fixes #596 - better routes for checking in multiple items from user 2015-03-04 15:15:38 -08:00
snipe 04735f1aff Fixed assetlog display 2015-02-26 17:04:21 -08:00
snipe 1552c1e917 Accessories log (not reporting correctly yet) 2015-02-26 15:25:48 -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
madd15 88ce0abe85 more icons 2015-02-27 01:32:24 +10:30
snipe ca1351b704 Switched to all FA 2015-02-25 18:14:51 -08:00
snipe e22ce0d377 Changes added_on to created_at 2015-02-06 18:43:04 -08:00
snipe daefc86e58 Formattig fixes for #386 2014-11-21 06:10:30 -05:00
snipe 02feb69d5d Localization on user's view page, new strings 2014-11-12 16:22:30 -05:00
snipe 1078dbf5c5 Fixes #324 2014-11-03 02:39:11 -05:00
madd15 0b4c1b8d83 Feature Avatars
Appropriate changes to views and controllers
User Avatar Migration
Add intervention/image
2014-10-29 14:18:54 +10:30
snipe cd4e994ef5 Removed erronerous "All the users!" text 2014-08-15 19:27:35 -04:00
Cordeos Team 8d3d8c86b1 A0.4.3 add asset, license, user, model clone and artisan db migration 2014-08-12 17:25:07 +09:00
Cordeos Team b1fafa7ca4 Added asset, license, user and model cloning 2014-08-12 13:41:17 +09:00
Cordeos Team 0dfc9660ca alpha 0.4.0 release candidate 2014-08-11 17:13:43 +09:00
root cb8369e9de Initial QA Patch to fix errors
Add License
Add Asset
Show Deleted Users
License Assign
2014-08-08 00:03:12 +09:00
root b8a4c7e4d6 Initial COMMIT to set the file modified tracking. No changes made. 2014-08-05 13:22:08 +09:00
snipe 89000440f3 Added admin ability to unsuspend locked accounts #changelog 2014-07-16 18:21:22 -04:00
snipe 6068a940bd Added employee number to user view, per #183 2014-07-08 04:44:36 -04:00