 snipe
|
287c7735b6
|
Added CSRF token for upload
|
2015-11-24 19:37:59 -08:00 |
|
|
snipe
|
2a28c73845
|
Importer fixes - check for asset before inserting
|
2015-11-24 19:37:37 -08:00 |
|
|
snipe
|
3dc0381e2b
|
Updated contributing docs
|
2015-11-24 18:05:48 -08:00 |
|
|
snipe
|
a3dbd87f9f
|
Fixed weird company table styles
|
2015-11-24 13:47:43 -08:00 |
|
|
snipe
|
6d42d2c614
|
Fixed bootstrap class for button
|
2015-11-24 13:44:58 -08:00 |
|
|
snipe
|
e910b532c7
|
Account for invalid categories
|
2015-11-24 13:31:54 -08:00 |
|
|
snipe
|
a777499c0b
|
Fixes #1376 - added new fields to consumables view
|
2015-11-24 13:30:05 -08:00 |
|
|
snipe
|
b99c138cb0
|
Fixes #1369 - fixed searching/sorting on location
|
2015-11-24 12:48:41 -08:00 |
|
|
snipe
|
cbb2151f1a
|
Allow re-use of usernames
|
2015-11-24 12:29:25 -08:00 |
|
|
snipe
|
256f33e6b4
|
Company/category search on accessories
|
2015-11-24 12:08:49 -08:00 |
|
|
snipe
|
59315878c3
|
Bumped version
|
2015-11-24 11:47:40 -08:00 |
|
|
snipe
|
f6e2654609
|
Added searching on company name, ordering on company name for PR #1321
|
2015-11-24 11:47:34 -08:00 |
|
|
snipe
|
4ad241e65e
|
Merge pull request #1386 from RealEnder/develop
Add Bulgarian lev and replace tabs
|
2015-11-24 10:51:55 -08:00 |
|
|
snipe
|
808b66b9f5
|
Merge pull request #1384 from merid14/develop
Moved installer to snipeit.sh for logging
|
2015-11-24 10:50:46 -08:00 |
|
|
Walter
|
edbfdc6eb1
|
pointed wget to snipe master
|
2015-11-24 09:13:01 -05:00 |
|
|
Alex Stanev
|
716c459985
|
Fix ident
|
2015-11-24 12:30:28 +02:00 |
|
|
Alex Stanev
|
ef011cdf7e
|
Add Bulgarian lev
|
2015-11-24 12:25:57 +02:00 |
|
|
snipe
|
b93f36a856
|
Bumped version
|
2015-11-23 21:04:47 -08:00 |
|
|
snipe
|
e60c0e3b4d
|
Warning message about EOL
|
2015-11-23 21:04:41 -08:00 |
|
|
snipe
|
407b341510
|
Updated bootstrap tables
|
2015-11-23 20:57:18 -08:00 |
|
|
snipe
|
120c8394bb
|
Fixes #1380 - groups pagination
|
2015-11-23 19:18:00 -08:00 |
|
|
snipe
|
cc17862eae
|
Back out the encryption constructor for now
|
2015-11-23 18:18:49 -08:00 |
|
|
snipe
|
c24f1721d7
|
Bumped version
|
2015-11-23 17:44:00 -08:00 |
|
|
snipe
|
c80f1789d4
|
Set default hasher in constructor
|
2015-11-23 17:43:53 -08:00 |
|
|
snipe
|
4a49e6f471
|
Added popover code
|
2015-11-23 17:43:43 -08:00 |
|
|
snipe
|
e9f4be711a
|
Added required fields
|
2015-11-23 17:43:35 -08:00 |
|
|
snipe
|
1bccb6127e
|
Merge branch 'develop' of github.com:snipe/snipe-it into develop
|
2015-11-23 15:18:22 -08:00 |
|
|
snipe
|
61107769e8
|
Add user ID and make company name hidden by default
|
2015-11-23 15:18:10 -08:00 |
|
|
snipe
|
4e96a5a793
|
Merge pull request #1374 from vabue/features/ukrainian-currency
Add ukrainian and russian currencies for #1373
|
2015-11-23 15:17:24 -08:00 |
|
|
snipe
|
f87a25bf3f
|
Moved company down further, since it's not used as often
|
2015-11-23 14:44:08 -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 |
|
|
snipe
|
9ec132acde
|
Small fixed for LDAP in settings table
|
2015-11-23 14:33:00 -08:00 |
|
|
snipe
|
318b4b48c6
|
Fixes null value for LDAP settings
|
2015-11-23 14:11:55 -08:00 |
|
|
snipe
|
329a2282e4
|
Merge pull request #1357 from merid14/features/ldap-settings
Features/ldap settings
|
2015-11-23 14:10:44 -08:00 |
|
|
Wahlstedt, Walter
|
f8014c4677
|
Insure running as root. added comment
added comment to ubuntu installer so people know to wait.
|
2015-11-23 16:37:54 -05:00 |
|
|
Walter
|
7a07c07e29
|
removed password insert to database
|
2015-11-23 16:16:05 -05:00 |
|
|
Wahlstedt, Walter
|
4b926f015b
|
fixed typo in installer
|
2015-11-23 16:08:02 -05:00 |
|
|
Wahlstedt, Walter
|
aa834aa72b
|
Merged changes to new snipeit.sh install file.
|
2015-11-23 16:04:12 -05:00 |
|
|
Wahlstedt, Walter
|
400b97c40a
|
Merge remote-tracking branch 'refs/remotes/snipe/develop' into develop
Conflicts:
install.sh
|
2015-11-23 16:02:59 -05:00 |
|
|
Wahlstedt, Walter
|
8394212df7
|
update tzone for centos7
|
2015-11-23 15:49:08 -05:00 |
|
|
Wahlstedt, Walter
|
2487ce42e3
|
remove installers
|
2015-11-23 15:22:39 -05:00 |
|
|
Wahlstedt, Walter
|
fb59ad9fe6
|
remove force root
|
2015-11-23 15:15:08 -05:00 |
|
|
Wahlstedt, Walter
|
8af5fd0384
|
Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
snipeit.sh
|
2015-11-23 14:43:00 -05:00 |
|
|
Wahlstedt, Walter
|
4de42f69ba
|
adding some IO redirection
|
2015-11-23 14:40:15 -05:00 |
|
|
Walter
|
620d4754c0
|
install epel repo before IUS
|
2015-11-22 23:15:01 -05: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 |
|
|
Walter
|
6b26640077
|
Merge remote-tracking branch 'refs/remotes/snipe/develop' into features/ldap-settings
|
2015-11-22 11:01:07 -05:00 |
|
|
Val Budkin
|
964d2bc463
|
Add ukrainian and russian currencies for #1373
|
2015-11-22 17:50:08 +02:00 |
|