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

176 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 4e86b590d4 Removed typo example script 2015-08-14 19:25:49 -07:00
Aladin Alaily 286df911c0 LDAP authentication add query string 2015-08-14 14:29:14 -04:00
Aladin Alaily 61a4b03aba Added the active flag. Some LDAP instances might have this flag set. 2015-08-14 10:31:22 -04:00
Aladin Alaily bebd569490 updated the sample config doc 2015-08-14 00:23:23 -04:00
Aladin Alaily 2dbeb1aeb5 Merge remote-tracking branch 'upstream/develop' into develop 2015-08-13 16:34:20 -04:00
snipe 4fcf70872f Fixes #1054 2015-08-13 13:24:38 -07:00
Aladin Alaily 8e6621f332 Removed the ldap.php config file and added the example ldap config file. 2015-08-13 13:40:02 -04: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
snipe 8840e57ae7 Trying 'testing-worker-linux*' as hostname since nothing else is working 2015-08-11 20:23:00 -07:00
snipe aa304375a6 Set default key 2015-08-11 19:54:03 -07:00
snipe 4247904f19 Resolving hostname problems 2015-08-11 18:52:42 -07:00
snipe 75852bdb8b Derp 2015-08-11 18:40: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 e1724cf25f Merge remote-tracking branch 'origin/develop' into 2.0 
# Conflicts:
#	.gitignore
#	app/config/production/session.example.php
#	app/config/staging/session.example.php
#	app/config/version.php
#	app/models/User.php
 2015-07-09 01:02:49 -07:00
snipe 9936cf4a43 Better production default for #903 2015-07-09 00:53:58 -07:00
snipe e9443a244c Small fix to config value 2015-07-09 00:52:05 -07:00
snipe f8be47dfbf Fixes #903 - adds config variable for multi_login, overrides Sentry method 2015-07-09 00:41:46 -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 74429d9075 Merge remote-tracking branch 'origin/develop' into 2.0 
# Conflicts:
#	app/lang/en/general.php
#	app/start/artisan.php
#	app/views/backend/hardware/edit.blade.php
#	app/views/backend/layouts/default.blade.php
 2015-07-08 18:07:53 -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 7d5810b656 Merge remote-tracking branch 'origin/develop' into 2.0 
# Conflicts:
#	app/config/version.php
#	app/controllers/admin/AssetsController.php
 2015-07-02 17:23:06 -07:00
snipe 1601bdd4eb Added rtd_location_id back into selected columns 2015-07-02 16:52:08 -07:00
snipe a8cb5c1e7d Beginning QR mobile interface 2015-06-30 19:07:44 -07:00
snipe 818d1769b8 Automated backup to dump SQL and zip uploaded files 
Usage:

`php artisan snipeit:backup`

This can be set on a cron or scheduled task
 2015-06-22 15:52:26 -07:00
snipe bf6674f6a0 Added table prefix for raw queries 2015-06-19 18:03:28 -07:00
snipe ee08586279 Trying to regain compatibility with PHP 5.4 2015-06-19 17:59:10 -07:00
snipe 221ae62ea5 Example configs 2015-06-19 17:38:06 -07:00
snipe 76825441b9 Added session config to allow for forced SSL 2015-06-19 14:46:16 -07:00
snipe 8e83206556 Added dumps directory 2015-06-19 14:40:23 -07:00
snipe 2aa357f315 Added fideveloper proxy and DB backup 2015-06-19 14:28:40 -07:00
snipe 3ce9500d75 Moved password up with other required fields 2015-06-16 00:20:43 -07:00
snipe c699452473 Bumped version 2015-06-15 18:39:42 -07:00