 snipe
|
1fe5bd3770
|
Merge remote-tracking branch 'origin/develop'
v2.0.5
|
2015-11-18 14:29:53 -08:00 |
|
|
snipe
|
2b26fd7e20
|
Fixed string in gh-changelog
|
2015-11-18 14:29:29 -08:00 |
|
|
snipe
|
7a0598dfc3
|
Pulled naughty language from changelog
|
2015-11-18 13:56:13 -08:00 |
|
|
snipe
|
5ebb267a53
|
Updated changelog script
|
2015-11-18 13:52:57 -08:00 |
|
|
snipe
|
21a280676b
|
Merge pull request #1356 from merid14/develop
Set default to not seed DB
|
2015-11-17 09:34:38 -08:00 |
|
|
Wahlstedt, Walter
|
7e8a0af6e5
|
Set default to not seed DB
|
2015-11-17 10:12:26 -05:00 |
|
|
snipe
|
b210d90148
|
Merge remote-tracking branch 'origin/develop'
|
2015-11-13 12:07:34 -08:00 |
|
|
snipe
|
2afc252549
|
Link to category listing from accessories
|
2015-11-11 17:43:24 -08:00 |
|
|
snipe
|
aa05d041bd
|
Fixes #1324 - missing $inout variable when if/else not met
|
2015-11-11 17:22:28 -08:00 |
|
|
snipe
|
bbe0189be2
|
CSS for max image size on asset view
|
2015-11-11 16:06:17 -08:00 |
|
|
snipe
|
a0599712a6
|
Show model image if available and no asset image
|
2015-11-11 16:06:07 -08:00 |
|
|
snipe
|
1a4926ce13
|
Sort by asset image for PR #1330
|
2015-11-11 15:57:41 -08:00 |
|
|
snipe
|
3c8959e92d
|
Bumped version
|
2015-11-11 15:56:10 -08:00 |
|
|
snipe
|
ab3871f678
|
Small changes for PR #1330
|
2015-11-11 15:56:01 -08:00 |
|
|
snipe
|
7297a6031e
|
Merge pull request #1330 from mtucker6784/develop
Images for devices on the Assets datatable page.
|
2015-11-11 15:51:31 -08:00 |
|
|
snipe
|
75bd29b027
|
Added cookie expiration for sorting/filtering
|
2015-11-11 14:50:17 -08:00 |
|
|
snipe
|
b77b9c0434
|
Merge pull request #1323 from merid14/develop
Enhancements for installer
|
2015-11-10 18:02:47 -08:00 |
|
|
snipe
|
b9c36f8638
|
Fixes #1335 - editing maintenance
|
2015-11-10 18:02:06 -08:00 |
|
|
mtucker6784
|
90009db1b5
|
Image is now recorded upon initial asset creation.
|
2015-11-09 12:01:31 -07:00 |
|
|
mtucker6784
|
d7f8d0fc04
|
Changed image save location in AssetsController
|
2015-11-09 09:35:10 -07:00 |
|
|
mtucker6784
|
effad46cc0
|
create assets image directory
|
2015-11-09 09:16:53 -07:00 |
|
|
mtucker6784
|
4509631921
|
Add image column migration
|
2015-11-09 08:47:05 -07:00 |
|
|
mtucker6784
|
d1a306cfd8
|
Yay, asset image progress!
|
2015-11-09 08:25:29 -07:00 |
|
|
Walter
|
2de4741170
|
Add password confirmation, hide password and set default database seed to no
|
2015-11-07 22:21:07 -05:00 |
|
|
Walter
|
fc609ece12
|
Merge remote-tracking branch 'refs/remotes/snipe/develop' into develop
|
2015-11-07 22:13:48 -05:00 |
|
|
snipe
|
ecfd1b2693
|
Merge remote-tracking branch 'origin/develop'
|
2015-11-07 15:54:37 -08:00 |
|
|
snipe
|
a8da68d3fd
|
Fixes #1320 - added name for cookie table
|
2015-11-07 15:53:39 -08:00 |
|
|
snipe
|
69970d1296
|
Merge remote-tracking branch 'origin/develop'
|
2015-11-07 15:44:27 -08:00 |
|
|
snipe
|
ef7c7da4e5
|
Merge pull request #1302 from merid14/develop
Reworked the Installer
|
2015-11-07 15:42:06 -08:00 |
|
|
snipe
|
306d8ebaf7
|
Fixes #1317 - regression issue in bulk delete
|
2015-11-07 15:40:25 -08:00 |
|
|
snipe
|
250880c6f3
|
Include default text in status label helper
|
2015-11-07 15:39:03 -08:00 |
|
|
Walter
|
9f43b6af9f
|
fixed apache config file
|
2015-11-06 15:17:54 -05:00 |
|
|
Walter
|
a47a4e83e2
|
fixed issues with sed command and /
|
2015-11-06 11:53:07 -05:00 |
|
|
Walter
|
ca1384504a
|
fixed tzone variable assignment
|
2015-11-06 10:03:58 -05:00 |
|
|
Walter
|
fc6bb7f056
|
sets the timezone automatically
|
2015-11-06 09:02:51 -05:00 |
|
|
Walter
|
62cee46a83
|
update webdir for debian and fix the error logs
|
2015-11-06 08:30:51 -05:00 |
|
|
Walter
|
c94ece2925
|
changed replace for sed command
|
2015-11-05 21:42:20 -05:00 |
|
|
Walter
|
5d5882ea5b
|
moved the permissions changes to the end
|
2015-11-05 21:40:51 -05:00 |
|
|
Walter
|
61fc912c47
|
moving permisions block and some mysql stuff
|
2015-11-05 16:25:03 -05:00 |
|
|
Walter
|
e54bbcd37f
|
working on debian installer
|
2015-11-04 21:14:19 -05:00 |
|
|
snipe
|
c1961c0e40
|
Merge pull request #1313 from mtucker6784/develop
Make Model column a hyperlink to access the model page.
|
2015-11-04 15:26:25 -08:00 |
|
|
Michael T
|
11c2fcd094
|
Remove new window target
|
2015-11-04 16:10:27 -07:00 |
|
|
Michael T
|
b856e7f2c6
|
Make Model column a hyperlink to access the model page.
|
2015-11-04 15:55:41 -07:00 |
|
|
snipe
|
7a84d1061b
|
Merge remote-tracking branch 'origin/develop'
|
2015-11-04 14:04:23 -08:00 |
|
|
Walter
|
56b50468d2
|
fixed packages for centos6
|
2015-11-04 16:01:25 -05:00 |
|
|
Walter
|
c7057f550f
|
removed a var
|
2015-11-04 10:08:04 -05:00 |
|
|
Walter
|
037cda36b2
|
formatting
|
2015-11-04 09:17:16 -05:00 |
|
|
Walter
|
f3de39efd6
|
syncing centos 6 and centos 7
wasnt replacing production.yourserver.com with the fdqn. took out
http://
changed .conf file name to $name.conf instead of $fdqn.conf
|
2015-11-04 09:06:48 -05:00 |
|
|
snipe
|
af5c221385
|
Updated language strings
v2.0.5-pre
|
2015-11-04 03:42:37 -08:00 |
|
|
snipe
|
feb74806a8
|
Removed models override
|
2015-11-04 01:08:17 -08:00 |
|