snipe
|
5defd5ec0a
|
Merge develop into master
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-07 19:59:17 -08:00 |
|
snipe
|
e66b19aca0
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-07 19:44:06 -08:00 |
|
snipe
|
dbe0a3352b
|
Updated prod assets
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/mix-manifest.json
|
2023-02-28 20:34:20 -08:00 |
|
snipe
|
2189a74d6a
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2023-02-28 20:32:00 -08:00 |
|
snipe
|
8caf29975f
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2023-02-24 09:58:19 -08:00 |
|
snipe
|
95501bf57c
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2023-02-24 09:57:25 -08:00 |
|
snipe
|
d020ab455d
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-19 15:56:53 -08:00 |
|
snipe
|
60dcaa9e94
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2023-01-09 21:11:29 -08:00 |
|
snipe
|
2e75bd6960
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-09 21:11:00 -08:00 |
|
snipe
|
687f8971b1
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2022-12-08 14:49:31 -08:00 |
|
snipe
|
bc2a455a89
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-12-08 14:48:55 -08:00 |
|
snipe
|
23cbee9493
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2022-11-03 14:18:55 -07:00 |
|
snipe
|
7c21158680
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-11-03 14:18:13 -07:00 |
|
snipe
|
38678d4646
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2022-10-26 09:50:44 -07:00 |
|
snipe
|
476a5cbc02
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-26 09:49:50 -07:00 |
|
snipe
|
f4a3f896bd
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2022-10-13 13:20:35 -07:00 |
|
snipe
|
0303df4b25
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-13 13:19:51 -07:00 |
|
snipe
|
3c9c89355e
|
Aaaand master again
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-12 16:01:55 -07:00 |
|
snipe
|
5ff72420a6
|
Set branch back to develop
I hads to switch branches because the automated GH action script always targets masterb
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-12 11:00:06 -07:00 |
|
snipe
|
687a764fc1
|
Dev to master in version.php
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-04 17:53:16 -07:00 |
|
snipe
|
81be84568e
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-10-04 17:52:24 -07:00 |
|
snipe
|
421c9baecc
|
# Conflicts:
Signed-off-by: snipe <snipe@snipe.net>
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2022-09-15 20:11:07 -07:00 |
|
snipe
|
5c9e84f663
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2022-09-15 20:09:00 -07:00 |
|
snipe
|
4cc9b5a5a2
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2022-08-25 12:34:38 -07:00 |
|
snipe
|
8720a58b51
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-25 12:34:02 -07:00 |
|
snipe
|
44e598b0dc
|
Updated branch name in version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-24 17:17:38 -07:00 |
|
snipe
|
8a312f69a6
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-24 16:37:22 -07:00 |
|
snipe
|
80d91c0c51
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2022-08-08 15:33:10 -07:00 |
|
snipe
|
4f4c4ed5be
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-08-08 14:35:04 -07:00 |
|
snipe
|
e9121c15d8
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2022-07-18 16:50:53 -07:00 |
|
snipe
|
43bd00da86
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-07-18 16:50:12 -07:00 |
|
snipe
|
f1488767f8
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2022-07-05 16:41:00 -07:00 |
|
snipe
|
2d5755c1dd
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-07-05 16:40:17 -07:00 |
|
snipe
|
7bdbbbee50
|
Branch in config set to master
Signed-off-by: snipe <snipe@snipe.net>
|
2022-07-05 16:20:33 -07:00 |
|
snipe
|
2137c4e897
|
Back to develop
Signed-off-by: snipe <snipe@snipe.net>
|
2022-07-04 10:12:25 -07:00 |
|
snipe
|
f3a3c59b7b
|
Fixed branch name
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-30 18:05:46 -07:00 |
|
snipe
|
aa54c23f98
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-30 18:04:53 -07:00 |
|
Nathan Butler
|
6531657ee0
|
Revert version to dev for pull request
|
2022-06-29 18:00:15 +10:00 |
|
snipe
|
242836719d
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-27 19:32:10 -07:00 |
|
snipe
|
393c32558b
|
Gotta bump that hash up
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-27 19:31:26 -07:00 |
|
snipe
|
f5702532f0
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-22 11:21:51 -07:00 |
|
snipe
|
2f02eee69b
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-22 11:21:04 -07:00 |
|
snipe
|
a758e825ed
|
Dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-15 13:45:33 -07:00 |
|
snipe
|
1806dacb9d
|
Bumped hash on master to 6.0.4
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2022-06-13 23:59:43 -07:00 |
|
snipe
|
abb7f23ca5
|
Bumped version to 6.0.4
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-13 23:58:53 -07:00 |
|
snipe
|
3e8837dd6e
|
Bumped dev branch to 6.0.3
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-13 22:13:18 -07:00 |
|
snipe
|
ea1ff1e8bb
|
Bumped version to 6.0.3
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-13 22:12:40 -07:00 |
|
snipe
|
3dedd51b84
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2022-06-05 17:16:21 -07:00 |
|
snipe
|
711c713ab8
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2022-06-05 17:15:29 -07:00 |
|
snipe
|
2db6cf85a7
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2022-05-24 15:10:46 -07:00 |
|
snipe
|
72799973e7
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-24 14:41:44 -07:00 |
|
snipe
|
b8e6df545a
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-23 18:55:57 -07:00 |
|
snipe
|
b32fba7f8a
|
Switch to master
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-16 15:33:26 -07:00 |
|
snipe
|
7573a03cc5
|
Bumped minor version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-16 15:32:57 -07:00 |
|
snipe
|
64dc6fbd9c
|
Switched branch to master
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 11:52:27 -07:00 |
|
snipe
|
e55aac7fea
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-13 11:51:41 -07:00 |
|
snipe
|
816437b4d8
|
Updated hash
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-10 17:28:11 -07:00 |
|
snipe
|
a43b54cc8d
|
Bumped hash for clarity
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-06 02:13:56 -07:00 |
|
snipe
|
31f2b73e5a
|
Bumped version to GM
Signed-off-by: snipe <snipe@snipe.net>
|
2022-05-05 10:55:29 -07:00 |
|
snipe
|
150724b744
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-04-28 17:51:27 +01:00 |
|
snipe
|
f7cd21a007
|
Sigh.
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-29 22:59:52 +01:00 |
|
snipe
|
a937bd34f6
|
Merge master back down into develop
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-29 16:28:43 +01:00 |
|
snipe
|
c0451fe17a
|
Bumped version to v6.0.0-RC-5
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-16 18:10:17 +00:00 |
|
snipe
|
349715576a
|
Bumped RC version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-03-03 22:23:24 -08:00 |
|
snipe
|
784bf6f223
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-20 13:30:24 -08:00 |
|
snipe
|
d2655c1092
|
Bumped RC version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-02-01 18:54:46 -08:00 |
|
snipe
|
cfb64be9a4
|
More specific RC version number
Signed-off-by: snipe <snipe@snipe.net>
|
2022-01-13 21:41:04 -08:00 |
|
snipe
|
91017aed52
|
Bumped to RC-1
Signed-off-by: snipe <snipe@snipe.net>
|
2022-01-13 21:38:10 -08:00 |
|
snipe
|
ae50f86c39
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2022-01-12 20:52:30 -08:00 |
|
snipe
|
6be98638ed
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2021-12-16 14:29:38 -08:00 |
|
snipe
|
8bf11e9417
|
Bummped hash fpr v6-pre-alpha
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-15 19:31:20 -08:00 |
|
snipe
|
f2f8f96991
|
Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Transformers/AssetsTransformer.php
# app/Importer/ConsumableImporter.php
# app/Models/Consumable.php
# config/version.php
# package-lock.json
# package.json
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/app.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
# resources/views/custom_fields/fieldsets/view.blade.php
# resources/views/layouts/default.blade.php
# routes/web.php
# routes/web/fields.php
|
2021-11-15 19:24:38 -08:00 |
|
snipe
|
960028b376
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2021-11-03 16:04:39 -07:00 |
|
snipe
|
a88f622ec3
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2021-10-18 16:45:51 -07:00 |
|
snipe
|
38a544ea42
|
Updated version branch to master
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-08 13:50:52 -07:00 |
|
snipe
|
116bc4ece4
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-08 13:42:48 -07:00 |
|
snipe
|
5c92ddb2c6
|
Fixed version back to develop from master downmerge
Signed-off-by: snipe <snipe@snipe.net>
|
2021-08-30 12:57:06 -07:00 |
|
snipe
|
f99602c039
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2021-08-18 00:47:33 -07:00 |
|
snipe
|
0aa328f908
|
Updated hash
Signed-off-by: snipe <snipe@snipe.net>
|
2021-08-18 00:45:35 -07:00 |
|
snipe
|
615bdd0499
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2021-07-15 13:29:07 -07:00 |
|
snipe
|
5b5b70e639
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# public/js/build/app.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2021-06-28 11:01:45 -07:00 |
|
snipe
|
6521f16b80
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2021-06-28 11:00:34 -07:00 |
|
snipe
|
2e6bac7db5
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2021-06-23 18:36:43 -07:00 |
|
snipe
|
335f4e50a5
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2021-06-23 16:07:01 -07:00 |
|
snipe
|
1808986bf5
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2021-06-23 16:06:30 -07:00 |
|
snipe
|
a67ce965ec
|
Update version.php
|
2021-06-22 20:13:03 -07:00 |
|
snipe
|
aae6a8fc6c
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2021-06-10 17:42:29 -07:00 |
|
snipe
|
7d5a9180e6
|
Updated hash
Signed-off-by: snipe <snipe@snipe.net>
|
2021-05-26 15:57:56 -07:00 |
|
snipe
|
aa98e4ea7a
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2021-05-05 00:04:17 -07:00 |
|
snipe
|
6935d94184
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2021-05-05 00:03:33 -07:00 |
|
snipe
|
a1bc984d17
|
Generate production assets, bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2021-04-26 17:34:02 -07:00 |
|
snipe
|
31944cd4d4
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2021-04-26 17:28:38 -07:00 |
|
snipe
|
b2a3a80f96
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# composer.lock
# config/version.php
|
2021-03-17 20:04:43 -07:00 |
|
snipe
|
afb7fcfa3e
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2021-03-17 20:02:54 -07:00 |
|
snipe
|
0fa07a4bca
|
Bumped point version
|
2021-03-09 16:19:21 -08:00 |
|
snipe
|
fcd805638e
|
Changed branch from develop to master
|
2021-02-25 16:54:23 -08:00 |
|
snipe
|
6373ef3283
|
Bumped version
|
2021-02-25 16:53:37 -08:00 |
|
snipe
|
a5731a3088
|
Updated hash
|
2021-02-19 10:09:22 -08:00 |
|
snipe
|
681c41bd18
|
Bumped version
|
2021-02-05 14:28:31 -08:00 |
|
snipe
|
fdde844ce5
|
Bumped version to 5.1.0
|
2021-02-02 21:48:42 -08:00 |
|
snipe
|
f871759753
|
Bumped version to 5.0.13-pre
|
2021-01-26 20:08:44 -08:00 |
|
snipe
|
8e17818f1e
|
Bumped version to 5.0.13-pre
|
2021-01-26 20:08:08 -08:00 |
|
snipe
|
eb423c252a
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# config/version.php
|
2021-01-04 09:09:39 -08:00 |
|
snipe
|
4a5cb94d94
|
Switch version file back to develop
|
2020-12-14 17:47:02 -08:00 |
|
Alexander Chibrikin
|
fb37dbed92
|
use supported package for slack (#8867)
* Updated version.php to master
* use supported package for slack
Co-authored-by: snipe <snipe@snipe.net>
|
2020-12-14 17:45:00 -08:00 |
|
snipe
|
adc0d3a6ac
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# config/version.php
|
2020-12-08 16:53:43 -08:00 |
|
snipe
|
8b15841c4b
|
Bumped version
|
2020-12-07 19:16:42 -08:00 |
|
snipe
|
60d269afb5
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# config/version.php
|
2020-11-30 17:28:46 -08:00 |
|
snipe
|
e2cb7a0242
|
Bumped version
|
2020-11-30 17:28:03 -08:00 |
|
snipe
|
74b26a349c
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# config/version.php
|
2020-11-24 13:54:02 -08:00 |
|
snipe
|
e9bfb157bb
|
Bumped version. Again.
|
2020-11-24 13:53:28 -08:00 |
|
snipe
|
02fef7049f
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# config/version.php
|
2020-11-24 12:17:38 -08:00 |
|
snipe
|
712363f861
|
Bumped version
|
2020-11-23 12:33:07 -08:00 |
|
snipe
|
e5f0a12c25
|
Updated version.php to master
|
2020-11-17 00:14:28 -08:00 |
|
snipe
|
3237411b5d
|
Bumped version
|
2020-11-16 23:57:17 -08:00 |
|
snipe
|
58c476195b
|
Bumped hash
|
2020-11-13 14:14:27 -08:00 |
|
snipe
|
dcd98a7bf1
|
Bumped hash
|
2020-11-13 14:13:44 -08:00 |
|
snipe
|
2aa9412565
|
Bumped version
# Conflicts:
# config/version.php
|
2020-11-09 23:09:46 -08:00 |
|
snipe
|
35ab5c7df0
|
Bumped version
|
2020-11-09 23:09:10 -08:00 |
|
snipe
|
b59269d5e2
|
Bumped version
|
2020-11-09 21:46:42 -08:00 |
|
snipe
|
8bbf8409b1
|
Bumped hash
|
2020-11-09 21:46:08 -08:00 |
|
snipe
|
d76eea53c4
|
Bumped hash
|
2020-11-09 19:45:27 -08:00 |
|
snipe
|
9f4a212b44
|
Bumped hash
|
2020-11-03 11:47:58 -08:00 |
|
snipe
|
2844800caf
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# config/version.php
|
2020-10-26 14:26:05 -07:00 |
|
snipe
|
7937258f6e
|
Bumped version
|
2020-10-26 14:24:19 -07:00 |
|
snipe
|
79a4acae1a
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# config/version.php
|
2020-10-23 14:29:40 -07:00 |
|
snipe
|
91e0b26bbb
|
Bumped version
|
2020-10-23 14:28:55 -07:00 |
|
snipe
|
f182ce1c89
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# config/version.php
|
2020-10-23 01:12:54 -07:00 |
|
snipe
|
c6dde67e86
|
Bumped version
|
2020-10-23 01:12:19 -07:00 |
|
snipe
|
810f6a3970
|
Merge remote-tracking branch 'origin/develop'
# Conflicts:
# config/version.php
|
2020-10-21 12:03:23 -07:00 |
|
snipe
|
33236f16ac
|
Bumped minor version
|
2020-10-21 12:01:36 -07:00 |
|
snipe
|
870b097f03
|
Derp. Should be master
|
2020-10-19 17:49:56 -07:00 |
|
snipe
|
a62e8413ba
|
Updated version
|
2020-10-19 16:36:25 -07:00 |
|
snipe
|
2dc027e479
|
Bumped GM version
|
2020-10-09 17:29:31 -07:00 |
|
snipe
|
4dbf1f58e3
|
Bumped RC to GM
|
2020-10-06 19:11:34 -07:00 |
|
snipe
|
b0e9875a50
|
Counting is hard. :(
|
2020-09-24 14:20:29 -07:00 |
|
snipe
|
7314bc4c4e
|
Bumped hash for newest RC
|
2020-09-24 14:19:34 -07:00 |
|
Bennett Blodinger
|
83dfa2a28c
|
Merge branch 'develop' into gmaps-8465
|
2020-09-22 17:41:38 -05:00 |
|
snipe
|
b9e19468e5
|
Bumped version for v4.9.5
|
2020-09-15 18:43:19 -07:00 |
|
snipe
|
426897c902
|
Bumped hash
|
2020-09-15 10:13:55 -07:00 |
|
snipe
|
24a52eaeae
|
Bumped hash
|
2020-09-12 10:04:36 -07:00 |
|
snipe
|
daf748e531
|
Bumped hash
|
2020-07-17 12:32:01 -07:00 |
|
snipe
|
ec6ed256fb
|
Bumped minor version
|
2020-07-06 18:45:43 -07:00 |
|
snipe
|
af06e42056
|
Bumped version
|
2020-06-17 11:17:25 -07:00 |
|
snipe
|
87464e6ec0
|
Merge branch 'develop' into integrations/2020-04-15-v5-merge
# Conflicts:
# README.md
# app/Http/Controllers/AccessoriesController.php
# app/Http/Controllers/Api/AssetsController.php
# app/Http/Controllers/Api/LicensesController.php
# app/Http/Controllers/Api/LocationsController.php
# app/Http/Controllers/Api/SettingsController.php
# app/Http/Controllers/Api/UsersController.php
# app/Http/Controllers/AssetModelsController.php
# app/Http/Controllers/Assets/AssetsController.php
# app/Http/Controllers/Auth/ForgotPasswordController.php
# app/Http/Controllers/CategoriesController.php
# app/Http/Controllers/CompaniesController.php
# app/Http/Controllers/ComponentsController.php
# app/Http/Controllers/ConsumablesController.php
# app/Http/Controllers/CustomFieldsetsController.php
# app/Http/Controllers/DepartmentsController.php
# app/Http/Controllers/LicensesController.php
# app/Http/Controllers/LocationsController.php
# app/Http/Controllers/ManufacturersController.php
# app/Http/Controllers/SettingsController.php
# app/Http/Controllers/SuppliersController.php
# app/Http/Controllers/UsersController.php
# app/Http/Requests/AssetRequest.php
# app/Http/Requests/ImageUploadRequest.php
# app/Models/LicenseSeat.php
# app/Models/Location.php
# app/Models/Setting.php
# composer.json
# composer.lock
# config/database.php
# config/version.php
# npm-shrinkwrap.json
# package.json
# public/css/AdminLTE.css
# public/css/AdminLTE.css.map
# public/css/overrides.css
# public/css/overrides.css.map
# public/css/skins/skin-blue-light.css
# public/css/skins/skin-blue.css
# public/css/skins/skin-green-dark.min.css
# public/js/app.js
# public/js/bootstrap-table.js
# public/js/bootstrap/js/bootstrap.js
# public/js/bootstrap/js/bootstrap.min.js
# public/js/build/all.js
# public/js/build/vue.js
# public/js/build/vue.js.map
# public/js/demo.js
# public/js/ekko-lightbox.js
# public/js/ekko-lightbox.min.js
# public/js/extensions/export/bootstrap-table-export.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js
# public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js
# public/js/extensions/toolbar/bootstrap-table-toolbar.min.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# public/js/plugins/timepicker/bootstrap-timepicker.js
# public/js/plugins/timepicker/bootstrap-timepicker.min.js
# public/js/vue.js
# public/mix-manifest.json
# resources/assets/js/bootstrap-js.js
# resources/assets/js/bootstrap.min.js
# resources/assets/js/ekko-lightbox.js
# resources/assets/js/ekko-lightbox.min.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js
# resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js
# resources/assets/js/plugins/chartjs/Chart.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.js
# resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js
# resources/assets/less/AdminLTE.less
# resources/assets/less/overrides.less
# resources/assets/less/skins/_all-skins.less
# resources/assets/less/skins/skin-black.less
# resources/assets/less/skins/skin-blue.less
# resources/assets/less/skins/skin-green.less
# resources/assets/less/skins/skin-purple.less
# resources/assets/less/skins/skin-red.less
# resources/assets/less/skins/skin-yellow.less
# resources/assets/less/variables.less
# resources/js/components/importer/importer-file.vue
# resources/lang/en/auth/message.php
# resources/lang/en/passwords.php
# resources/lang/es-CO/general.php
# resources/lang/es-ES/general.php
# resources/lang/es-VE/general.php
# resources/less/skins/skin-black-dark.less
# resources/less/skins/skin-blue-dark.less
# resources/less/skins/skin-contrast.less
# resources/less/skins/skin-green-dark.less
# resources/less/skins/skin-orange-dark.less
# resources/less/skins/skin-orange.less
# resources/less/skins/skin-purple-dark.less
# resources/less/skins/skin-red-dark.less
# resources/less/skins/skin-yellow-dark.less
# resources/views/accessories/checkin.blade.php
# resources/views/accessories/checkout.blade.php
# resources/views/accessories/edit.blade.php
# resources/views/account/profile.blade.php
# resources/views/account/view-assets.blade.php
# resources/views/asset_maintenances/edit.blade.php
# resources/views/auth/passwords/email.blade.php
# resources/views/auth/passwords/reset.blade.php
# resources/views/categories/edit.blade.php
# resources/views/companies/edit.blade.php
# resources/views/components/checkin.blade.php
# resources/views/components/checkout.blade.php
# resources/views/components/edit.blade.php
# resources/views/consumables/checkout.blade.php
# resources/views/consumables/edit.blade.php
# resources/views/custom_fields/fields/edit.blade.php
# resources/views/custom_fields/fieldsets/edit.blade.php
# resources/views/dashboard.blade.php
# resources/views/departments/edit.blade.php
# resources/views/groups/edit.blade.php
# resources/views/hardware/audit.blade.php
# resources/views/hardware/bulk-checkout.blade.php
# resources/views/hardware/bulk.blade.php
# resources/views/hardware/checkin.blade.php
# resources/views/hardware/checkout.blade.php
# resources/views/hardware/edit.blade.php
# resources/views/hardware/index.blade.php
# resources/views/hardware/quickscan.blade.php
# resources/views/hardware/view.blade.php
# resources/views/importer/import.blade.php
# resources/views/layouts/basic.blade.php
# resources/views/layouts/default.blade.php
# resources/views/layouts/edit-form.blade.php
# resources/views/licenses/checkin.blade.php
# resources/views/licenses/checkout.blade.php
# resources/views/licenses/edit.blade.php
# resources/views/locations/edit.blade.php
# resources/views/manufacturers/edit.blade.php
# resources/views/modals/upload-file.blade.php
# resources/views/models/bulk-edit.blade.php
# resources/views/models/custom_fields_form.blade.php
# resources/views/models/edit.blade.php
# resources/views/partials/bootstrap-table.blade.php
# resources/views/partials/forms/edit/address.blade.php
# resources/views/partials/forms/edit/asset-select.blade.php
# resources/views/partials/forms/edit/category-select.blade.php
# resources/views/partials/forms/edit/category.blade.php
# resources/views/partials/forms/edit/company-select.blade.php
# resources/views/partials/forms/edit/company.blade.php
# resources/views/partials/forms/edit/department-select.blade.php
# resources/views/partials/forms/edit/depreciation.blade.php
# resources/views/partials/forms/edit/email.blade.php
# resources/views/partials/forms/edit/image-upload.blade.php
# resources/views/partials/forms/edit/item_number.blade.php
# resources/views/partials/forms/edit/location-profile-select.blade.php
# resources/views/partials/forms/edit/location-select.blade.php
# resources/views/partials/forms/edit/location.blade.php
# resources/views/partials/forms/edit/maintenance_type.blade.php
# resources/views/partials/forms/edit/manufacturer-select.blade.php
# resources/views/partials/forms/edit/manufacturer.blade.php
# resources/views/partials/forms/edit/minimum_quantity.blade.php
# resources/views/partials/forms/edit/model-select.blade.php
# resources/views/partials/forms/edit/model_number.blade.php
# resources/views/partials/forms/edit/name.blade.php
# resources/views/partials/forms/edit/notes.blade.php
# resources/views/partials/forms/edit/order_number.blade.php
# resources/views/partials/forms/edit/phone.blade.php
# resources/views/partials/forms/edit/purchase_cost.blade.php
# resources/views/partials/forms/edit/purchase_date.blade.php
# resources/views/partials/forms/edit/quantity.blade.php
# resources/views/partials/forms/edit/serial.blade.php
# resources/views/partials/forms/edit/status.blade.php
# resources/views/partials/forms/edit/submit.blade.php
# resources/views/partials/forms/edit/supplier-select.blade.php
# resources/views/partials/forms/edit/supplier.blade.php
# resources/views/partials/forms/edit/user-select.blade.php
# resources/views/reports/custom.blade.php
# resources/views/settings/alerts.blade.php
# resources/views/settings/asset_tags.blade.php
# resources/views/settings/barcodes.blade.php
# resources/views/settings/branding.blade.php
# resources/views/settings/general.blade.php
# resources/views/settings/labels.blade.php
# resources/views/settings/ldap.blade.php
# resources/views/settings/localization.blade.php
# resources/views/settings/security.blade.php
# resources/views/setup/user.blade.php
# resources/views/suppliers/edit.blade.php
# resources/views/users/bulk-edit.blade.php
# resources/views/users/edit.blade.php
# resources/views/users/ldap.blade.php
# resources/views/users/print.blade.php
# resources/views/users/view.blade.php
# routes/api.php
# routes/web/hardware.php
# webpack.mix.js
|
2020-04-20 23:20:34 -07:00 |
|
snipe
|
48dfc699d7
|
Bumped version
|
2020-04-09 10:49:50 -07:00 |
|
snipe
|
be3e572440
|
Bumped version
|
2020-04-08 11:24:30 -07:00 |
|
snipe
|
be79a1f3d6
|
Bumped hash
|
2020-04-02 19:27:41 -07:00 |
|
snipe
|
a2fae76eaf
|
Bumped version
|
2020-03-04 22:37:17 -08:00 |
|
snipe
|
5ef40340fb
|
Bumped version
|
2019-12-11 19:38:04 -08:00 |
|