snipe
|
95f8dccc14
|
Bumped hash
|
2018-03-26 15:15:43 -07:00 |
|
snipe
|
846613c244
|
Merge branch 'develop'
# Conflicts:
# config/version.php
|
2018-03-22 20:48:02 -07:00 |
|
snipe
|
c4c137dc08
|
Bumped to 4.2.0
|
2018-03-22 20:47:09 -07:00 |
|
snipe
|
469efc923b
|
Merge branch 'develop'
# Conflicts:
# README.md
# config/version.php
|
2018-03-22 20:08:55 -07:00 |
|
snipe
|
dcd74f6922
|
Bumped version
|
2018-03-22 20:07:06 -07:00 |
|
snipe
|
96bab5697d
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# config/version.php
# database/migrations/2018_02_22_160436_add_remote_user_settings.php
|
2018-03-22 09:46:50 -07:00 |
|
snipe
|
abac3e7758
|
Bumped hash
|
2018-03-22 09:44:54 -07:00 |
|
snipe
|
01eaf48471
|
Merge branch 'develop'
# Conflicts:
# config/version.php
|
2018-03-07 18:25:12 -08:00 |
|
snipe
|
238a075c6a
|
Bumped hash
|
2018-03-07 18:24:09 -08:00 |
|
snipe
|
95d935d917
|
Added warning to not edit config files manually
|
2018-03-07 17:39:13 -08:00 |
|
snipe
|
d42361bac1
|
Merge branch 'develop'
# Conflicts:
# config/version.php
|
2018-03-05 20:27:50 -08:00 |
|
snipe
|
fabc9e5d1c
|
Bumped hash
|
2018-03-03 17:15:59 -08:00 |
|
snipe
|
2dd56f5bda
|
Backup the .env if BACKUP_ENV is set to true
|
2018-02-26 18:12:48 -08:00 |
|
snipe
|
c250c632f3
|
Merge branch 'develop'
# Conflicts:
# config/version.php
|
2018-02-26 15:46:49 -08:00 |
|
snipe
|
e3fb4f8799
|
Bumped hash
|
2018-02-26 15:44:36 -08:00 |
|
snipe
|
7c9c6ea3df
|
Merge branch 'develop'
# Conflicts:
# config/version.php
|
2018-02-22 16:40:19 -08:00 |
|
snipe
|
7d49c4de87
|
Bumped hash
|
2018-02-22 16:39:12 -08:00 |
|
snipe
|
3131c0d0ac
|
Merge branch 'develop'
# Conflicts:
# config/version.php
|
2018-02-21 16:45:21 -08:00 |
|
snipe
|
364e9cf3de
|
Bumped version
|
2018-02-21 16:43:00 -08:00 |
|
snipe
|
d511d90a2f
|
Merge branch 'develop'
# Conflicts:
# config/version.php
|
2018-02-21 06:50:42 -08:00 |
|
snipe
|
54d6cafda9
|
Bumped hash
|
2018-02-21 06:49:36 -08:00 |
|
snipe
|
cccd75fc42
|
Merge branch 'develop'
# Conflicts:
# config/version.php
|
2018-02-21 05:48:02 -08:00 |
|
snipe
|
dbc16a6c9b
|
Bumped hash
|
2018-02-21 05:47:12 -08:00 |
|
snipe
|
42c8de5620
|
Merge branch 'develop'
# Conflicts:
# config/version.php
|
2018-02-21 04:44:48 -08:00 |
|
snipe
|
ba4f63bca3
|
Bumped version
|
2018-02-21 04:43:52 -08:00 |
|
snipe
|
97bd87773c
|
Merge branch 'develop'
# Conflicts:
# config/version.php
|
2018-02-21 02:40:23 -08:00 |
|
snipe
|
b560828173
|
Bumped hash
|
2018-02-21 02:18:14 -08:00 |
|
snipe
|
7865fbea7e
|
Merge branch 'develop'
# Conflicts:
# config/version.php
|
2018-02-21 01:27:11 -08:00 |
|
snipe
|
5fcbf9091e
|
Bumped version
|
2018-02-21 01:23:19 -08:00 |
|
snipe
|
918db39eba
|
Merge branch 'develop'
|
2018-02-19 18:06:58 -08:00 |
|
snipe
|
213fe2ecea
|
Fixed #5044 - incorrect env values for SSL DB paths
|
2018-02-19 18:03:50 -08:00 |
|
snipe
|
6e70352d0b
|
Merge branch 'develop'
# Conflicts:
# config/version.php
|
2018-02-17 01:05:20 -08:00 |
|
snipe
|
9a4f5e0ba8
|
Bumped hash
|
2018-02-16 22:10:06 -08:00 |
|
snipe
|
5302108556
|
Update to master
|
2018-02-16 13:27:03 -08:00 |
|
snipe
|
27c1bc0271
|
Bumped hash
|
2018-02-16 13:24:47 -08:00 |
|
snipe
|
8b2045523d
|
Bumped hash
|
2018-02-01 15:55:33 -06:00 |
|
snipe
|
e77aae703b
|
Bumped hash
|
2018-01-25 11:03:45 -08:00 |
|
snipe
|
f5636f325d
|
Bumped hash
|
2018-01-24 11:01:51 -08:00 |
|
snipe
|
fcb5eea951
|
Bumped hash
|
2018-01-24 08:28:53 -08:00 |
|
snipe
|
a28fee1ff4
|
Bumped hash
|
2018-01-20 07:47:07 -08:00 |
|
snipe
|
f53c68e040
|
Bumped hash
|
2018-01-20 04:40:26 -08:00 |
|
snipe
|
913e6a5709
|
Bumped hash
|
2018-01-20 03:59:42 -08:00 |
|
snipe
|
a9ffe8d210
|
Bumped hash
|
2018-01-19 17:52:40 -08:00 |
|
snipe
|
c242abb42e
|
Added Company policy to fix company deletion issue
|
2018-01-19 17:51:28 -08:00 |
|
snipe
|
6133f09056
|
Bumped hash
|
2018-01-17 19:30:31 -08:00 |
|
snipe
|
e8252d9468
|
Bumped hash
|
2018-01-17 12:41:11 -08:00 |
|
snipe
|
9e605e0f79
|
Bumped hash
|
2018-01-17 12:11:39 -08:00 |
|
snipe
|
78efeec368
|
Bumped hash
|
2018-01-11 15:24:37 -08:00 |
|
snipe
|
bc3d27fac6
|
Bumped hash
|
2018-01-10 22:57:22 -08:00 |
|
snipe
|
30716b349b
|
Bumped dev hash
|
2017-12-15 18:55:56 -08:00 |
|
snipe
|
9018af4f1d
|
Bumped hash
|
2017-12-12 10:45:20 -08:00 |
|
snipe
|
55eaea0110
|
Derp.
|
2017-12-12 09:25:06 -08:00 |
|
snipe
|
671a125c62
|
Bumped hash
|
2017-12-12 09:24:40 -08:00 |
|
snipe
|
035f7a5292
|
Formatted version
|
2017-12-07 19:24:03 -08:00 |
|
snipe
|
0ea3100896
|
Bumped hash
|
2017-12-07 19:23:34 -08:00 |
|
snipe
|
808cd0f728
|
Nicer groups permission edit UI
|
2017-12-05 18:11:06 -08:00 |
|
snipe
|
027f6a7c12
|
Bumped hash
|
2017-12-05 13:18:52 -08:00 |
|
snipe
|
28fdbdd5d8
|
Bumped version
|
2017-12-04 23:50:45 -08:00 |
|
snipe
|
2aafdb1400
|
Bumped version
|
2017-12-01 20:49:04 -08:00 |
|
snipe
|
cbc09f3a12
|
Fixes #4508 - adds image to location view (and google map, if address and API key exist)
|
2017-12-01 19:12:35 -08:00 |
|
snipe
|
5a3233da37
|
Grr.
|
2017-12-01 14:54:18 -08:00 |
|
snipe
|
80109071a2
|
Fixed version number
|
2017-12-01 14:54:02 -08:00 |
|
snipe
|
c43bb670d2
|
Bumped hash
|
2017-12-01 14:50:46 -08:00 |
|
snipe
|
5efb803b60
|
Auto-bumped hash/version
|
2017-11-30 16:41:06 -08:00 |
|
snipe
|
51168e8e10
|
Auto-bumped hash/version
|
2017-11-30 13:40:36 -08:00 |
|
snipe
|
cc5eee1890
|
Auto-bumped hash/version
|
2017-11-30 13:32:12 -08:00 |
|
snipe
|
8cf70e7e20
|
Auto-bumped hash/version
|
2017-11-27 22:10:54 -08:00 |
|
snipe
|
290cf79778
|
Auto-bumped hash/version
|
2017-11-27 21:25:21 -08:00 |
|
snipe
|
8af1481749
|
Auto-bumped hash/version
|
2017-11-27 21:20:38 -08:00 |
|
snipe
|
82fca0c72d
|
Auto-bumped hash/version
|
2017-11-24 11:25:57 -08:00 |
|
snipe
|
76e3398d44
|
Auto-bumped hash/version
|
2017-11-22 18:42:33 -08:00 |
|
snipe
|
64b670033d
|
Auto-bumped hash/version
|
2017-11-22 18:30:45 -08:00 |
|
snipe
|
66ac147c9e
|
Auto-bumped hash/version
|
2017-11-22 07:32:40 -08:00 |
|
snipe
|
05e0d15ae4
|
Auto-bumped hash/version
|
2017-11-22 07:31:50 -08:00 |
|
snipe
|
09f20873df
|
Auto-bumped hash/version
|
2017-11-21 22:35:05 -08:00 |
|
snipe
|
2adc1e8ba9
|
Auto-bumped hash/version
|
2017-11-21 22:35:04 -08:00 |
|
snipe
|
4a6c18532b
|
Auto-bumped hash/version
|
2017-11-21 22:35:02 -08:00 |
|
snipe
|
921f882680
|
Auto-bumped hash/version
|
2017-11-21 22:35:01 -08:00 |
|
snipe
|
f79e5add58
|
Auto-bumped hash/version
|
2017-11-21 22:34:59 -08:00 |
|
snipe
|
8c15a4e0c6
|
Auto-bumped hash/version
|
2017-11-21 21:00:07 -08:00 |
|
snipe
|
9250b45e6e
|
Auto-bumped hash/version
|
2017-11-21 21:00:05 -08:00 |
|
snipe
|
3a1de3d2a5
|
Auto-bumped hash/version
|
2017-11-21 21:00:02 -08:00 |
|
snipe
|
b59dd11304
|
Auto-bumped hash/version
|
2017-11-21 21:00:00 -08:00 |
|
snipe
|
b6222abb7c
|
Auto-bumped hash/version
|
2017-11-21 20:59:58 -08:00 |
|
snipe
|
dcf8e4f5ef
|
Auto-bumped hash/version
|
2017-11-21 20:59:54 -08:00 |
|
snipe
|
f195073ac3
|
Auto-bumped hash/version
|
2017-11-21 20:59:52 -08:00 |
|
snipe
|
452a9d6725
|
Auto-bumped hash/version
|
2017-11-21 20:59:50 -08:00 |
|
snipe
|
1d74ddc547
|
Auto-bumped hash/version
|
2017-11-21 20:59:45 -08:00 |
|
snipe
|
932b589a14
|
Auto-bumped hash/version
|
2017-11-21 20:59:43 -08:00 |
|
snipe
|
671e514785
|
Auto-bumped hash/version
|
2017-11-21 20:59:41 -08:00 |
|
snipe
|
1e2ebdb69c
|
Auto-bumped hash/version
|
2017-11-21 20:59:39 -08:00 |
|
snipe
|
148751d927
|
Auto-bumped hash/version
|
2017-11-21 20:59:37 -08:00 |
|
snipe
|
efecdfaea0
|
Auto-bumped hash/version
|
2017-11-21 20:59:35 -08:00 |
|
snipe
|
ab9c84a6b6
|
Auto-bumped hash/version
|
2017-11-21 20:59:33 -08:00 |
|
snipe
|
7ce63e653b
|
Auto-bumped hash/version
|
2017-11-21 19:39:53 -08:00 |
|
snipe
|
a922c1a298
|
Auto-bumped hash/version
|
2017-11-21 19:38:29 -08:00 |
|
snipe
|
0c9e41e1fa
|
Updated versioning script to handle githooks better
|
2017-11-21 19:01:47 -08:00 |
|
snipe
|
4fd35573ad
|
Bumped version
|
2017-11-20 21:20:34 -08:00 |
|
snipe
|
f137e516a6
|
Bumped version
|
2017-11-14 16:49:18 -08:00 |
|
snipe
|
9b1fb90519
|
Change default log type back to single
|
2017-11-08 10:58:56 -08:00 |
|