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

326 Commits

Author SHA1 Message Date
snipe 948be5c74b Updated language strings 2015-11-25 03:37:48 -08:00
snipe 4ae02c1fb3 Merge pull request #1321 from Ahimta/multiple-companies 
Add support for multiple companies
 2015-11-23 14:40:37 -08:00
Walter 840e5b1523 Revert "begin work on idap import button" 
This reverts commit 3942fd1869.
 2015-11-22 11:10:36 -05:00
Walter 3942fd1869 begin work on idap import button 2015-11-18 12:11:42 -05:00
Wahlstedt, Walter 63cd0c1ae1 Merge remote-tracking branch 'refs/remotes/snipe/develop' into features/ldap-settings 2015-11-17 10:11:38 -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
Walter 8f6c37c301 add ldap to en lang 2015-11-15 22:22:42 -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 7f9fab0055 adjusted settings 2015-11-15 21:42:49 -05:00
Abdullah Alansari 23d10a8f7f Make company field optional 
Company field is now optional for the user,
although still required in the controllers.
 2015-11-13 09:19:18 +03:00
Abdullah Alansari d8df61bd32 Merge remote-tracking branch 'upstream/develop' into multiple-companies 
Conflicts:
	app/controllers/admin/UsersController.php
	app/views/backend/hardware/index.blade.php
 2015-11-12 09:30:11 +03:00
mtucker6784 d1a306cfd8 Yay, asset image progress! 2015-11-09 08:25:29 -07:00
Abdullah Alansari 6bf2a2875f Add initial support for multiple companies 
You can find screenshots and other files
related to the feature on Dropbox here:
https://www.dropbox.com/sh/wugnzqepwgzwlnh/AAAwNWA5hIKrP0y2VTu-LMHHa?dl=0

https://github.com/snipe/snipe-it/issues/23
 2015-11-07 15:22:10 +03:00
snipe af5c221385 Updated language strings 2015-11-04 03:42:37 -08:00
snipe 9731727095 Sorting for #1266 2015-11-02 19:17:20 -08:00
snipe 712e415f4d Updated deleted seats language 2015-11-02 16:45:02 -08: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 69c95f1f73 Merge pull request #1225 from ddreier/1088-acc-prices 
Accessory and Consumable Price info #1088
 2015-10-21 22:44:14 -07:00
snipe 30bbc9ad46 Merge pull request #1238 from Miliamber/develop 
Added fixed icon width in navbar and new branding options
 2015-10-21 22:43:30 -07:00
snipe 9d6608c8f1 Asset maintenances for #1266 2015-10-21 22:19:02 -07:00
snipe 58c497adb7 Updated language strings 2015-10-16 00:35:39 -07:00
Stefan 485b34b66e fixed layout and added branding option 2015-10-12 19:14:05 +02:00
Daniel Dreier 73d4c65daf Finished work on #1088. Added info to view, translation strings and logic to controllers. 2015-10-06 19:29:44 -05:00
snipe 00b93883e4 Updated translations 2015-10-06 16:14:38 -07:00
snipe 89816d90b4 Corrected consumable string 2015-10-06 16:09:10 -07:00
snipe d41c3fde10 Updated bulgarian and thai translation strings 2015-09-20 23:58:00 -07:00
snipe 740967e4f2 Additional translations 2015-09-17 11:02:43 -07:00
snipe dac2747c01 Updated localization for new backup strings 2015-09-15 02:10:01 -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 8c2ee9e96c Fixes #1167 - don't allow double checkin 2015-09-10 11:49:43 -07:00
snipe e05baf1df4 Fixed language strings for accessories 2015-09-10 11:49:26 -07:00
snipe 29d5682956 Updated language strings, added Bulgarian 2015-09-09 13:56:10 -07:00
snipe 32604f0715 Fixes #1154 - DL CVS string 2015-09-09 13:40:14 -07:00
snipe 650f86406d Added custom CSS field in settings 2015-09-09 13:17:36 -07:00
snipe 2e7fd02f42 Updated language strings 2015-08-24 12:59:35 -07:00
Aladin Alaily 27efae93ac Add some explanation about the location field. 2015-08-21 10:42:37 -04:00
snipe 21bb2f8b44 Updated language string for asset request 2015-08-17 11:11:09 -07:00
snipe e7d7cc6fc2 Added space after error intro 2015-08-14 21:33:39 -07:00
snipe e14ebd0daa Improved error messages and error handling 2015-08-14 20:50:01 -07:00
snipe 676bedc9be LDAP UI language strings 2015-08-14 20:15:24 -07:00
root b576fce1f7 Modified files for accessory report. 2015-08-11 16:35:18 -07:00
snipe 959df613ae Updated language strings 2015-08-11 13:39:09 -07:00
snipe 9540db424a Fixes #948 - validate on model name+modelno+manufacturer combination 2015-08-06 05:58:50 -07:00
snipe 77bff707fa English is hard :( 2015-08-04 12:54:45 -07:00
snipe 183f8ae1bf Merge remote-tracking branch 'origin/develop' into 2.0 
# Conflicts:
#	app/commands/ImportCommand.php
#	app/lang/en/admin/users/message.php
#	app/lang/en/general.php
 2015-08-04 12:51:35 -07:00
snipe 3c730c691b Fixes #1010 - better errors on large file uploads 2015-08-04 12:45:17 -07:00
Vincent Sposato b195934a4a Finished building out the report, and refactoring to make the code more expressive 
Need to finish writing the code to track threads
 2015-08-01 12:20:49 -04:00