DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-19 23:37:38 -07:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
8760 commits 90 branches 265 tags 290 MiB
Commit graph

620 commits

Author SHA1 Message Date
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 5a7e35c0e8 Made a conditional escape according to .env 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-30 09:48:43 -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 d7d0056b73 Merge remote-tracking branch 'origin/develop' 2022-07-27 15:10:38 -07:00
snipe 7d2fcef807
Merge pull request #11562 from uberbrady/clarify_logging 
Fixed inconsistent `*_LOG_LEVEL` variables; set reasonable defaults
 2022-07-25 20:02:37 -07:00
Brady Wetherington 0c7d4a709a Cleaned up more logging options 2022-07-25 19:25:06 -07:00
Brady Wetherington 7057cb0104 Make all *_LOG_LEVEL vars consistent; set default to 'warning' 2022-07-25 18:44:37 -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 e2c227f02b Merge remote-tracking branch 'origin/develop' 2022-06-24 16:21:10 -07:00
snipe cf99d42413 Added backup delete to app config 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-24 15:48:37 -07:00
snipe 77bf28bcb6 Disallow purge 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 20:11:43 -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 a7dc6162fa Simplify password attempts rate limiting 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-22 09:11:24 -07:00
snipe 5ff1b5fd50 Increased throttle 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-21 19:39:50 -07:00
snipe 57720cb978 Added comment block 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-21 19:12:57 -07:00
snipe 284dbb7553 Set higher threshhold, moved throttle settings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-21 19:11:39 -07:00
snipe 791f77f641 Fixed throttle variables 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-21 18:41:12 -07:00
snipe a758e825ed Dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-15 13:45:33 -07:00
snipe e935a34946 Merge remote-tracking branch 'origin/develop' 2022-06-14 16:25:50 -07:00
snipe cc6a2f2d49 Use the Deja Vu font to be able to support cyrllic, etc 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 16:23:30 -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 089704c4f9 Merge remote-tracking branch 'origin/develop' 2022-05-31 14:17:23 -07:00
snipe c031686825 Fixed path 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-25 15:12:38 -07:00
snipe 791c39d977 Starter Livewire config (for subdirectories) 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-25 15:10:20 -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