ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,431 Commits 84 Branches 293 Tags
960be7c5ae71b8db461b60fcf77aaf4792ea8c7c
Commit Graph

200 Commits

Author SHA1 Message Date
snipe e916fdcc89 Fixes #1092, setting LDAP_OPT_REFERRALS to 0 for Active Directory 2015-08-20 15:54:42 -07:00
snipe 70f7f65394 Fixed path for windows 2015-08-20 15:38:50 -07:00
snipe 45c4624d5f Fixes #1081 2015-08-19 11:14:03 -07:00
snipe e8f11919f7 Fixes #1077 - ordering of dropdown menus 2015-08-19 10:43:52 -07:00
snipe 4a086cecfd Updated composer lock 2015-08-17 11:49:19 -07:00
snipe 890ef1eb1d Fixes #1038 - clickable links in dashboard 2015-08-17 11:24:10 -07:00
snipe 94e8b5f783 Fixed bug in expected checkin 2015-08-17 11:14:01 -07:00
snipe aae7d4523f Don't need to float left there 2015-08-17 10:11:03 -07:00
snipe f7cc9036ea Added password generator to user creation 2015-08-17 10:06:37 -07:00
snipe 7dd50eddfa Nicer error messages on validation fail for LDAP 2015-08-14 22:57:32 -07:00
snipe c1642e3fe9 Examples included in example config files, moved email and employee number out of required fields 2015-08-14 22:27:10 -07:00
snipe 2036402742 Added filter string to default config 2015-08-14 22:20:22 -07:00
snipe e9e62fbfaf Updated sample LDAP config to include LDAP version number 2015-08-14 22:10:34 -07:00
snipe db8ea88207 Updated example configs with acrive flag text 2015-08-14 21:38:42 -07:00
snipe 729795364b Merge branch 'develop' of https://github.com/aalaily/snipe-it into aalaily-develop 
# Conflicts:
#	app/controllers/admin/UsersController.php
 2015-08-14 21:36:09 -07:00
snipe ee46b223c9 Added LDAP options 2015-08-14 21:33:48 -07:00
snipe e7d7cc6fc2 Added space after error intro 2015-08-14 21:33:39 -07:00
snipe 80fb7a4c13 Fixed author's name :P 2015-08-14 21:22:49 -07:00
Aladin Alaily b8ef6dfba4 Wrote more information about an optional field 2015-08-15 00:16:29 -04:00
snipe a57a465147 Removed port number 2015-08-14 20:58:47 -07:00
snipe e14ebd0daa Improved error messages and error handling 2015-08-14 20:50:01 -07:00
snipe 676bedc9be LDAP UI language strings 2015-08-14 20:15:24 -07:00
snipe 6b85bbfe65 Ignore the ldap config file 2015-08-14 19:41:36 -07:00
snipe b629fd36a0 Pull out LDAP config file. Derp 2015-08-14 19:41:12 -07:00
snipe 260abfc2d7 Only show LDAP stuff if the LDAP config has been set up in the config 2015-08-14 19:40:17 -07:00
snipe eb7017d5cb Example LDAP configs 2015-08-14 19:25:59 -07:00
snipe 4e86b590d4 Removed typo example script 2015-08-14 19:25:49 -07:00
Aladin Alaily 286df911c0 LDAP authentication add query string 2015-08-14 14:29:14 -04:00
Aladin Alaily 61a4b03aba Added the active flag. Some LDAP instances might have this flag set. 2015-08-14 10:31:22 -04:00
Aladin Alaily bebd569490 updated the sample config doc 2015-08-14 00:23:23 -04:00
Aladin Alaily 2dbeb1aeb5 Merge remote-tracking branch 'upstream/develop' into develop 2015-08-13 16:34:20 -04:00
snipe 4fcf70872f Fixes #1054 2015-08-13 13:24:38 -07:00
Aladin Alaily 8e6621f332 Removed the ldap.php config file and added the example ldap config file. 2015-08-13 13:40:02 -04:00
snipe ed2d7310f8 Fixed unsuspend icon 2015-08-13 00:39:52 -07:00
snipe 547de2b9e3 Placeholder phpunit test 2015-08-13 00:26:26 -07:00
snipe 07b045007b Revert "Reverting to phpunit again" 
This reverts commit 1159cdeab2.

# Conflicts:
#	.travis.yml
 2015-08-12 23:39:16 -07:00
snipe 8840e57ae7 Trying 'testing-worker-linux*' as hostname since nothing else is working 2015-08-11 20:23:00 -07:00
snipe aa304375a6 Set default key 2015-08-11 19:54:03 -07:00
snipe 4247904f19 Resolving hostname problems 2015-08-11 18:52:42 -07:00
snipe 75852bdb8b Derp 2015-08-11 18:40:16 -07:00
Brady Wetherington c683c1c57e Revert "Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking" 
This reverts commit 41b711740a, reversing
changes made to 55309bfaef.

It also un-reverts reversions that were done inadvertently.
 2015-07-20 17:12:28 -07:00
snipe 01c2968388 Revert "Fixes #863 - clickable order number in asset view" 
This reverts commit 0c842fc772.
 2015-07-20 16:34:14 -07:00
snipe 0c842fc772 Fixes #863 - clickable order number in asset view 2015-07-16 21:21:09 -07:00
snipe 919df7ed56 Part of #863 - adds order number to asset listing 2015-07-16 19:54:56 -07:00
snipe de62db5e18 Fixes #901 - added notes field to list view 2015-07-16 19:45:10 -07:00
snipe 0154f240f3 Fixes JavaScript for edited assets 2015-07-10 22:48:21 -07:00
snipe 0132360e49 Added spinner to show activity during ajax 
TO DO:

- Account for the default state when the page is loaded on edit (currently using onchange)

- If no status or model is selected, return false or something else so that it doesn't try to make the ajax call with no ID
 2015-07-09 08:45:06 -07:00
snipe 1c2a409e6a Check that there is an assetstatus 2015-07-09 07:08:33 -07:00
snipe 15e1774a13 Centered checkboxes for select all 2015-07-09 03:57:20 -07:00
snipe 16b49c25e1 Bringing back the spinner on processing screen 2015-07-09 03:56:18 -07:00