snipe
|
d87da78eb5
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# app/Http/Controllers/Users/UsersController.php
# config/version.php
# public/css/build/AdminLTE.css
# public/css/build/app.css
# public/css/build/overrides.css
# public/css/dist/all.css
# public/css/dist/bootstrap-table.css
# public/js/build/app.js
# public/js/build/vendor.js
# public/js/dist/all-defer.js
# public/js/dist/all.js
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2024-06-17 11:18:33 +01:00 |
|
|
snipe
|
ece7c22df9
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-17 10:44:20 +01:00 |
|
|
snipe
|
54067ec449
|
Fixed pre-version in version.php
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-27 18:21:46 +01:00 |
|
|
snipe
|
4c11e97922
|
Bumped version to dev, bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-27 18:20:32 +01:00 |
|
|
snipe
|
c20d10d4f2
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2024-05-22 17:50:14 +01:00 |
|
|
snipe
|
81704c1d40
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-22 17:49:29 +01:00 |
|
|
snipe
|
0d4f13219b
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2024-05-16 22:00:07 +01:00 |
|
|
snipe
|
7fdbbc846e
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-16 21:59:38 +01:00 |
|
|
snipe
|
6823aabf92
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2024-05-13 10:53:07 +01:00 |
|
|
snipe
|
f2dddc1226
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-13 10:51:44 +01:00 |
|
|
snipe
|
4913e56086
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2024-05-06 18:43:48 +01:00 |
|
|
snipe
|
4d00bb98d1
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2024-05-06 18:39:55 +01:00 |
|
|
snipe
|
56cb9a0f4e
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# 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-purple-dark.css
# public/css/dist/skins/skin-purple-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
|
2024-04-23 10:28:50 +01:00 |
|
|
snipe
|
c8c81a360c
|
Dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-23 10:26:43 +01:00 |
|
|
snipe
|
b7af049589
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2024-03-29 13:20:22 +00:00 |
|
|
snipe
|
c2d863da99
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-29 13:19:22 +00:00 |
|
|
snipe
|
7060ffaf34
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# public/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2024-03-26 11:17:07 +00:00 |
|
|
snipe
|
02a37e2f89
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-26 10:16:46 +00:00 |
|
|
snipe
|
027361f079
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2024-03-08 10:01:21 +00:00 |
|
|
snipe
|
ff10d1540f
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-08 10:00:00 +00:00 |
|
|
snipe
|
313b327cd7
|
Bumped hash for master
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-07 11:34:38 +00:00 |
|
|
snipe
|
cbe07ad23b
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-07 11:30:54 +00:00 |
|
|
snipe
|
7769a93a10
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-05 19:07:40 +00:00 |
|
|
snipe
|
95a6c7058f
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-05 19:06:55 +00:00 |
|
|
snipe
|
9221641bba
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2024-02-15 14:50:37 +00:00 |
|
|
snipe
|
6bca1e3b22
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2024-02-15 14:48:07 +00:00 |
|
|
snipe
|
86c625ed8f
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2024-01-27 15:12:03 +00:00 |
|
|
snipe
|
3da7876631
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2024-01-27 15:08:52 +00:00 |
|
|
snipe
|
c8816354ae
|
Updated assets for master
Signed-off-by: snipe <snipe@snipe.net>
|
2024-01-03 23:28:54 +00:00 |
|
|
snipe
|
42d35174b2
|
Updated hash
Signed-off-by: snipe <snipe@snipe.net>
|
2024-01-03 23:25:56 +00:00 |
|
|
snipe
|
84d26fe7fa
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# package-lock.json
# public/css/dist/skins/skin-green-dark.css
# public/css/dist/skins/skin-green-dark.min.css
# public/js/dist/all-defer.js
# public/mix-manifest.json
|
2023-11-23 16:53:13 +00:00 |
|
|
snipe
|
ea55daf913
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2023-11-23 16:51:39 +00:00 |
|
|
snipe
|
776b16d379
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2023-11-22 23:41:31 +00:00 |
|
|
snipe
|
6409018b08
|
Bumped hash and moved to pre version
Signed-off-by: snipe <snipe@snipe.net>
|
2023-11-22 23:41:03 +00:00 |
|
|
snipe
|
39c06802aa
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2023-11-03 14:07:46 +00:00 |
|
|
snipe
|
8c316e0bd3
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2023-11-03 14:07:15 +00:00 |
|
|
snipe
|
55d0c4021d
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2023-10-16 20:19:03 +01:00 |
|
|
snipe
|
2218cff7bc
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-16 20:18:33 +01:00 |
|
|
snipe
|
d9a1dab827
|
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/mix-manifest.json
|
2023-10-06 20:17:59 +01:00 |
|
|
snipe
|
25a5507d9d
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-06 20:07:35 +01:00 |
|
|
snipe
|
4e6764428e
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2023-10-02 14:29:59 +01:00 |
|
|
snipe
|
c7b8880d69
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2023-10-02 14:28:59 +01:00 |
|
|
snipe
|
13bee63fe9
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2023-09-25 10:59:09 +01:00 |
|
|
snipe
|
f6317695f9
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-25 10:58:14 +01:00 |
|
|
snipe
|
cce90c6ce0
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2023-09-15 09:43:25 +01:00 |
|
|
snipe
|
4e0e1a2c85
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2023-09-15 09:42:27 +01:00 |
|
|
snipe
|
305804f260
|
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# package-lock.json
# public/css/dist/all.css
# public/js/dist/all-defer.js
# public/mix-manifest.json
|
2023-08-30 15:50:09 +01:00 |
|
|
snipe
|
fbc04cfd47
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2023-08-30 15:07:38 +01:00 |
|
|
snipe
|
61fd427678
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2023-07-05 14:41:34 +01:00 |
|
|
snipe
|
d890d923ff
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2023-07-05 14:40:54 +01:00 |
|