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

2453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Sposato bfeb4560ca Got some more tweaks, and changes to make things work 2015-08-28 20:10:53 -04:00
Vincent Sposato 194e43d206 More tweaks for debugging 2015-08-28 20:10:53 -04:00
Vincent Sposato 13830b5c09 More tweaking of the travis yaml file trying to get more out of the results 2015-08-28 20:10:52 -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 3975555503 One more stupid mistake in travis yaml file - 2015-08-28 20:10:52 -04:00
Vincent Sposato b1d6d4da37 Fixed stupid mistake in the travis yaml file 2015-08-28 20:10:51 -04:00
Vincent Sposato be402a9d7d Fixed issue in travis yaml file 2015-08-28 20:10:51 -04:00
Vincent Sposato 00aba507f7 Fixed acceptance suite yaml to make it work for travis-ci as well as local testing 2015-08-28 20:10:50 -04:00
Vincent Sposato 0cadab8fc6 Initial changes to allow travis-ci to run codeception tests 2015-08-28 20:10:50 -04:00
Vincent Sposato cc14eee161 Adding setup for Codeception 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
snipe cf7ef5e8b0 Merge pull request #1131 from irasnyd/docker-fixes 
Add LDAP support to Docker image
 2015-08-28 10:02:18 -07:00
Ira W. Snyder 3f08258bf0 Add LDAP support to Docker image 
This adds LDAP support to the Docker image. All parameters are specified
using environment variables named following the convention in the
configuration files themselves.
 2015-08-28 09:10:28 -07:00
Ira W. Snyder f7ce7060eb Allow Docker users to set the server URL 
This change allows Docker users to set the server URL by setting the
SERVER_URL environment variable. This is done in the same way as the
database and mail settings.
 2015-08-28 09:03:06 -07:00
Brady Wetherington 49e898fd26 Merge pull request #1122 from irasnyd/docker-fixes 
Fix broken Docker build
 2015-08-26 14:43:10 -07:00
Ira W. Snyder 1927f131aa Fix broken Docker build 
The Dockerfile now includes the php5-curl package, which is needed to
satisfy a missing dependency.

The docker/app_start.patch was updated to match changes to the source
code.
 2015-08-26 14:09:03 -07:00
snipe a4a29be868 Bumped version v2.0 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
snipe e5b80ab423 Merge pull request #1105 from aalaily/develop 
Remove hardcoded location in favour of a selection dropdown
 2015-08-21 12:19:25 -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
snipe 89564b3d2a Merge pull request #1099 from kobie-chasehansen/fix-for-#1098 
fix for #1098
 2015-08-20 21:39:00 -07: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 v2.0-RC-1 2015-08-19 17:51:35 -07:00
snipe d47198086f Added notes search to licenses 2015-08-19 17:23:55 -07:00
snipe 89f7f50901 Merge pull request #1074 from mtucker6784/develop 
Installer modified for 2.0 (develop currently)
 2015-08-19 17:16:53 -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 v2.0-pre-beta2 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