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

68 Commits

Author SHA1 Message Date
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
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 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
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 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 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 3a44a7e8bb Disable logo upload for demo 2015-06-30 22:38:12 -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 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
snipe 97d97fc4df Merge branch 'develop' of github.com:snipe/snipe-it into develop 
Conflicts:
	app/views/backend/categories/edit.blade.php
	app/views/backend/depreciations/edit.blade.php
	app/views/backend/groups/create.blade.php
	app/views/backend/groups/edit.blade.php
	app/views/backend/hardware/bulk.blade.php
	app/views/backend/hardware/checkin.blade.php
	app/views/backend/hardware/checkout.blade.php
	app/views/backend/hardware/edit.blade.php
	app/views/backend/licenses/checkin.blade.php
	app/views/backend/licenses/checkout.blade.php
	app/views/backend/licenses/edit.blade.php
	app/views/backend/locations/edit.blade.php
	app/views/backend/manufacturers/edit.blade.php
	app/views/backend/models/edit.blade.php
	app/views/backend/statuslabels/edit.blade.php
	app/views/backend/suppliers/edit.blade.php
	app/views/frontend/account/change-email.blade.php
	app/views/frontend/account/change-password.blade.php
	app/views/frontend/account/profile.blade.php
	app/views/frontend/auth/forgot-password-confirm.blade.php
	app/views/frontend/auth/signin.blade.php
 2015-02-26 10:26:04 -08:00
madd15 379f6bef6c catergories lang and serveral icons 2015-02-26 23:48:17 +10:30
snipe 59ea144b28 Minor UX tweaks 2015-02-26 03:07:19 -08:00
snipe ca1351b704 Switched to all FA 2015-02-25 18:14:51 -08:00
snipe ad39ec1dc3 Added markdown to EULA 2015-02-25 11:25:10 -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 ad9e7f1d9e Cleaned up settings form for nicer display 2015-02-19 15:34:55 -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 51a7752771 Moved cancel text to buttons language file 2015-02-06 18:52:09 -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 b11a0cb436 Changed to == on $setting->qr_code 2014-10-25 00:27:25 +10:30
madd15 189523a943 Add Display Checkout Date Setting 2014-10-24 12:30:51 +10:30
madd15 c68d76870e Change all form to use Form:: & update Lang 
Updated <input> to Form::
Update static text to Lang Vars
 2014-10-17 15:35:56 +10:30