ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,009 Commits 84 Branches 293 Tags
67e968b03276d563a920a09cd4cec5258e62d016
Commit Graph

53 Commits

Author SHA1 Message Date
snipe 4ae02c1fb3 Merge pull request #1321 from Ahimta/multiple-companies 
Add support for multiple companies
 2015-11-23 14:40:37 -08:00
snipe 9ec132acde Small fixed for LDAP in settings table 2015-11-23 14:33:00 -08:00
Walter 840e5b1523 Revert "begin work on idap import button" 
This reverts commit 3942fd1869.
 2015-11-22 11:10:36 -05:00
Walter 1ee3f29d2e Revert "working on ldap import button" 
This reverts commit 113dfc9c24.
 2015-11-22 11:02:19 -05:00
Abdullah Alansari fe44846c1b Fix: only super users can change multiple companies support option 2015-11-19 09:17:50 +03:00
Wahlstedt, Walter 638a7773bd syntax error 2015-11-18 16:36:02 -05:00
Wahlstedt, Walter 113dfc9c24 working on ldap import button 
add route for button
added button and open/close for form
 2015-11-18 16:22:04 -05:00
Walter 3942fd1869 begin work on idap import button 2015-11-18 12:11:42 -05:00
Wahlstedt, Walter 6f338e573c set required_if ldap_enabled box has been checked. 2015-11-17 16:00:52 -05:00
Wahlstedt, Walter 8e44421788 added Crypt class and set ldap_pword field to longText 2015-11-17 15:20:55 -05:00
Wahlstedt, Walter e031239cf0 Removed escaping, add sometimes required, add encrypt ldap password 2015-11-17 13:49:59 -05:00
Wahlstedt, Walter c8ecddba54 Revert "Set required fields if ldap is enabled" 
This reverts commit 2f69be03d3.
 2015-11-17 10:47:59 -05:00
Wahlstedt, Walter 2f69be03d3 Set required fields if ldap is enabled 2015-11-17 10:46:29 -05:00
Wahlstedt, Walter 8793a04869 add ldap integration to settings page. 2015-11-17 09:59:20 -05:00
Wahlstedt, Walter 2ec5f340e8 update validators and lang 2015-11-16 13:08:51 -05:00
Wahlstedt, Walter 50ea6c66f9 LDAP Settings update 
update ldap field names
add ldap fields to controllers
add ldap fields to migration
add lang fields
update edit page
 2015-11-16 11:30:51 -05:00
Abdullah Alansari b202e01205 Add full multiple companies support 
Added as an option in settings.
When enabled, users (including admins) who are assigned
to companies have access only to their companies' assets.
 2015-11-16 06:03:27 +03:00
Walter d9cd4a4da0 setting up views for ldap 2015-11-11 23:03:46 -05:00
Walter ecae451ebf form validation 2015-11-09 22:34:18 -05:00
Walter 9627f15412 update settings controller to add ldap field validation 2015-11-09 22:32:00 -05:00
Walter 464f11c398 setting up bones for ldap settings 
add migration
add ldap settings to settings controller
add ldap fields edit settings views
 2015-11-09 22:09:09 -05:00
Stefan a6586b5919 Added option to select brand type text or logo or text + logo 2015-10-12 20:34:12 +02:00
snipe 06c9076c2f Prevent generating backups, deleting files and file downloads in demo mode 2015-09-15 02:32:19 -07:00
snipe b8fa5abadf Disable manual backup on demo 2015-09-15 02:25:53 -07:00
snipe c12139e624 Added generate and delete backups 2015-09-15 02:05:51 -07:00
snipe 650f86406d Added custom CSS field in settings 2015-09-09 13:17:36 -07:00
snipe da6770c9d9 Fixes #1102 - default currency stored as htmlentities in the DB 2015-08-21 18:11:23 -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 bb7ce83c48 Merge remote-tracking branch 'origin/develop' into 2.0 2015-06-30 22:42:00 -07:00
snipe 1d4cfcfd58 Only save uploaded logo if not in demo mode 2015-06-30 22:38:40 -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 221ae62ea5 Example configs 2015-06-19 17:38:06 -07:00
snipe 62b5ec5b02 Slack field validation and placeholder text 2015-04-30 16:58:33 -07:00
snipe 3c00f38a0f Slack integration for asset checkin/checkout 2015-04-29 17:38:22 -07:00
snipe afdf00eacb Removed settings save for display fields 2015-03-27 22:34:39 -07:00
snipe 75d5f494a3 Bypass site name validation if locked 2015-03-20 15:08:10 -07:00
snipe 40852f9a6a Update to settings edit 2015-03-20 15:00:05 -07:00
snipe 4076b29b63 Support for DATAMATRIX and PDF417 barcodes 2015-03-04 17:43:53 -08:00
snipe 097bb38a23 Fixes #163 - accept acceptance + eula 
TODO: Language strings, check that the accepting user is the one that should be allowed to accept.
 2015-02-24 22:15:36 -08:00
snipe e04ac89c5a Added expiring warrantee alerts 2015-02-24 02:07:33 -08:00
snipe f8e12cabd4 Fixes #476 - added logo upload and header color 2015-02-19 15:14:50 -08:00
snipe 38961298ed Fixes #439 - loads javascript and CSS locally 2015-02-17 15:29:57 -08:00
snipe d6a0249c60 Fixed #373 - added ability to auto-increment asset tags 2014-11-20 18:28:45 -05:00
snipe 9e85dcb9fc Fixes #315 - add EOL as display option in settings (run migrations) 2014-11-01 18:38:24 -04:00
madd15 b0e1ef6024 Add Display Checkout Date 2014-10-24 12:32:44 +10:30
root b8a4c7e4d6 Initial COMMIT to set the file modified tracking. No changes made. 2014-08-05 13:22:08 +09:00
snipe 8b914102b7 Updated spacing for PSR-2 2014-06-24 17:49:39 -04:00
snipe 08d05b481f Fixes #158 2014-06-19 16:10:00 -04:00
Jake McGraw af603f0380 make text below asset tags configurable 2014-05-03 20:06:59 +00:00
snipe 580590b4c0 Fixed === to == (PHP is loosely typed) 2014-01-28 20:24:37 -05:00