Commit Graph

3374 Commits

Author SHA1 Message Date
snipe 086b13c17e Fixed version number v2.1.1 2016-05-23 23:12:01 -07:00
snipe 2620da186b Few more importer fixes 2016-05-23 23:10:58 -07:00
snipe 3689a52894 More status label fixes on import 2016-05-23 22:50:03 -07:00
snipe 725a9320cb Make sure status label is never null or empty 2016-05-23 22:40:48 -07:00
snipe 12996cafac Added status label, supplier and warranty months to importer 2016-05-23 22:09:02 -07:00
snipe 859c53e975 Merge remote-tracking branch 'origin/master' into develop 2016-05-23 20:56:28 -07:00
snipe 1322d81d64 Merge branch 'master' of github.com:snipe/snipe-it 2016-05-23 20:55:50 -07:00
snipe 3ab828a4cd Make licenses sortable by name, serial 2016-05-23 20:55:41 -07:00
snipe 5ca572b914 Merge pull request #2073 from merid14/patch-4
Fix for casematch in case statements
2016-05-23 12:01:15 -07:00
Walter 1bc7ff9941 Fix for casematch in case statements
Fix for casematch in case statements to allow distribution detection.
2016-05-23 14:57:38 -04:00
snipe b855f2fa2b Merge pull request #1986 from TahsinAbrar/develop
on forget password, show error message if user not found with email
2016-05-20 13:51:39 -07:00
snipe 114e6ec6cc Merge pull request #2065 from merid14/patch-3
Fix supported distros
2016-05-20 12:25:33 -07:00
Walter be4230af81 Fix supported distros
Should fix the issue with RHEL 7.2 not being recognized as supported.
Should fix php7.0 bug with Ubuntu 16.04
2016-05-20 15:21:44 -04:00
snipe 390de7ae36 Merge remote-tracking branch 'origin/develop' 2016-05-16 21:55:19 -07:00
snipe 588f0a23ba Updated language strings 2016-05-16 21:55:05 -07:00
snipe d40129bdae Merge remote-tracking branch 'origin/develop'
# Conflicts:
#	Dockerfile
2016-05-16 20:55:08 -07:00
snipe 54f3c65624 Fixes #1634 - better handling for category listings that are not asset categories 2016-05-16 20:53:51 -07:00
snipe 8e18218652 [Bugfix] Fixed admin user display bug 2016-05-11 21:36:59 -07:00
snipe bf9aba3f20 Merge pull request #2007 from samepage-labs/docker_ubuntu_trusty
Docker image requires ubuntu trusty, not latest
2016-05-10 00:08:33 -07:00
snipe 7e554a3c59 Merge branch 'develop' 2016-05-09 16:03:49 -07:00
snipe 91ac9bd485 Merge pull request #2011 from snipe/fix_ubuntu_version_in_docker
Pin down Docker version to ubuntu:wily
2016-05-05 12:44:54 -07:00
Brady Wetherington f16122070a Pin down Docker version to ubuntu:wily 2016-05-05 12:41:52 -07:00
Petr Baloun 4803bc71ec Docker image requires ubuntu trusty, not latest 2016-05-04 11:45:53 +02:00
Tahsin Abrar f0a589f150 on forget password, show error message if user not found with email 2016-04-24 17:55:32 +06:00
snipe 32591d4ca0 Merge pull request #1917 from samepage-labs/docker_persistent_dirs
Docker persistent dirs
2016-04-07 16:55:02 -07:00
Petr Baloun d1bcee0dfa Moved ssl keys to /var/lib/snipeit 2016-04-04 09:31:45 +02:00
Petr Baloun e4dfb188fa Created data volume, redirected data directories there 2016-04-04 09:31:45 +02:00
snipe 4f057bfe5e Merge pull request #1910 from samepage-labs/docker_mysql_client
Missing mysql client in docker image #1908
2016-04-01 00:41:56 -07:00
Petr Baloun 8bbaf2e52f Added mysql client 2016-03-31 13:03:26 +02:00
snipe cf5fcdf9d7 Merge pull request #1826 from richardhofman6/ldap-import-pagination
Added LDAP pagination for user import.
2016-03-25 01:37:45 -07:00
snipe 2333d4e933 Merge pull request #1839 from merid14/patch-2
PRs against master make snipe cry.
2016-03-25 01:23:49 -07:00
snipe e1be3efd82 Renamed doc files 2016-03-15 21:25:02 -07:00
snipe 97f97e3590 Remove search from docs 2016-03-15 21:14:00 -07:00
snipe 701c16f4e6 Updated name 2016-03-15 21:04:40 -07:00
snipe 59c203b6ae Docs 2016-03-15 20:53:58 -07:00
snipe d84479d9fc Merge remote-tracking branch 'origin/develop' 2016-03-15 20:52:25 -07:00
snipe 480f0ef13b Merge pull request #1851 from mathieuk/fix_some_xss
Fix some XSS issues
2016-03-14 16:04:15 -07:00
Mathieu Kooiman 6020de6321 Fix hard to exploit stored XSS possibility: code wrongly expected people to only be able to submit entries from <select> 2016-03-13 14:25:46 +01:00
Mathieu Kooiman 796866fd54 Fix self-xss possibilities in /admin/licenses/create|edit 2016-03-13 14:08:57 +01:00
Mathieu Kooiman ef58de5e8c Fix self-xss points in /admin/asset_maintenances/create
- title, start_date and completion_date were rendered unescaped
2016-03-13 13:59:25 +01:00
Mathieu Kooiman 7e07c7dee3 Fix reflected XSS: /hardware?status=[injectionpoint] 2016-03-13 13:53:20 +01:00
Walter 9dc57ff673 Fixed bug for 7.1 and 7.2 2016-03-11 11:19:55 -05:00
Walter dea95f9f5b Update timezone command
fixed bug in centos 7 timezone command due to the formatting change from centos 7.1 to 7.2
2016-03-10 10:32:45 -05:00
Richard Hofman 23431fafd9 Added LDAP pagination for user import. 2016-03-08 19:39:39 +13:00
snipe 2cf566422c Merge remote-tracking branch 'origin/develop' 2016-03-02 19:10:39 -08:00
snipe b85d624f08 Updated issue template 2016-03-02 19:10:14 -08:00
snipe e69eddeef8 Possible build fix (dbal deps) 2016-02-29 11:10:54 -08:00
snipe 061e0d4cdb Possible build error fix, requiring lower version of doctrine packages 2016-02-29 11:04:47 -08:00
snipe 64b1355393 Bumped version 2016-02-18 12:17:16 -08:00
snipe 2cf169a64a Missing strings in other languages 2016-02-18 12:17:08 -08:00