Commit Graph

  • a1c6ea798a matching wording.....so damn picky :P madd15 2015-08-18 16:15:41 +09:30
  • e0bf6ee390 Change to Bootstrap Table madd15 2015-08-18 16:14:10 +09:30
  • 93fe9a2799 Change to Bootstrap Table madd15 2015-08-18 16:13:49 +09:30
  • 611f59b507 Add name text search madd15 2015-08-18 16:13:05 +09:30
  • 899e543173 Switch to new method madd15 2015-08-18 16:12:23 +09:30
  • 132f17b0af Merge pull request #1071 from madd15/bootstrap-table-experiment snipe 2015-08-17 22:01:19 -07:00
  • 5568f7fc5f Add name text search madd15 2015-08-18 14:15:03 +09:30
  • d35f8e6244 Change to Bootstrap Table madd15 2015-08-18 14:13:59 +09:30
  • 6a2016685e Change to Bootstrap Table madd15 2015-08-18 14:13:28 +09:30
  • 567ad6c3bb Switch to new method madd15 2015-08-18 14:11:03 +09:30
  • 26ede441a4 Last change for detecting correct environment Vincent Sposato 2015-08-15 20:39:31 -04:00
  • afac18ea1b Last tweak before I head to begin drinking heavily... Vincent Sposato 2015-08-15 20:36:18 -04:00
  • da187ff07a A tweak to make this work with an app environment variable Vincent Sposato 2015-08-15 20:33:47 -04:00
  • 9849bbec70 This is getting old... Vincent Sposato 2015-08-15 20:29:18 -04:00
  • 3aaed2600e One last tweak - this may be it Vincent Sposato 2015-08-15 20:26:42 -04:00
  • 8e316611c0 More tweaks / changes Vincent Sposato 2015-08-15 20:21:51 -04:00
  • 0a97135578 Adding more debug tweaks Vincent Sposato 2015-08-15 20:20:46 -04:00
  • 1bed711f0e Another tweak getting closer Vincent Sposato 2015-08-15 20:15:55 -04:00
  • 1f1c1cb546 Almost there... Vincent Sposato 2015-08-15 20:08:20 -04:00
  • f2e7af498e A change to my previous tweak for background serving Vincent Sposato 2015-08-15 20:05:47 -04:00
  • afdb958955 A couple more tweaks to make everything work Vincent Sposato 2015-08-15 20:03:41 -04:00
  • 06966d52bf Got some more tweaks, and changes to make things work Vincent Sposato 2015-08-15 20:00:48 -04:00
  • 723a6260f5 More tweaks for debugging Vincent Sposato 2015-08-15 19:40:30 -04:00
  • a98a0a2f77 More tweaking of the travis yaml file trying to get more out of the results Vincent Sposato 2015-08-15 19:37:43 -04:00
  • 59e755c5df Tweaking the configuration to work with travis - attempting hostname tweaks Vincent Sposato 2015-08-15 19:05:01 -04:00
  • 55b2fce876 One more stupid mistake in travis yaml file - Vincent Sposato 2015-08-15 19:01:03 -04:00
  • 1fadabaf2f Fixed stupid mistake in the travis yaml file Vincent Sposato 2015-08-15 18:59:22 -04:00
  • 33178adeed Fixed issue in travis yaml file Vincent Sposato 2015-08-15 18:57:10 -04:00
  • 46fb12f5dc Fixed acceptance suite yaml to make it work for travis-ci as well as local testing Vincent Sposato 2015-08-15 18:50:46 -04:00
  • 12e6a721f0 Initial changes to allow travis-ci to run codeception tests Vincent Sposato 2015-08-15 18:48:20 -04:00
  • 0cbc9d266e Adding setup for Codeception Vincent Sposato 2015-08-15 15:10:17 -04:00
  • 67e0e14a12 License importer, small fixes for asset imporer v1.2.11 snipe 2015-08-14 14:18:51 -07:00
  • 920708fb6c Merge branch 'features/license-import' snipe 2015-08-14 14:09:22 -07:00
  • 4b68efb80b use CustomModel; is stupid, and doesn't mean anything. Brady Wetherington 2015-08-12 15:52:25 -07:00
  • ccc20cbf18 Merge pull request #1032 from madd15/patch-4 snipe 2015-08-11 11:58:07 -07:00
  • fd9cf29459 Additional changes for search and order functions madd15 2015-08-07 09:44:23 +09:30
  • b9e3dd10b4 Additional Search and Order madd15 2015-08-07 09:42:49 +09:30
  • 85a64f9dfd Merge remote-tracking branch 'origin/develop' v1.2.10 snipe 2015-08-06 04:00:46 -07:00
  • 75c073ee51 Merge pull request #992 from madd15/patch-4 snipe 2015-07-29 23:13:43 -07:00
  • 0fcf33ed8c MOAR SEARCH madd15 2015-07-30 15:22:58 +09:30
  • 0cf3ae95d4 Merge pull request #991 from madd15/patch-5 snipe 2015-07-29 21:47:02 -07:00
  • 78e0af383d Fix user firstname/lastname search madd15 2015-07-30 14:08:03 +09:30
  • 8bedaf7439 Merge pull request #990 from madd15/patch-4 snipe 2015-07-29 21:18:52 -07:00
  • 032d79593a quick fix $inout/$action issue madd15 2015-07-30 13:47:43 +09:30
  • f152841e81 quick fix $inout/$action issue madd15 2015-07-30 13:46:59 +09:30
  • e66ea4dcd1 Build out search and add Model order scope madd15 2015-07-30 13:45:46 +09:30
  • c513007b36 Add sort to table, missing most columns still madd15 2015-07-30 13:44:32 +09:30
  • dfa0ddb49f Installer modified for 2.0 (develop currently) mtucker6784 2015-07-29 01:03:56 -07:00
  • 4a086cecfd Updated composer lock snipe 2015-08-17 11:49:19 -07:00
  • 890ef1eb1d Fixes #1038 - clickable links in dashboard snipe 2015-08-17 11:24:10 -07:00
  • 94e8b5f783 Fixed bug in expected checkin snipe 2015-08-17 11:14:01 -07:00
  • 21bb2f8b44 Updated language string for asset request snipe 2015-08-17 11:11:09 -07:00
  • aae7d4523f Don't need to float left there snipe 2015-08-17 10:11:03 -07:00
  • f7cc9036ea Added password generator to user creation snipe 2015-08-17 10:06:37 -07:00
  • 7dd50eddfa Nicer error messages on validation fail for LDAP snipe 2015-08-14 22:57:32 -07:00
  • c1642e3fe9 Examples included in example config files, moved email and employee number out of required fields snipe 2015-08-14 22:27:10 -07:00
  • 2036402742 Added filter string to default config v2.0-pre-beta2 snipe 2015-08-14 22:20:22 -07:00
  • e9e62fbfaf Updated sample LDAP config to include LDAP version number snipe 2015-08-14 22:10:34 -07:00
  • e49cfb4bde Fixed validation on LDAP snipe 2015-08-14 22:10:05 -07:00
  • db8ea88207 Updated example configs with acrive flag text snipe 2015-08-14 21:38:42 -07:00
  • 729795364b Merge branch 'develop' of https://github.com/aalaily/snipe-it into aalaily-develop snipe 2015-08-14 21:36:09 -07:00
  • ee46b223c9 Added LDAP options snipe 2015-08-14 21:33:48 -07:00
  • e7d7cc6fc2 Added space after error intro snipe 2015-08-14 21:33:39 -07:00
  • 23bde13665 Corrected a typo and remove some testing code Aladin Alaily 2015-08-15 00:29:38 -04:00
  • 3dfbd8a4f0 Added a check for the "active" LDAP flag. Since this field is optional, it's important to check whether or not it's set, otherwise, the functionality will be unusable. Aladin Alaily 2015-08-15 00:27:56 -04:00
  • 80fb7a4c13 Fixed author's name :P snipe 2015-08-14 21:22:49 -07:00
  • b8ef6dfba4 Wrote more information about an optional field Aladin Alaily 2015-08-15 00:16:29 -04:00
  • a57a465147 Removed port number snipe 2015-08-14 20:58:47 -07:00
  • e14ebd0daa Improved error messages and error handling snipe 2015-08-14 20:50:01 -07:00
  • 676bedc9be LDAP UI language strings snipe 2015-08-14 20:15:24 -07:00
  • 6b85bbfe65 Ignore the ldap config file snipe 2015-08-14 19:41:36 -07:00
  • b629fd36a0 Pull out LDAP config file. Derp snipe 2015-08-14 19:41:12 -07:00
  • 260abfc2d7 Only show LDAP stuff if the LDAP config has been set up in the config snipe 2015-08-14 19:40:17 -07:00
  • eb7017d5cb Example LDAP configs snipe 2015-08-14 19:25:59 -07:00
  • 4e86b590d4 Removed typo example script snipe 2015-08-14 19:25:49 -07:00
  • 95af577353 Merge pull request #1059 from aalaily/develop snipe 2015-08-14 19:12:14 -07:00
  • c4ba69b4b6 Only assign the first seat to the user snipe 2015-08-14 15:08:18 -07:00
  • 4b59a6cb5a License importer, small tweaks to asset importer snipe 2015-08-14 14:08:34 -07:00
  • 229432af5e LDAP authentication hook Aladin Alaily 2015-08-14 14:30:38 -04:00
  • 43efe4e80b LDAP authentication hook Aladin Alaily 2015-08-14 14:29:32 -04:00
  • 286df911c0 LDAP authentication add query string Aladin Alaily 2015-08-14 14:29:14 -04:00
  • 54d95c510b Update the code to reflect a possible active flag in LDAP Aladin Alaily 2015-08-14 10:31:40 -04:00
  • 61a4b03aba Added the active flag. Some LDAP instances might have this flag set. Aladin Alaily 2015-08-14 10:31:22 -04:00
  • bebd569490 updated the sample config doc Aladin Alaily 2015-08-14 00:23:23 -04:00
  • 470b543910 Updated the view to match the controller Aladin Alaily 2015-08-14 00:17:50 -04:00
  • 07171498a9 Modified the code so that the LDAP field names can now be defined and fetched from the configuration file Aladin Alaily 2015-08-14 00:17:26 -04:00
  • 2dbeb1aeb5 Merge remote-tracking branch 'upstream/develop' into develop Aladin Alaily 2015-08-13 16:34:20 -04:00
  • 4fcf70872f Fixes #1054 snipe 2015-08-13 13:24:38 -07:00
  • ac7b5da711 Removed comments snipe 2015-08-13 13:24:33 -07:00
  • 1fc83443db Check if the variables coming in from LDAP are set. Aladin Alaily 2015-08-13 15:48:03 -04:00
  • c17bbe9dfe Commented out the loop break. Aladin Alaily 2015-08-13 15:10:40 -04:00
  • 59617083c9 Fixed the break portion Aladin Alaily 2015-08-13 15:07:15 -04:00
  • d167f31af0 Fixed indents Aladin Alaily 2015-08-13 15:06:04 -04:00
  • 1343c09cd7 Made the user interface a little more neat. Aladin Alaily 2015-08-13 15:05:15 -04:00
  • 8e6621f332 Removed the ldap.php config file and added the example ldap config file. Aladin Alaily 2015-08-13 13:40:02 -04:00
  • 34b14f67c6 Fixed the formatting Aladin Alaily 2015-08-13 13:39:31 -04:00
  • 5574ea89bb Removed the references to the LOG class Aladin Alaily 2015-08-13 13:39:20 -04:00
  • d780f0f3cf Added some space between the Import and LDAP buttons Aladin Alaily 2015-08-13 13:32:19 -04:00
  • 03f5af29f2 Ignore netbeans config files Aladin Alaily 2015-08-13 13:29:20 -04:00
  • a531ea34bb Cleaned up the code Aladin Alaily 2015-08-13 13:27:24 -04:00