4037200fad
Additional fields for user import
2016-01-11 18:39:40 -08:00
326d0cc764
Bumped version
2016-01-11 18:17:01 -08:00
9800786485
Fixes #1597 and allows non-numeric employee number
2016-01-11 18:16:52 -08:00
ce6b2f2e5f
Merge pull request #1598 from ddreier/1597-ldap-email
...
Updated the LDAP import to get the correct email field setting.
2016-01-07 08:14:57 -08:00
3e2fc13af5
Updated the LDAP import to get the correct email field setting.
2016-01-07 10:03:42 -06:00
73317f14a0
Bumped version
2016-01-06 21:05:11 -08:00
6bc2af6e71
Fix for missing company
2016-01-06 21:04:59 -08:00
962e7531a6
Fix for changing asset model from model with custom fields to one without
2016-01-06 18:04:55 -08:00
e8e8e8f4f3
Bugfix for importer not recognizing existing entries with quotes
2016-01-06 16:21:10 -08:00
218fe72e16
Fixes #1500 : Use the currency setting rather than the localization label
2016-01-05 19:45:40 -08:00
2b13641661
Fixes #1574 - added Chinese Yuan
2016-01-05 19:33:14 -08:00
66fe626d51
Fixes #1560 - added AED
2016-01-05 19:31:46 -08:00
ca9ab681b9
Update url for #1566
2016-01-05 19:26:37 -08:00
0f07f12d35
Merge pull request #1582 from merid14/patch-1
...
Patch for #1561
2016-01-05 15:16:48 -07:00
03efe0b3e2
Merge pull request #1585 from snipe/null_custom_fieldset_ok
...
Allow setting 'no custom fields' from having a customfieldset enabled
2016-01-05 14:56:58 -07:00
d7b91d88d6
Allow setting 'no custom fields' from having a customfieldset enabled
...
in a model.
2016-01-05 13:53:09 -08:00
298a938db2
Fix for company scoping bug
2016-01-05 13:20:49 -08:00
6c389298f8
Suppress errors when the file doesn't exist
2016-01-05 13:20:38 -08:00
d4685ec037
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2016-01-05 13:12:57 -08:00
602501b4a3
Bumped version
2016-01-05 13:12:14 -08:00
e93aebc27b
Make first user a super admin
2016-01-05 13:09:55 -08:00
e392c87250
Experimental fix for Company scope issue.
2016-01-05 13:08:14 -08:00
2707742518
Patch for #1561
...
Added -p back to the db setup to provide password input. #1561
2016-01-05 09:16:59 -05:00
738dc1fdf0
Bumped version to 2.1.0-pre
2015-12-30 17:08:34 -08:00
6f04cf9f61
Merge pull request #1554 from snipe/final_custom_fields_tweaks
...
Final custom fields tweaks
2015-12-30 16:32:16 -08:00
4be3f2700c
Make this migration run correctly in the past, before the schema has been changed
2015-12-30 16:23:13 -08:00
4cb0e40abb
Eager-Load CustomFieldsets and CustomFields with relations
2015-12-30 16:08:40 -08:00
ad144e127c
Pertains to one of the elements in #1397 - timestamps and user_id's for Custom Fields
2015-12-30 15:58:51 -08:00
2f4e54c8a6
Merge remote-tracking branch 'origin/develop'
2015-12-30 15:47:00 -08:00
7c06cba647
More LDAP login fixes
2015-12-30 14:53:49 -08:00
5eb506b9c3
Bumped version
2015-12-30 12:57:55 -08:00
4aa376826f
Added dashboard back as string
2015-12-30 12:57:49 -08:00
1d9e014bfa
More auth tweaks :(
2015-12-30 12:57:41 -08:00
506af72d83
Superadmin check in bulk delete users
2015-12-29 20:03:08 -08:00
1ce205a579
Fixes #1502 - load tableexport and jquery base64 locally
2015-12-29 19:45:46 -08:00
a7a82e5fbc
Fixes #1541
2015-12-29 19:41:50 -08:00
23da312fff
Put deleted_at back in users collection for restore functionality
2015-12-29 19:35:31 -08:00
faf2e464fa
Fixes #1526
2015-12-29 19:32:15 -08:00
79c5d3f7d6
Fixes #1537 and #1524
2015-12-29 19:21:54 -08:00
2888103d1a
More updates for #1433
...
This is a paired down version of the previous auth. Rather than trying to authenticatr with Sentry at every turn, check for valid LDAP and then once all those LDAP additions/updates are set, then try to auth with the credentials the user provided.
2015-12-29 19:12:22 -08:00
f89176d500
WTF I don't even.
2015-12-29 18:48:06 -08:00
5eb95272ee
Merge pull request #1546 from snipe/docker_fix_2
...
Enable/Disable SSL based on existence of SSL cert data
2015-12-29 16:46:14 -08:00
6c7e265921
Enable/Disable SSL based on existence of SSL cert data
2015-12-29 16:41:54 -08:00
76955ec064
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2015-12-29 15:46:52 -08:00
de9a15a33b
Bumped version
2015-12-29 15:46:37 -08:00
f9cf2b2558
Updated translations
2015-12-29 15:46:20 -08:00
e4627cee96
Updated language
2015-12-29 15:41:18 -08:00
36eb51d6e4
Fixed typo in string
2015-12-29 15:41:05 -08:00
689832036e
Merge pull request #1517 from dmeltzer/for-asset-maintence-and-consum
...
Fix Asset Maintenance date and consumable counts
2015-12-29 15:10:14 -08:00
8cfcb2aed8
Merge pull request #1544 from snipe/docker_fix_2
...
Docker fix 2
2015-12-29 15:08:59 -08:00
snipe