mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-11 03:25:50 +00:00
Code Issues Projects Releases Wiki Activity
9,246 Commits 87 Branches 232 Tags
3702dd87ce25a202be53ba090500a0dc0c8d4e0e
Commit Graph

406 Commits

Author SHA1 Message Date
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