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

95 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 6ea3bedb9e set decryption and set pword in migraiton 2015-11-22 23:08:18 -05: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 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 73a183677d Revert "add escaping to ldap fields in blades" 
This reverts commit 1d24450dcd.
 2015-11-17 16:12:24 -05:00
Wahlstedt, Walter 1d24450dcd add escaping to ldap fields in blades 2015-11-17 16:06:55 -05:00
Wahlstedt, Walter ac44140d83 fix edit blades 2015-11-17 10:50:39 -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 8a014d4bd3 update ldap integration 2015-11-17 10:00:06 -05:00
Wahlstedt, Walter 8793a04869 add ldap integration to settings page. 2015-11-17 09:59:20 -05:00
Wahlstedt, Walter d72df21b3b Update migration and blades 2015-11-16 16:31:43 -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 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
snipe 5ff75e7f42 Merge remote-tracking branch 'origin/develop-bootstrap-tables-integration' into develop 
# Conflicts:
#	app/controllers/admin/CategoriesController.php
#	app/views/backend/accessories/view.blade.php
#	app/views/backend/categories/index.blade.php
#	app/views/backend/settings/edit.blade.php
 2015-10-21 23:06:43 -07:00
snipe d9ea718d51 Added back missing div 2015-10-21 13:36:35 -07:00
Stefan 0db075cb13 fixes lang option for remote script 2015-10-12 21:00:27 +02:00
Stefan a6586b5919 Added option to select brand type text or logo or text + logo 2015-10-12 20:34:12 +02:00
Stefan 485b34b66e fixed layout and added branding option 2015-10-12 19:14:05 +02:00
snipe 505d46d49f Fixed typo 2015-09-22 20:22:21 -07:00
snipe 911e9092f9 Prevent group altering from trolling douchebags 2015-09-15 02:46:40 -07: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 db44430870 Generate button localization 2015-09-15 02:08:39 -07:00
snipe c12139e624 Added generate and delete backups 2015-09-15 02:05:51 -07:00
snipe 2c54c93859 Fixes #1170 - barcode alternative 2015-09-11 16:13:44 -07:00
snipe d1fc48d82e Disable CSS edits for demo 2015-09-09 13:27:50 -07:00
snipe 650f86406d Added custom CSS field in settings 2015-09-09 13:17:36 -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 3a44a7e8bb Disable logo upload for demo 2015-06-30 22:38:12 -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 3dfa1e1ea7 Backups blade 2015-06-19 17:37:40 -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 bce06543b2 Merge remote-tracking branch 'origin/master' into develop 2015-04-29 15:28:38 -07:00
snipe 9841dbbbc4 Fixed HTML so settings are saved correctly 2015-04-29 15:28:11 -07:00
snipe d61506fcf7 Fixes for #766 - add activity report 2015-04-29 14:50:12 -07:00
madd15 9be50152b3 per_page Select drop-down 2015-04-02 11:21:32 +10:30
snipe 51148f1371 Removed additional settings, since all are displayable now 2015-03-27 22:32:38 -07:00
snipe c6be6f480e Disable editing title when locked 2015-03-20 14:56:03 -07:00
madd15 ff8b88d187 add pencil to edit settings button 2015-03-10 13:56:25 +10:30
madd15 f532665f06 update icon 2015-03-10 13:53:34 +10:30
snipe 4076b29b63 Support for DATAMATRIX and PDF417 barcodes 2015-03-04 17:43:53 -08:00