d34e7178b3
Order consumable assignments by most recent
2015-11-24 22:18:28 -08:00
0428d21c5e
Order consumable assignments by most recent
2015-11-24 22:18:16 -08:00
d8b43215b0
Fix for missing admin ID
2015-11-24 22:00:29 -08:00
b39c53a5ea
Closes #1375 - More data in consumables detail view
2015-11-24 21:58:30 -08:00
67e968b032
Fixed attach() timestamps
2015-11-24 21:52:29 -08:00
032aabeadd
Bumped version
2015-11-24 20:34:16 -08:00
1202ce4a81
Compound search for consumables
2015-11-24 20:34:10 -08:00
406e077c1e
Fixed indenting
2015-11-24 20:34:00 -08:00
4be046a675
Fixes #1387 - adds server-side compound search
2015-11-24 20:33:51 -08:00
535263788d
Fixed dumb indenting
2015-11-24 20:20:34 -08:00
29bb6a3c4f
Fixed issue where deleted asset tags could not be re-used
...
This was by-design to start off with, since it would b weird to re-use an asset tag that legitimately belonged to someone else, however sometimes when assets are accidentally deleted and users don't restore them (or if there were weird duplicates), this can be problematic.
2015-11-24 20:20:28 -08:00
f04e4b1fb4
Bumped version
2015-11-24 19:38:23 -08:00
c8c755f8c3
Fixed filename renaming
2015-11-24 19:38:13 -08:00
287c7735b6
Added CSRF token for upload
2015-11-24 19:37:59 -08:00
2a28c73845
Importer fixes - check for asset before inserting
2015-11-24 19:37:37 -08:00
a3dbd87f9f
Fixed weird company table styles
2015-11-24 13:47:43 -08:00
6d42d2c614
Fixed bootstrap class for button
2015-11-24 13:44:58 -08:00
e910b532c7
Account for invalid categories
2015-11-24 13:31:54 -08:00
a777499c0b
Fixes #1376 - added new fields to consumables view
2015-11-24 13:30:05 -08:00
b99c138cb0
Fixes #1369 - fixed searching/sorting on location
2015-11-24 12:48:41 -08:00
cbb2151f1a
Allow re-use of usernames
2015-11-24 12:29:25 -08:00
256f33e6b4
Company/category search on accessories
2015-11-24 12:08:49 -08:00
59315878c3
Bumped version
2015-11-24 11:47:40 -08:00
f6e2654609
Added searching on company name, ordering on company name for PR #1321
2015-11-24 11:47:34 -08:00
716c459985
Fix ident
2015-11-24 12:30:28 +02:00
ef011cdf7e
Add Bulgarian lev
2015-11-24 12:25:57 +02:00
b93f36a856
Bumped version
2015-11-23 21:04:47 -08:00
e60c0e3b4d
Warning message about EOL
2015-11-23 21:04:41 -08:00
407b341510
Updated bootstrap tables
2015-11-23 20:57:18 -08:00
120c8394bb
Fixes #1380 - groups pagination
2015-11-23 19:18:00 -08:00
cc17862eae
Back out the encryption constructor for now
2015-11-23 18:18:49 -08:00
c24f1721d7
Bumped version
2015-11-23 17:44:00 -08:00
c80f1789d4
Set default hasher in constructor
2015-11-23 17:43:53 -08:00
4a49e6f471
Added popover code
2015-11-23 17:43:43 -08:00
1bccb6127e
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2015-11-23 15:18:22 -08:00
61107769e8
Add user ID and make company name hidden by default
2015-11-23 15:18:10 -08:00
4e96a5a793
Merge pull request #1374 from vabue/features/ukrainian-currency
...
Add ukrainian and russian currencies for #1373
2015-11-23 15:17:24 -08:00
f87a25bf3f
Moved company down further, since it's not used as often
2015-11-23 14:44:08 -08:00
4ae02c1fb3
Merge pull request #1321 from Ahimta/multiple-companies
...
Add support for multiple companies
2015-11-23 14:40:37 -08:00
9ec132acde
Small fixed for LDAP in settings table
2015-11-23 14:33:00 -08:00
318b4b48c6
Fixes null value for LDAP settings
2015-11-23 14:11:55 -08:00
7a07c07e29
removed password insert to database
2015-11-23 16:16:05 -05:00
6ea3bedb9e
set decryption and set pword in migraiton
2015-11-22 23:08:18 -05:00
840e5b1523
Revert "begin work on idap import button"
...
This reverts commit 3942fd1869
2015-11-22 11:10:36 -05:00
1ee3f29d2e
Revert "working on ldap import button"
...
This reverts commit 113dfc9c24
2015-11-22 11:02:19 -05:00
6b26640077
Merge remote-tracking branch 'refs/remotes/snipe/develop' into features/ldap-settings
2015-11-22 11:01:07 -05:00
964d2bc463
Add ukrainian and russian currencies for #1373
2015-11-22 17:50:08 +02:00
e4a634a8a3
Merge remote-tracking branch 'upstream/develop' into multiple-companies
2015-11-21 11:27:00 +03:00
5445a7d16b
Scope users like other companyables
...
Note that the User model doesn't use global scope,
global models can have unexpected results that
would very likely break many parts of the application
2015-11-21 11:23:42 +03:00
86a174201e
Only users with no company or supers can manage users' companies
2015-11-21 04:30:15 +03:00
snipe