 snipe
|
e1724cf25f
|
Merge remote-tracking branch 'origin/develop' into 2.0
# Conflicts:
# .gitignore
# app/config/production/session.example.php
# app/config/staging/session.example.php
# app/config/version.php
# app/models/User.php
|
2015-07-09 01:02:49 -07:00 |
|
|
snipe
|
e9443a244c
|
Small fix to config value
|
2015-07-09 00:52:05 -07:00 |
|
|
snipe
|
f8be47dfbf
|
Fixes #903 - adds config variable for multi_login, overrides Sentry method
|
2015-07-09 00:41:46 -07:00 |
|
|
snipe
|
28a9f90a72
|
Lazy eager load history for optimized queries
|
2015-06-23 13:44:49 -07:00 |
|
|
snipe
|
d0189fb076
|
Added consumables to user matrix for #782
|
2015-06-09 20:05:24 -07:00 |
|
|
madd15
|
4aa4e7c9fc
|
Fix error if user is not in throttle table
|
2015-03-18 17:11:34 +10:30 |
|
|
snipe
|
61e6d55bcf
|
Merge pull request #669 from madd15/patch-1
Fix scopeGetDeleted - Missing withTrashed()
|
2015-03-17 15:36:51 -07:00 |
|
|
snipe
|
c00086c740
|
Fix eager loading for user throttle
|
2015-03-17 15:36:11 -07:00 |
|
|
madd15
|
e01b1b3935
|
Fix scopeGetDeleted - Missing withTrashed()
|
2015-03-18 09:04:51 +10:30 |
|
|
snipe
|
46c1f2a28b
|
Server side datatables for user view - needs fix for deleted users
|
2015-03-16 17:33:41 -07:00 |
|
|
snipe
|
61b04d6e40
|
Fixes #579 - user cannot accept more than once
|
2015-03-01 16:35:32 -08:00 |
|
|
snipe
|
c0c563b1c7
|
Fixes accessory relationshop for pivot
|
2015-02-26 15:25:08 -08:00 |
|
|
snipe
|
5010720a97
|
Fixed accessory relationship
|
2015-02-26 14:07:52 -08:00 |
|
|
snipe
|
54bad2e4f6
|
More accessory relationships
|
2015-02-26 03:19:45 -08:00 |
|
|
snipe
|
d9d99b2223
|
No trashed
|
2015-02-11 00:44:22 -08:00 |
|
|
snipe
|
b4750f016d
|
Added new 4.2 SoftDeletingTrait
|
2015-02-04 15:50:40 -08:00 |
|
|
Hereward Mills
|
98a29e460d
|
TidyUp: Remove excess whitespace.
|
2014-12-24 22:34:16 +00: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 |
|
|
snipe
|
89000440f3
|
Added admin ability to unsuspend locked accounts #changelog
|
2014-07-16 18:21:22 -04:00 |
|
|
snipe
|
8b914102b7
|
Updated spacing for PSR-2
|
2014-06-24 17:49:39 -04:00 |
|
|
snipe
|
f6717d9f49
|
Added manager drop down for users, manager name in index
|
2013-12-12 01:49:38 -05:00 |
|
|
Gil Rutkowski
|
a678ec4171
|
Fixed Gravatar Hash
|
2013-12-01 17:11:44 -06:00 |
|
|
snipe
|
f0f07b578b
|
Fixing pivot for users
|
2013-11-28 20:19:23 -05:00 |
|
|
snipe
|
1b56c31a22
|
Fixed relationship between users/locations because fuck you ORM
|
2013-11-28 19:58:16 -05:00 |
|
|
snipe
|
d9a37f3822
|
Fixes #88
|
2013-11-28 18:31:36 -05:00 |
|
|
Abraham Vegh
|
bda827c590
|
Update User.php
Fix incorrect Gravatar domain name
|
2013-11-26 20:19:30 -05:00 |
|
|
snipe
|
1b01074b9e
|
Changed license structure to use join table to handle multiple seats
|
2013-11-25 01:04:39 -05:00 |
|
|
snipe
|
f0f0019d3b
|
Get the user's location
|
2013-11-19 17:12:48 -05:00 |
|
|
snipe
|
b8908bf246
|
Add checkin/checkout log to user profile view
|
2013-11-19 03:58:26 -05:00 |
|
|
snipe
|
ca90300d2f
|
Added user profile view
|
2013-11-18 07:53:33 -05:00 |
|
|
snipe
|
785b32c8ff
|
Cleaned up user function for assets
|
2013-11-18 00:55:57 -05:00 |
|
|
snipe
|
eddbb7d973
|
User/assets tie-in
|
2013-11-16 22:04:52 -05:00 |
|
|
snipe
|
2e132331e7
|
Refactoring
Removes extraneous create.blade.php, cleaned up some functions
|
2013-11-16 03:25:40 -05:00 |
|
|
snipe
|
5a46c85533
|
asset count per user.
this shit is very broken right now.
|
2013-11-15 14:25:57 -05:00 |
|
|
snipe
|
feda21a6e3
|
Initial laravel import
|
2013-11-13 01:59:39 -05:00 |
|