 snipe
|
f9cf2b2558
|
Updated translations
|
2015-12-29 15:46:20 -08:00 |
|
|
snipe
|
e4627cee96
|
Updated language
|
2015-12-29 15:41:18 -08:00 |
|
|
snipe
|
36eb51d6e4
|
Fixed typo in string
|
2015-12-29 15:41:05 -08:00 |
|
|
Raveesh
|
96a5f437f2
|
Add option to allow ignoring SSL Cert verification.
|
2015-12-24 02:17:06 -05:00 |
|
|
snipe
|
f42a3c8918
|
Added company to bulk edit
|
2015-12-22 11:12:26 -08:00 |
|
|
Adam Dunson
|
894579314c
|
s/([Qq])uanitity/\1uantity/g
|
2015-12-22 11:11:11 -05:00 |
|
|
Daniel Dreier
|
0c27717c20
|
Added check and error message for trying to accept an asset that was not
checked out to that user.
|
2015-12-18 14:51:51 -06:00 |
|
|
snipe
|
e1837069da
|
Allow bulk model update for #1462, fixes #1442
|
2015-12-09 20:35:24 -08:00 |
|
|
snipe
|
25338c00e5
|
Fixes #1456 - email notification when asset requested
|
2015-12-09 01:40:13 -08:00 |
|
|
snipe
|
f1b00853c6
|
Final localization and UI improvemets for #1397
|
2015-12-02 15:21:18 -08:00 |
|
|
snipe
|
aa385571cf
|
Additional refinements for #1397
|
2015-12-01 20:50:54 -08:00 |
|
|
snipe
|
179f96c8e8
|
More strings for #1397
|
2015-12-01 18:16:44 -08:00 |
|
|
snipe
|
5f9d5ae836
|
More laguage strings for #1397
|
2015-12-01 17:55:42 -08:00 |
|
|
snipe
|
e98020fa89
|
Starter UI improvements and localization for #1397
|
2015-12-01 17:26:20 -08:00 |
|
|
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 |
|