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

96 Commits

Author SHA1 Message Date
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 4fcf70872f Fixes #1054 2015-08-13 13:24:38 -07: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
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
snipe c61adc7041 Partial fix for #851 datatables. Because clear error reporting is apparently for suckers 2015-07-09 03:20:57 -07:00
snipe c8842a85ee Bumped version 2015-07-09 01:24:43 -07:00
snipe 2d10931d6c Use league/csv for export 2015-07-08 23:42:17 -07:00
snipe 4a5066054b Display bugfixes for #819 2015-07-08 22:38:35 -07:00
snipe 84ffc1a728 Migration for location-specific currency, updated views for #819 
This isn't done yet though. All kinds of busted stuff.
 2015-07-08 20:35:40 -07:00
snipe fd59ca0802 Fixed spacing 2015-07-08 17:33:51 -07:00
snipe 05f0b94bf6 Fixed language string 2015-07-08 13:05:17 -07:00
snipe 1601bdd4eb Added rtd_location_id back into selected columns 2015-07-02 16:52:08 -07:00
snipe 5939e46eee Bumped version for fixed 1.2.7 2015-06-01 17:52:03 -07:00
snipe 527650d03b Merge branch 'patch-5' of https://github.com/DanielNemanic/snipe-it into DanielNemanic-patch-5 
# Conflicts:
#	app/views/backend/models/view.blade.php
 2015-05-02 12:28:34 -07:00
snipe 7556f989df Accessories Slack integration 2015-04-30 20:53:44 -07:00
snipe 8207597a58 Slack integration for Licenses 2015-04-30 20:37:23 -07:00
snipe 1137768f84 Escape notes 2015-04-30 19:23:41 -07:00
snipe 5f6925858b Richer slack integrations 2015-04-30 18:54:34 -07:00
snipe 77d1d93ebc Fixes #729 - CSS wordwrap for long licenses 2015-04-30 18:17:44 -07:00
snipe c95af84452 Fixes #750 because @uberbrady can't code 2015-04-30 17:14:31 -07:00
snipe 62b5ec5b02 Slack field validation and placeholder text 2015-04-30 16:58:33 -07:00
snipe a2dd2509fd Updated language strings for slack 2015-04-29 18:01:43 -07:00
snipe 3c00f38a0f Slack integration for asset checkin/checkout 2015-04-29 17:38:22 -07:00
snipe 767e2c69f3 Fixes #751 - ignore whether depreciation was selected or not to display purchase cost 2015-04-29 16:31:38 -07:00
snipe 3b491d4a6b Fixes #757 - use showAssetName method 2015-04-29 16:22:25 -07:00
snipe 179ef7f060 Removed unsupport languages 2015-04-29 16:17:13 -07:00
snipe d61506fcf7 Fixes for #766 - add activity report 2015-04-29 14:50:12 -07:00
snipe 6a7fcd5c40 Fixes #769 - set sort order for Accessory Category 2015-04-29 13:54:54 -07:00
snipe ba58e718b4 Resolved some deps from vendor changes 2015-04-16 22:18:35 -07:00
snipe 30c8fffa0a Loading string 2015-04-15 09:51:48 -07:00
snipe 9bbf933b05 Added missing search string 2015-04-08 16:25:34 -07:00
snipe 0cff78d127 Updated language strings 2015-04-02 15:42:58 -07:00
snipe e88a81141f Added view link to asset tag, since some assets won't have names 2015-04-02 15:40:41 -07:00
snipe c88ce0d14d Fixes for #722 datatables 2015-04-02 14:55:36 -07:00
snipe e4b45231ec Fix for bad seed data if Jon Doe doesn't get created 2015-04-01 17:22:48 -07:00
snipe 92a4f025d8 Fixes #718 - uppercase state/country abbreviations 2015-04-01 15:31:53 -07:00
snipe afdf00eacb Removed settings save for display fields 2015-03-27 22:34:39 -07:00
snipe 51148f1371 Removed additional settings, since all are displayable now 2015-03-27 22:32:38 -07:00