7a57fd73e5
Merge remote-tracking branch 'origin/develop'
2015-09-20 18:11:08 -07:00
41b3f5b5c8
Bumped version
2015-09-20 18:10:37 -07:00
fbbe24f197
Fixes #1184 because package authors can't seem to keep their stuff from breaking
2015-09-20 18:10:30 -07:00
9b0495453d
Merge pull request #1147 from jotterbot/develop
...
Adding Purchase Cost to AssetImporterCommand
2015-09-18 16:17:59 -07:00
fe765b3c9c
Fixed not found error message string
2015-09-17 13:59:43 -07:00
740967e4f2
Additional translations
2015-09-17 11:02:43 -07:00
cffd87c5a3
Fix user display if no location was provided
2015-09-15 10:52:12 -07:00
c8526a6be0
Merge remote-tracking branch 'origin/develop'
2015-09-15 09:59:55 -07:00
abd0acbe9d
Add username to user's list view
2015-09-15 09:58:56 -07:00
3719f9a5a8
Added supplier ID to asset seeder
2015-09-15 03:45:00 -07:00
f9dc5766a7
Suppliers seeder
2015-09-15 03:41:37 -07:00
c6b6ccc814
More seeders
2015-09-15 03:31:20 -07:00
bd7a043ab0
Merge remote-tracking branch 'origin/develop'
2015-09-15 03:00:49 -07:00
611da2ffbd
Only show location map if $user->userloc is valid
2015-09-15 02:59:19 -07:00
911e9092f9
Prevent group altering from trolling douchebags
2015-09-15 02:46:40 -07:00
06c9076c2f
Prevent generating backups, deleting files and file downloads in demo mode
2015-09-15 02:32:19 -07:00
b8fa5abadf
Disable manual backup on demo
2015-09-15 02:25:53 -07:00
dac2747c01
Updated localization for new backup strings
2015-09-15 02:10:01 -07:00
db44430870
Generate button localization
2015-09-15 02:08:39 -07:00
c12139e624
Added generate and delete backups
2015-09-15 02:05:51 -07:00
a2f6d8f72e
Change to #1174 - pull other functions out of if statement
2015-09-14 21:52:51 -07:00
39f82e546f
Fixes #1174 - broken migration if asset_logs table has uploads
2015-09-14 21:40:05 -07:00
6e6661a72b
Merge remote-tracking branch 'origin/develop'
2015-09-14 16:47:43 -07:00
d79e2a0864
Allow > tags for custom CSS to modify bootstrap
2015-09-14 16:47:16 -07:00
0110cd3c55
Merge remote-tracking branch 'origin/develop'
2015-09-14 15:50:02 -07:00
3b359d7c6e
Merge branch 'develop' of github.com:snipe/snipe-it into develop
2015-09-14 15:49:00 -07:00
3da5c15249
Bumped version
2015-09-14 15:48:49 -07:00
fcec12f3b2
Allow asset-level EOL to override model level if given
2015-09-14 15:48:42 -07:00
924c23b5ae
Merge pull request #1173 from jbirdkerr/jbirdkerr-checkin-template
...
Update checkin-asset.blade.php
2015-09-11 19:51:08 -07:00
d70aa42cc9
Update checkin-asset.blade.php
2015-09-11 21:48:05 -05:00
aecc98b8a3
Merge remote-tracking branch 'origin/develop'
2015-09-11 16:14:20 -07:00
2c54c93859
Fixes #1170 - barcode alternative
2015-09-11 16:13:44 -07:00
b6b0a5ac58
Merge pull request #1168 from mtucker6784/develop
...
Modified readme.md and install.sh
2015-09-10 16:20:52 -07:00
2291dda425
Add info w/install.sh for fresh Ubu/CentOS install
2015-09-10 15:11:16 -07:00
b402a68bc2
Install Snipe-It on a clean Ubuntu/CentOS install
...
This script is designed to install Snipe-It on a fresh install of Ubuntu or CentOS. You will receive minimal options regarding setting passwords and the script should take care of the rest. The purpose of this script is to install Snipe-It on a server that will be dedicated to the application.
This was tested on Ubuntu 14.04 and CentOS 7, YMMV with different OS versions.
2015-09-10 15:08:07 -07:00
97ecdba262
Bumped version
2015-09-10 11:49:47 -07:00
8c2ee9e96c
Fixes #1167 - don't allow double checkin
2015-09-10 11:49:43 -07:00
e05baf1df4
Fixed language strings for accessories
2015-09-10 11:49:26 -07:00
141bba490f
Merge remote-tracking branch 'origin/develop'
2015-09-09 16:40:42 -07:00
416be43061
Added the fideveloper service provider to app.php
2015-09-09 16:36:50 -07:00
2c89d05156
Smaller font size for labels to prevent them from getting cut off
2015-09-09 14:11:15 -07:00
680b189709
Fixes #1151 - additional LDAP option
2015-09-09 14:01:17 -07:00
29d5682956
Updated language strings, added Bulgarian
2015-09-09 13:56:10 -07:00
32604f0715
Fixes #1154 - DL CVS string
2015-09-09 13:40:14 -07:00
d1fc48d82e
Disable CSS edits for demo
2015-09-09 13:27:50 -07:00
650f86406d
Added custom CSS field in settings
2015-09-09 13:17:36 -07:00
9b353ae0d8
Fixes #1150 - added note about lowercasing
2015-09-09 11:47:18 -07:00
cbcc43828e
Removed required indicator for serial
2015-09-09 11:19:43 -07:00
c59122a125
Adding Purchase Cost to AssetImporterCommand
2015-09-04 16:03:20 +10:00
6a08ee1597
Merge remote-tracking branch 'origin/develop'
2015-09-03 19:24:22 -07:00
snipe