DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-13 17:14:10 -08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity
8290 commits 95 branches 267 tags 294 MiB
Commit graph

376 commits

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