snipe
|
924d0b25e8
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# public/css/dist/all.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all.js
# public/mix-manifest.json
|
2023-06-08 08:53:22 +01:00 |
|
|
snipe
|
c78c69700f
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-08 08:49:55 +01:00 |
|
|
snipe
|
a3a64be19b
|
Merge remote-tracking branch 'origin/develop'
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-05-24 16:06:26 -07:00 |
|
|
snipe
|
fb5e33c50f
|
Updated hash
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-24 16:03:15 -07:00 |
|
|
snipe
|
b8a59cc2d8
|
Merge branch 'master' into develop
|
2023-05-10 09:32:26 -07:00 |
|
|
snipe
|
04aedce47e
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-10 09:29:42 -07:00 |
|
|
snipe
|
5950ec27ab
|
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/css/dist/skins/skin-black-dark.css
# public/css/dist/skins/skin-black-dark.min.css
# public/css/dist/skins/skin-blue-dark.css
# public/css/dist/skins/skin-blue-dark.min.css
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/css/dist/skins/skin-orange-dark.css
# public/css/dist/skins/skin-orange-dark.min.css
# public/css/dist/skins/skin-red-dark.css
# public/css/dist/skins/skin-red-dark.min.css
# public/css/dist/skins/skin-yellow-dark.css
# public/css/dist/skins/skin-yellow-dark.min.css
# public/mix-manifest.json
|
2023-05-03 13:49:36 -07:00 |
|
|
snipe
|
cd6f6ee8ff
|
Bumped version to 6.1.1-pre
Signed-off-by: snipe <snipe@snipe.net>
|
2023-05-03 13:47:46 -07:00 |
|
|
snipe
|
42a60a9ccb
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2023-04-07 08:22:24 -07:00 |
|
|
snipe
|
87c7d1aaca
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-06 20:43:42 -07:00 |
|
|
snipe
|
d2daaf30eb
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2023-03-28 03:32:04 -07:00 |
|
|
snipe
|
6800098469
|
Bumped version for 6.1.0-pre
Signed-off-by: snipe <snipe@snipe.net>
|
2023-03-28 03:31:02 -07:00 |
|
|
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 |
|