Commit Graph

1884 Commits

Author SHA1 Message Date
snipe 7bd5ddc516 Fixes incorrect title for unaccepted assets report 2015-09-01 16:41:47 -07:00
snipe ed05a32f0b Merge pull request #1061 from vsposato/feature/setupCodeception
DO NOT MERGE - testing codeception
2015-08-31 13:57:37 -07:00
snipe 780226a612 Merge pull request #1127 from madd15/patch-1
Fix #1109 - Asset names are missing when viewing user history
2015-08-31 13:57:12 -07:00
snipe ca37c63649 Merge pull request #1128 from madd15/patch-2
Fix #1123 - fix new lines in serial not being recognised
2015-08-31 13:57:04 -07:00
Vincent Sposato 9107784746 More tweaks 2015-08-28 20:11:01 -04:00
Vincent Sposato 7555b97f80 More tweaks, more prayers... 2015-08-28 20:11:00 -04:00
Vincent Sposato 0d76ea5050 Putting app.php back to production state 2015-08-28 20:10:59 -04:00
Vincent Sposato 3199dfd1d8 Checking testing issue to see if wrong environment is loading 2015-08-28 20:10:58 -04:00
Vincent Sposato bfeb4560ca Got some more tweaks, and changes to make things work 2015-08-28 20:10:53 -04:00
Vincent Sposato 855a155178 Tweaking the configuration to work with travis - attempting hostname tweaks 2015-08-28 20:10:52 -04:00
Vincent Sposato 0cadab8fc6 Initial changes to allow travis-ci to run codeception tests 2015-08-28 20:10:50 -04:00
snipe da10a9a2aa Fixes #1130 - don't try to send email if email is not provided with the user 2015-08-28 12:15:07 -07:00
madd15 6e13da6293 Fix #1123 - fix new lines in serial not being recognised
Hope this is the right way to fix this
2015-08-28 16:28:17 +09:30
madd15 dd2b9e15a6 Fix #1109 - Asset names are missing when viewing user history 2015-08-28 14:44:10 +09:30
snipe a4a29be868 Bumped version 2015-08-25 19:40:08 -07:00
snipe 2e7fd02f42 Updated language strings 2015-08-24 12:59:35 -07:00
snipe da6770c9d9 Fixes #1102 - default currency stored as htmlentities in the DB 2015-08-21 18:11:23 -07:00
snipe 7dd2b3d580 Fixes #1104 2015-08-21 16:00:03 -07:00
Aladin Alaily 27efae93ac Add some explanation about the location field. 2015-08-21 10:42:37 -04:00
Aladin Alaily 960be7c5ae Replace hardcoded location with a user selection. 2015-08-21 10:40:18 -04:00
Aladin Alaily 0b5f83fc56 add a drop down of locations 2015-08-21 10:39:45 -04:00
Chase Hansen 610392777b fix 2015-08-21 00:30:55 -04:00
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 8892feea62 Fixed typo 2015-08-20 15:38:35 -07:00
snipe c7b0ecfac8 Slack notification for requested assets 2015-08-19 17:51:35 -07:00
snipe d47198086f Added notes search to licenses 2015-08-19 17:23:55 -07:00
snipe 8339dd3db2 Fixes #1089 - checkout button on accessory view page 2015-08-19 17:13:14 -07:00
snipe e63d62d2c8 Fixes #1083 2015-08-19 12:33:16 -07:00
snipe 45c4624d5f Fixes #1081 2015-08-19 11:14:03 -07:00
snipe a27a98f4b3 Fixes #1081- include asset name on checkout 2015-08-19 11:13:51 -07:00
snipe 70a7a11324 Switched to user list 2015-08-19 10:54:50 -07:00
snipe e8f11919f7 Fixes #1077 - ordering of dropdown menus 2015-08-19 10:43:52 -07:00
snipe 1d976ff926 Fixes #1078 2015-08-19 10:23:01 -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 21bb2f8b44 Updated language string for asset request 2015-08-17 11:11:09 -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 e49cfb4bde Fixed validation on LDAP 2015-08-14 22:10:05 -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
Aladin Alaily 23bde13665 Corrected a typo and remove some testing code 2015-08-15 00:29:38 -04:00