diff
stringlengths 65
26.7k
| message
stringlengths 7
9.92k
|
|---|---|
diff --git a/src/GeneaLabs/Bones/Macros/BonesMacrosFormBuilder.php b/src/GeneaLabs/Bones/Macros/BonesMacrosFormBuilder.php
index <HASH>..<HASH> 100644
--- a/src/GeneaLabs/Bones/Macros/BonesMacrosFormBuilder.php
+++ b/src/GeneaLabs/Bones/Macros/BonesMacrosFormBuilder.php
@@ -206,7 +206,13 @@ class BonesMacrosFormBuilder extends \Illuminate\Html\FormBuilder
public function bs_switch($label, $name, $value = 1, $checked = null, array $options = [], $extraElement = null, $extraWidth = 0)
{
- $options['class'] .= [' switch'];
+ if ((array_key_exists('class', $options))
+ && (strpos($options['class'], 'switch') >= 0)) {
+ $options['class'] .= [' switch'];
+ } else {
+ $options[] = ['class' => 'switch'];
+ }
+
return $this->wrapOutput(
$this->checkbox($name, $value, ($checked ? 'checked' : ''), $options),
$label,
|
fixing some bs_switch bugs
|
diff --git a/rewind/logbook.py b/rewind/logbook.py
index <HASH>..<HASH> 100644
--- a/rewind/logbook.py
+++ b/rewind/logbook.py
@@ -774,7 +774,9 @@ class LogBookRunner(object):
assert not newid.startswith("ERROR"), \
"Generated ID must not be part of req/rep vocabulary."
+ # Important this is done before forwarding to the streaming socket
self.eventstore.add_event(newid, eventstr)
+
self.streaming_socket.send(newid, zmq.SNDMORE)
self.streaming_socket.send(eventstr)
|
Minor edit
Commenting the importance of call order when putting something an event
in event store and then proxying the event further to listeners.
|
diff --git a/openquake/commands/plot_memory.py b/openquake/commands/plot_memory.py
index <HASH>..<HASH> 100644
--- a/openquake/commands/plot_memory.py
+++ b/openquake/commands/plot_memory.py
@@ -25,14 +25,14 @@ def make_figure(plots):
# NB: matplotlib is imported inside since it is a costly import
import matplotlib.pyplot as plt
- fig = plt.figure()
- nplots = len(plots)
- for i, (task_name, mem) in enumerate(plots):
- ax = fig.add_subplot(nplots, 1, i + 1)
- ax.grid(True)
- ax.set_title(task_name)
- ax.set_ylabel('GB')
- ax.plot(range(len(mem)), mem)
+ fig, ax = plt.subplots()
+ ax.grid(True)
+ ax.set_ylabel('GB')
+ start = 0
+ for task_name, mem in plots:
+ ax.plot(range(start, start + len(mem)), mem, label=task_name)
+ start += len(mem)
+ ax.legend()
return plt
|
Plotting a single graph [skip CI]
Former-commit-id: 7d<I>d6c<I>e9db9f6b<I>b4b8c<I>b
|
diff --git a/fost_authn/middleware.py b/fost_authn/middleware.py
index <HASH>..<HASH> 100644
--- a/fost_authn/middleware.py
+++ b/fost_authn/middleware.py
@@ -18,12 +18,18 @@ class Middleware:
return credentials
return [None, None]
- def process_request(self, request):
+ def key_hmac(self, request):
[mechanism, authorization] = self.get_mechanism(request)
if mechanism == "FOST":
[key, hmac] = self.get_userpass(authorization)
if key and hmac:
- user = django.contrib.auth.authenticate(
- request = request, key = key, hmac = hmac)
- if user:
- request.user = user
+ return key, hmac
+ return None, None
+
+ def process_request(self, request):
+ key, hmac = self.key_hmac(request)
+ if key and hmac:
+ user = django.contrib.auth.authenticate(
+ request = request, key = key, hmac = hmac)
+ if user:
+ request.user = user
|
Split apart the parsing step from the processing so that we can make use of
the functionality in other tests etc.
|
diff --git a/www/src/python_tokenizer.js b/www/src/python_tokenizer.js
index <HASH>..<HASH> 100644
--- a/www/src/python_tokenizer.js
+++ b/www/src/python_tokenizer.js
@@ -71,8 +71,9 @@ function TokenError(message, position){
function get_line_at(src, pos){
// Get the line in source code src starting at position pos
- var end = src.substr(pos).search(/[\r\n]/)
- return end == -1 ? src.substr(pos) : src.substr(pos, end + 1)
+ var end = src.substr(pos).search(/[\r\n]/),
+ line = end == -1 ? src.substr(pos) : src.substr(pos, end + 1)
+ return line + '\n'
}
function get_comment(src, pos, line_num, line_start, token_name, line){
|
Attribute .line of tokens generated by python_tokenizer.js ends with "\n"
|
diff --git a/tests/test.py b/tests/test.py
index <HASH>..<HASH> 100644
--- a/tests/test.py
+++ b/tests/test.py
@@ -740,6 +740,27 @@ class DockerClientTest(unittest.TestCase):
buf.close()
os.remove(buf.name)
+ def test_import_image_from_image(self):
+ try:
+ self.client.import_image(
+ image=fake_api.FAKE_IMAGE_NAME,
+ repository=fake_api.FAKE_REPO_NAME,
+ tag=fake_api.FAKE_TAG_NAME
+ )
+ except Exception as e:
+ self.fail('Command should not raise exception: {0}'.format(e))
+
+ fake_request.assert_called_with(
+ 'unix://var/run/docker.sock/v1.6/images/create',
+ params={
+ 'repo': fake_api.FAKE_REPO_NAME,
+ 'tag': fake_api.FAKE_TAG_NAME,
+ 'fromImage': fake_api.FAKE_IMAGE_NAME
+ },
+ data=None,
+ timeout=docker.client.DEFAULT_TIMEOUT_SECONDS
+ )
+
def test_inspect_image(self):
try:
self.client.inspect_image(fake_api.FAKE_IMAGE_NAME)
|
Added failing test for importing an image via name instead of src
|
diff --git a/code/administrator/components/com_files/views/files/tmpl/default.php b/code/administrator/components/com_files/views/files/tmpl/default.php
index <HASH>..<HASH> 100644
--- a/code/administrator/components/com_files/views/files/tmpl/default.php
+++ b/code/administrator/components/com_files/views/files/tmpl/default.php
@@ -87,8 +87,8 @@ window.addEvent('domready', function() {
Files.createModal = function(container, button){
var modal = $(container);
- document.body.grab(modal);
modal.setStyle('display', 'none');
+ document.body.grab(modal);
$(button).addEvent('click', function(e) {
e.stop();
|
New file and folder boxes are visible before the modals open
|
diff --git a/src/graph.js b/src/graph.js
index <HASH>..<HASH> 100644
--- a/src/graph.js
+++ b/src/graph.js
@@ -245,15 +245,24 @@ Graph.__prototype__ = function() {
op.apply(this.objectAdapter);
this.updated_at = new Date();
+ this._internalUpdates(op);
+
Operator.Helpers.each(op, function(_op) {
_.each(this.indexes, function(index) {
-
// Treating indexes as first class listeners for graph changes
index.onGraphChange(_op);
+ }, this);
- // And all regular listeners in second line
- this.trigger('operation:applied', _op, this);
+ // And all regular listeners in second line
+ this.trigger('operation:applied', _op, this);
+ }, this);
+ };
+ this._internalUpdates = function(op) {
+ // Treating indexes as first class listeners for graph changes
+ Operator.Helpers.each(op, function(_op) {
+ _.each(this.indexes, function(index) {
+ index.onGraphChange(_op);
}, this);
}, this);
};
|
Pack all internal co-transformations into a dedicated method.
|
diff --git a/src/styles/getPlatformElevation.ios.js b/src/styles/getPlatformElevation.ios.js
index <HASH>..<HASH> 100644
--- a/src/styles/getPlatformElevation.ios.js
+++ b/src/styles/getPlatformElevation.ios.js
@@ -1,23 +1,20 @@
/* eslint-enable import/no-unresolved, import/extensions */
-import { black } from './colors';
+import { black, transparent } from './colors';
import { ELEVATION_ZINDEX } from './constants';
const getPlatformElevation = (elevation) => {
- if (elevation !== 0) {
- return {
- shadowColor: black,
- shadowOpacity: 0.3,
- shadowRadius: elevation,
- shadowOffset: {
- height: 2,
- width: 0,
- },
- // we need to have zIndex on iOS, otherwise the shadow is under components that
- // are rendered later
- zIndex: ELEVATION_ZINDEX,
- };
- }
- return { };
+ return {
+ shadowColor: elevation > 0 ? black : transparent,
+ shadowOpacity: 0.3,
+ shadowRadius: elevation / 2,
+ shadowOffset: {
+ height: 1,
+ width: 0,
+ },
+ // we need to have zIndex on iOS, otherwise the shadow is under components that
+ // are rendered later
+ zIndex: ELEVATION_ZINDEX,
+ };
};
export default getPlatformElevation;
|
Fix shadow props on iOS (#<I>)
|
diff --git a/src/Cursor.js b/src/Cursor.js
index <HASH>..<HASH> 100644
--- a/src/Cursor.js
+++ b/src/Cursor.js
@@ -11,6 +11,8 @@ export * from './eraseRegions';
*
* @see http://www.termsys.demon.co.uk/vtansi.htm
* @see http://misc.flogisoft.com/bash/tip_colors_and_formatting
+ * @see http://man7.org/linux/man-pages/man4/console_codes.4.html
+ * @see http://www.x.org/docs/xterm/ctlseqs.pdf
* @since 1.0.0
*/
export class Cursor {
|
docs(cursor): Add few useful links to comments
|
diff --git a/lib/markety/version.rb b/lib/markety/version.rb
index <HASH>..<HASH> 100644
--- a/lib/markety/version.rb
+++ b/lib/markety/version.rb
@@ -1,5 +1,5 @@
module Markety
- VERSION = "grantfork"
+ VERSION = "1-grantfork"
end
|
bundle does not like strings as version numbers
|
diff --git a/src/nls/no-nb/strings.js b/src/nls/no-nb/strings.js
index <HASH>..<HASH> 100644
--- a/src/nls/no-nb/strings.js
+++ b/src/nls/no-nb/strings.js
@@ -158,7 +158,7 @@ define({
"CMD_DUPLICATE" : "Dupliker",
"CMD_COMMENT" : "Kommenter/utkommenter linjer",
"CMD_LINE_UP" : "Flytt linje(r) opp",
- "CMD_LINE_DOWN" : "Move linje(r) ned",
+ "CMD_LINE_DOWN" : "Flytt linje(r) ned",
// View menu commands
"VIEW_MENU" : "Vis",
|
missing translation in CMD_LINE_DOWN
|
diff --git a/ELiDE/ELiDE/timestream.py b/ELiDE/ELiDE/timestream.py
index <HASH>..<HASH> 100644
--- a/ELiDE/ELiDE/timestream.py
+++ b/ELiDE/ELiDE/timestream.py
@@ -242,7 +242,7 @@ class TimestreamScreen(Screen):
'draw_left': turn > branch_lineage[branch][1],
'draw_up': row > 0,
'draw_down': bool(start_turn_branches[turn]),
- 'draw_right': bool(branch_split_turns_todo[branch])
+ 'draw_right': turn < col2turn[-1]
})
else:
data.append({'widget': 'Widget'})
|
Correct the rightward facing Cross in Timestream
|
diff --git a/index.js b/index.js
index <HASH>..<HASH> 100644
--- a/index.js
+++ b/index.js
@@ -224,6 +224,9 @@ module.exports = {
baseDir() {
return __dirname;
},
+ cacheKey() {
+ return name;
+ },
parallelBabel: {
requireFile: __filename,
buildUsing: '_canvasBuildPlugin',
|
Return a cache key for canvas enforcer
Not really necessary according to the documentation, but let’s set it
just in case.
|
diff --git a/lib/pusher/webhook.rb b/lib/pusher/webhook.rb
index <HASH>..<HASH> 100644
--- a/lib/pusher/webhook.rb
+++ b/lib/pusher/webhook.rb
@@ -30,7 +30,8 @@ module Pusher
#
def initialize(request, client = Pusher)
@client = client
- if request.kind_of?(Rack::Request)
+ # Should work without Rack
+ if defined?(Rack::Request) && request.kind_of?(Rack::Request)
@key = request.env['HTTP_X_PUSHER_KEY']
@signature = request.env["HTTP_X_PUSHER_SIGNATURE"]
@content_type = request.content_type
|
Should work without Rack, closes #<I>
|
diff --git a/lang/it.js b/lang/it.js
index <HASH>..<HASH> 100644
--- a/lang/it.js
+++ b/lang/it.js
@@ -48,6 +48,7 @@ else {
'KickAssets.DONE': 'Fatto',
'KickAssets.TOOMANYSELECTED': 'Hai selezionato troppi elementi. Per piacere selezionane non più di %s.',
'KickAssets.INVALIDTYPESSELECTED': 'Alcuni elementi selezionati non sono validi. Per piacere seleziona solo %s',
- 'KickAssets.INVALIDEXTENSIONSSELECTED': 'Alcuni files selezionati hanno estensioni non valide. Per piacere seleziona solo %s'
+ 'KickAssets.INVALIDEXTENSIONSSELECTED': 'Alcuni files selezionati hanno estensioni non valide. Per piacere seleziona solo %s',
+ 'KickAssets.MOREOPTIONS': 'Altre opzioni'
});
}
|
Add missing row MOREOPTIONS in italian translation
|
diff --git a/fabfile.py b/fabfile.py
index <HASH>..<HASH> 100644
--- a/fabfile.py
+++ b/fabfile.py
@@ -457,6 +457,7 @@ def offline():
@task
def completions(type='fish'):
output.status = False
+ configuration.offline = True
if type == 'fish':
fish_completions()
|
Get shell completions in offline-mode for better performane
|
diff --git a/docs/conf.py b/docs/conf.py
index <HASH>..<HASH> 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -21,8 +21,11 @@ from pathlib import Path
on_rtd = os.environ.get('READTHEDOCS') == 'True'
if on_rtd:
- subprocess.run('pip install -U "pip>=18.0" "setuptools>=40.1"', shell=True)
- subprocess.run('pip install -e "..[docs]"', shell=True)
+ try:
+ from ai.backend.client import request # noqa
+ except ImportError:
+ subprocess.run('pip install -U "pip>=18.0" "setuptools>=40.1"', shell=True)
+ subprocess.run('pip install -e "..[docs]"', shell=True)
# -- Project information -----------------------------------------------------
|
docs: Install dependencies only when not installed
|
diff --git a/web/static/js/controllers/SubServiceControl.js b/web/static/js/controllers/SubServiceControl.js
index <HASH>..<HASH> 100644
--- a/web/static/js/controllers/SubServiceControl.js
+++ b/web/static/js/controllers/SubServiceControl.js
@@ -97,8 +97,14 @@ function SubServiceControl($scope, $q, $routeParams, $location, $interval, resou
}
],
validate: function(){
+ var name = $scope.vhosts.add.name;
+ for (var i in $scope.vhosts.data) {
+ if (name == $scope.vhosts.data[i].Name) {
+ return false;
+ }
+ }
var re = /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$/;
- return re.test($scope.vhosts.add.name);
+ return re.test(name);
}
});
};
|
prevent duplication of vhost names
|
diff --git a/lib/jcr/find_roots.rb b/lib/jcr/find_roots.rb
index <HASH>..<HASH> 100644
--- a/lib/jcr/find_roots.rb
+++ b/lib/jcr/find_roots.rb
@@ -88,6 +88,7 @@ module JCR
def self.get_rule_by_type rule
retval = nil
+ return retval unless rule.is_a? Hash
case
when rule[:array_rule]
retval = rule[:array_rule]
diff --git a/spec/find_roots_spec.rb b/spec/find_roots_spec.rb
index <HASH>..<HASH> 100644
--- a/spec/find_roots_spec.rb
+++ b/spec/find_roots_spec.rb
@@ -37,6 +37,18 @@ describe 'find_roots' do
expect( roots.length ).to eq( 0 )
end
+ it 'should find one root with an empty object rule' do
+ tree = JCR.parse( '{}' )
+ roots = JCR.find_roots( tree )
+ expect( roots.length ).to eq( 1 )
+ end
+
+ it 'should find one root with an empty array rule' do
+ tree = JCR.parse( '[]' )
+ roots = JCR.find_roots( tree )
+ expect( roots.length ).to eq( 1 )
+ end
+
it 'should find an annotated rule' do
tree = JCR.parse( '$vrule=: @{root} [ integer* ]' )
roots = JCR.find_roots( tree )
|
fixed issue with finding roots with empty objects and arrays
|
diff --git a/treeherder/model/error_summary.py b/treeherder/model/error_summary.py
index <HASH>..<HASH> 100644
--- a/treeherder/model/error_summary.py
+++ b/treeherder/model/error_summary.py
@@ -188,18 +188,11 @@ def is_helpful_search_term(search_term):
'Return code: 0',
'Return code: 1',
'Return code: 2',
- 'Return code: 9',
'Return code: 10',
'mozalloc_abort(char const*)',
'mozalloc_abort',
- 'Exiting 1',
- 'Exiting 9',
'CrashingThread(void *)',
- 'libSystem.B.dylib + 0xd7a',
- 'linux-gate.so + 0x424',
- 'TypeError: content is null',
'leakcheck',
- 'ImportError: No module named pygtk',
'# TBPL FAILURE #',
]
|
Bug <I> - drop unused items from list of terms to ignore in searches for bug suggestions (#<I>)
|
diff --git a/test.py b/test.py
index <HASH>..<HASH> 100644
--- a/test.py
+++ b/test.py
@@ -109,7 +109,7 @@ def test_market (market):
for id in ccxt.markets:
market = getattr (ccxt, id)
markets[id] = market ({
- 'verbose': True,
+ 'verbose': False,
# 'proxy': 'https://crossorigin.me/',
'proxy': 'https://cors-anywhere.herokuapp.com/',
# 'proxy': 'http://cors-proxy.htmldriven.com/?url=',
|
switched verbosity off in test.py
|
diff --git a/lib/loghose.js b/lib/loghose.js
index <HASH>..<HASH> 100755
--- a/lib/loghose.js
+++ b/lib/loghose.js
@@ -61,7 +61,7 @@ function loghose (opts) {
return
}
opts.tty = info.Config.Tty
- streams[data.id.substring(0,12)] = stream
+ streams[data.id] = stream
pump(
stream,
parser(data, opts)
|
revert using substring(0,<I>) for streams dictionary
|
diff --git a/site/rollup.config.js b/site/rollup.config.js
index <HASH>..<HASH> 100644
--- a/site/rollup.config.js
+++ b/site/rollup.config.js
@@ -13,6 +13,9 @@ const mode = process.env.NODE_ENV;
const dev = mode === 'development';
const legacy = !!process.env.SAPPER_LEGACY_BUILD;
+const onwarn = (warning, onwarn) => (warning.code === 'CIRCULAR_DEPENDENCY' && /[/\\]@sapper[/\\]/.test(warning.message)) || onwarn(warning);
+const dedupe = importee => importee === 'svelte' || importee.startsWith('svelte/');
+
export default {
client: {
input: config.client.input(),
@@ -28,7 +31,10 @@ export default {
hydratable: true,
emitCss: true
}),
- resolve(),
+ resolve({
+ browser: true,
+ dedupe
+ }),
commonjs(),
json(),
@@ -53,6 +59,7 @@ export default {
module: true
})
],
+ onwarn
},
server: {
@@ -67,7 +74,9 @@ export default {
generate: 'ssr',
dev
}),
- resolve(),
+ resolve({
+ dedupe
+ }),
commonjs(),
json()
],
@@ -78,6 +87,7 @@ export default {
require('module').builtinModules || Object.keys(process.binding('natives'))
)
],
+ onwarn
},
serviceworker: {
|
site: rollup resolve and onwarn improvements from sapper-template
|
diff --git a/src/Interfaces/ParserInterface.php b/src/Interfaces/ParserInterface.php
index <HASH>..<HASH> 100644
--- a/src/Interfaces/ParserInterface.php
+++ b/src/Interfaces/ParserInterface.php
@@ -18,19 +18,19 @@ interface ParserInterface
* Load the deltas string, checks the json is valid and can be decoded
* and then saves the decoded array to the the $quill_json property
*
- * @param string $quill_json Quill json string
+ * @param array|string $quill_json Quill json string
*
* @return Parse
* @throws \InvalidArgumentException Throws an exception if there was an error decoding the json
*/
- public function load(string $quill_json): Parse;
+ public function load($quill_json): Parse;
/**
* Load multiple delta strings, checks the json is valid for each index,
* ensures they can be decoded and the saves each decoded array to the
* $quill_json_stack property indexed by the given key
*
- * @param array An array of $quill json strings, returnable via array index
+ * @param array An array of $quill json array|strings, returnable via array index
*
* @return Parse
* @throws \InvalidArgumentException Throws an exception if there was an error decoding the json
|
fixing the interface which only seems to complain on php<I>?
|
diff --git a/lib/alchemy/upgrader/four_point_one.rb b/lib/alchemy/upgrader/four_point_one.rb
index <HASH>..<HASH> 100644
--- a/lib/alchemy/upgrader/four_point_one.rb
+++ b/lib/alchemy/upgrader/four_point_one.rb
@@ -21,6 +21,19 @@ module Alchemy
All your existing tags have been migrated to `Gutentag::Tag`s.
+ Removed Rails and non-English translations
+ ------------------------------------------
+
+ Removed the Rails translations from our translation files and moved all non-english translation
+ files into the newly introduced `alchemy_i18n` gem.
+
+ If you need more translations than the default English one you can either put `alchemy_i18n`
+ in to your apps `Gemfile` or - recommended - copy only the translation files you need into your
+ apps `config/locales` folder.
+
+ For the Rails translations either put the rails-i18n gem into your apps Gemfile or - recommended -
+ copy only the translation files you need into your apps config/locales folder.
+
NOTE
todo notice, 'Alchemy v4.1 changes'
end
|
Add note about translation removals to upgrader
|
diff --git a/Classes/TYPO3/Surf/Task/FLOW3/SymlinkConfigurationTask.php b/Classes/TYPO3/Surf/Task/FLOW3/SymlinkConfigurationTask.php
index <HASH>..<HASH> 100644
--- a/Classes/TYPO3/Surf/Task/FLOW3/SymlinkConfigurationTask.php
+++ b/Classes/TYPO3/Surf/Task/FLOW3/SymlinkConfigurationTask.php
@@ -41,7 +41,7 @@ class SymlinkConfigurationTask extends \TYPO3\Surf\Domain\Model\Task {
$commands = array(
"cd {$targetReleasePath}/Configuration",
"rm -f Production/*",
- "rmdir Production",
+ "if [ -d Production ]; then rmdir Production; fi",
"mkdir -p ../../../shared/Configuration/Production",
"ln -snf ../../../shared/Configuration/Production Production"
);
|
[BUGFIX] Safeguard rmdir of directory
If the Production directory was not created the SymlinkConfigurationTask
outputs errors from rmdir.
Change-Id: I<I>db<I>c7df<I>ef8abd<I>f9d<I>d<I>e3
|
diff --git a/metpy/calc/cross_sections.py b/metpy/calc/cross_sections.py
index <HASH>..<HASH> 100644
--- a/metpy/calc/cross_sections.py
+++ b/metpy/calc/cross_sections.py
@@ -208,8 +208,10 @@ def normal_component(data_x, data_y, index='index'):
# Take the dot products
component_norm = data_x * unit_norm[0] + data_y * unit_norm[1]
- # Reattach units (only reliable attribute after operation)
- component_norm.attrs = {'units': data_x.attrs['units']}
+ # Reattach only reliable attributes after operation
+ for attr in ('units', 'grid_mapping'):
+ if attr in data_x.attrs:
+ component_norm.attrs[attr] = data_x.attrs[attr]
return component_norm
@@ -248,8 +250,10 @@ def tangential_component(data_x, data_y, index='index'):
# Take the dot products
component_tang = data_x * unit_tang[0] + data_y * unit_tang[1]
- # Reattach units (only reliable attribute after operation)
- component_tang.attrs = {'units': data_x.attrs['units']}
+ # Reattach only reliable attributes after operation
+ for attr in ('units', 'grid_mapping'):
+ if attr in data_x.attrs:
+ component_tang.attrs[attr] = data_x.attrs[attr]
return component_tang
|
Reattach grid_mapping after cross-section calculations.
|
diff --git a/main/boofcv-reconstruction/src/test/java/boofcv/alg/structure/score3d/TestScoreFundamentalVsRotation.java b/main/boofcv-reconstruction/src/test/java/boofcv/alg/structure/score3d/TestScoreFundamentalVsRotation.java
index <HASH>..<HASH> 100644
--- a/main/boofcv-reconstruction/src/test/java/boofcv/alg/structure/score3d/TestScoreFundamentalVsRotation.java
+++ b/main/boofcv-reconstruction/src/test/java/boofcv/alg/structure/score3d/TestScoreFundamentalVsRotation.java
@@ -43,6 +43,8 @@ class TestScoreFundamentalVsRotation extends CommonEpipolarScore3DChecks {
ModelMatcher<DMatrixRMaj, AssociatedPair> ransac3D =
FactoryMultiViewRobust.fundamentalRansac(new ConfigFundamental(), configRansac);
- return new ScoreFundamentalVsRotation(ransac3D);
+ var alg = new ScoreFundamentalVsRotation(ransac3D);
+ alg.inlierErrorTol = configRansac.inlierThreshold;
+ return alg;
}
}
\ No newline at end of file
|
TestScoreFundamentalVsRotation
- Fixed parameters. RANSAC and internal tolerances were not the same.
|
diff --git a/CHANGELOG b/CHANGELOG
index <HASH>..<HASH> 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
-V 1.5.1 - UNRELEASED
+V 1.5.2 - UNRELEASED
+
+V 1.5.1
Add `stack_from_top` option to reverse stack graph data order
+ Minor fix for empty logarithmic chart
V 1.5.0
Add per serie configuration
diff --git a/pygal/__init__.py b/pygal/__init__.py
index <HASH>..<HASH> 100644
--- a/pygal/__init__.py
+++ b/pygal/__init__.py
@@ -21,7 +21,7 @@ Pygal - A python svg graph plotting library
"""
-__version__ = '1.5.0'
+__version__ = '1.5.1'
import sys
from pygal.config import Config
from pygal.ghost import Ghost, REAL_CHARTS
diff --git a/pygal/graph/base.py b/pygal/graph/base.py
index <HASH>..<HASH> 100644
--- a/pygal/graph/base.py
+++ b/pygal/graph/base.py
@@ -65,7 +65,7 @@ class BaseGraph(object):
[get(val)
for serie in self.series for val in serie.safe_values]))
- self.zero = min(positive_values or 1,) or 1
+ self.zero = min(positive_values or (1,)) or 1
self._draw()
self.svg.pre_render()
|
Minor fix for empty logarithmic chart
|
diff --git a/cli/src/main/java/org/jboss/as/cli/CommandLineMain.java b/cli/src/main/java/org/jboss/as/cli/CommandLineMain.java
index <HASH>..<HASH> 100644
--- a/cli/src/main/java/org/jboss/as/cli/CommandLineMain.java
+++ b/cli/src/main/java/org/jboss/as/cli/CommandLineMain.java
@@ -1027,14 +1027,14 @@ public class CommandLineMain {
NameCallback ncb = (NameCallback) current;
if (username == null) {
showRealm();
- username = readLine("Username:", false, true);
+ username = readLine("Username: ", false, true);
}
ncb.setName(username);
} else if (current instanceof PasswordCallback) {
PasswordCallback pcb = (PasswordCallback) current;
if (password == null) {
showRealm();
- String temp = readLine("Password:", true, false);
+ String temp = readLine("Password: ", true, false);
if (temp != null) {
password = temp.toCharArray();
}
|
[AS7-<I>] Patch submmited through Jira - adding additional space to prompts.
was: <I>dba9f1d4f7b8a4ae<I>a<I>f<I>c2fad7
|
diff --git a/message/classes/api.php b/message/classes/api.php
index <HASH>..<HASH> 100644
--- a/message/classes/api.php
+++ b/message/classes/api.php
@@ -963,7 +963,7 @@ class api {
global $DB;
// Get the context for this conversation.
- $conversation = $DB->get_records('message_conversations', ['id' => $conversationid]);
+ $conversation = $DB->get_record('message_conversations', ['id' => $conversationid]);
$userctx = \context_user::instance($userid);
if (empty($conversation->contextid)) {
// When the conversation hasn't any contextid value defined, the favourite will be added to the user context.
|
MDL-<I> message: Correct favourite fetch
|
diff --git a/util/argo/argo.go b/util/argo/argo.go
index <HASH>..<HASH> 100644
--- a/util/argo/argo.go
+++ b/util/argo/argo.go
@@ -6,6 +6,7 @@ import (
"errors"
"fmt"
"path"
+ "path/filepath"
"strings"
"time"
@@ -315,7 +316,7 @@ func queryAppSourceType(ctx context.Context, spec *argoappv1.ApplicationSpec, re
}
for _, gitPath := range getRes.Items {
// gitPath may look like: app.yaml, or some/subpath/app.yaml
- trimmedPath := strings.TrimPrefix(gitPath, spec.Source.Path)
+ trimmedPath := strings.TrimPrefix(gitPath, filepath.Clean(spec.Source.Path))
trimmedPath = strings.TrimPrefix(trimmedPath, "/")
if trimmedPath == "app.yaml" {
return repository.AppSourceKsonnet, nil
|
Issue #<I> - Application type is incorrectly inferred as 'directory' if app source path starts with '.' (#<I>)
|
diff --git a/lib/puppet/pops/types/type_mismatch_describer.rb b/lib/puppet/pops/types/type_mismatch_describer.rb
index <HASH>..<HASH> 100644
--- a/lib/puppet/pops/types/type_mismatch_describer.rb
+++ b/lib/puppet/pops/types/type_mismatch_describer.rb
@@ -796,7 +796,7 @@ module Types
def describe_PTypeAliasType(expected, actual, path)
resolved_type = expected.resolved_type
describe(resolved_type, actual, path).map do |description|
- if description.is_a?(ExpectedActualMismatch)
+ if description.is_a?(ExpectedActualMismatch) && description.path.length == path.length
description.swap_expected(expected)
else
description
|
(PUP-<I>) Fix error when formatting errors for TypeAliases with variants
The TypeFormatter would incorrectly swap the expected type in
a description for the original alias although the message description
was for something nested contained in the resolved type of the alias.
This commit ensures that the replacement only happends when the sizes
of the path to the error description are equal.
|
diff --git a/lib/platform/github/gh-got-wrapper.js b/lib/platform/github/gh-got-wrapper.js
index <HASH>..<HASH> 100644
--- a/lib/platform/github/gh-got-wrapper.js
+++ b/lib/platform/github/gh-got-wrapper.js
@@ -11,13 +11,11 @@ function sleep(ms) {
async function get(path, opts, retries = 5) {
const method = opts && opts.method ? opts.method : 'get';
+ logger.debug({ retries }, `${method.toUpperCase()} ${path}`);
if (method === 'get' && cache[path]) {
logger.debug({ path }, 'Returning cached result');
return cache[path];
}
- if (retries === 5) {
- logger.debug(`${method.toUpperCase()} ${path}`);
- }
try {
if (appMode) {
/* eslint-disable no-param-reassign */
|
refactor: always debug log github get requests
|
diff --git a/src/DependencyInjection/JsonRpcHttpServerExtension.php b/src/DependencyInjection/JsonRpcHttpServerExtension.php
index <HASH>..<HASH> 100644
--- a/src/DependencyInjection/JsonRpcHttpServerExtension.php
+++ b/src/DependencyInjection/JsonRpcHttpServerExtension.php
@@ -153,10 +153,6 @@ class JsonRpcHttpServerExtension implements ExtensionInterface, CompilerPassInte
{
$mappingAwareServiceDefinitionList = $this->findAndValidateMappingAwareDefinitionList($container);
- if (0 === count($mappingAwareServiceDefinitionList)) {
- return;
- }
-
$jsonRpcMethodDefinitionList = (new JsonRpcMethodDefinitionHelper())
->findAndValidateJsonRpcMethodDefinition($container);
|
Fix when there is no mapping collector defined
|
diff --git a/src/Model/Struct.php b/src/Model/Struct.php
index <HASH>..<HASH> 100644
--- a/src/Model/Struct.php
+++ b/src/Model/Struct.php
@@ -362,7 +362,7 @@ class Struct extends AbstractModel
*/
public function getInheritanceStruct()
{
- return $this->getGenerator()->getStructByName(str_replace('[]', '', $this->getInheritance()));
+ return $this->getName() === $this->getInheritance() ? null : $this->getGenerator()->getStructByName(str_replace('[]', '', $this->getInheritance()));
}
/**
* @return string
|
issue #<I> - fix infinite loop by checking its inheritance name
|
diff --git a/shared/chat/conversation/input/container.js b/shared/chat/conversation/input/container.js
index <HASH>..<HASH> 100644
--- a/shared/chat/conversation/input/container.js
+++ b/shared/chat/conversation/input/container.js
@@ -74,7 +74,7 @@ const mergeProps = (stateProps, dispatchProps, ownProps: OwnProps): Props => {
dispatchProps.onUpdateTyping(stateProps.selectedConversationIDKey, typing)
}
}
- const wrappedTyping = throttle(updateTyping, 2000)
+ const wrappedTyping = throttle(updateTyping, 5000)
return {
...stateProps,
|
increase typing throttle to 5 seconds (#<I>)
|
diff --git a/blocks_vertical/more.js b/blocks_vertical/more.js
index <HASH>..<HASH> 100644
--- a/blocks_vertical/more.js
+++ b/blocks_vertical/more.js
@@ -287,7 +287,7 @@ Blockly.Blocks['procedures_defreturn'] = {
this.appendStatementInput('STACK')
.appendField(Blockly.Msg.PROCEDURES_DEFNORETURN_DO);
this.appendValueInput('RETURN')
- .setAlign(Blockly.ALIGN_RIGHT)
+ .setAlign(Blockly.ALIGN_LEFT)
.appendField('report');
this.statementConnection_ = null;
},
|
Procedure UI Fix (#<I>)
|
diff --git a/src/entity/entity.js b/src/entity/entity.js
index <HASH>..<HASH> 100644
--- a/src/entity/entity.js
+++ b/src/entity/entity.js
@@ -1077,7 +1077,6 @@
/**
* cap the entity velocity to the specified value<br>
- * (!) this will only cap the y velocity for now(!)
* @param {Int} x max velocity on x axis
* @param {Int} y max velocity on y axis
* @protected
|
Corrected wrong (old?) documentation
|
diff --git a/.eslintrc.js b/.eslintrc.js
index <HASH>..<HASH> 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -10,6 +10,13 @@ module.exports = {
},
overrides: [
{
+ // this package depends on a lot of peerDependencies we don't want to specify, because npm would install them
+ files: ['**/addons/docs/**/*'],
+ rules: {
+ 'import/no-extraneous-dependencies': 'off',
+ },
+ },
+ {
// this package uses pre-bundling, dependencies will be bundled, and will be in devDepenencies
files: [
'**/lib/theming/**/*',
|
add excemption to lint warnings
|
diff --git a/lib/ezdbschema/classes/ezdbschemainterface.php b/lib/ezdbschema/classes/ezdbschemainterface.php
index <HASH>..<HASH> 100644
--- a/lib/ezdbschema/classes/ezdbschemainterface.php
+++ b/lib/ezdbschema/classes/ezdbschemainterface.php
@@ -368,6 +368,12 @@ class eZDBSchemaInterface
if ( $includeData )
{
fputs( $fp, "// This array contains the database data\n" );
+ if ( isset( $data['_info'] ) )
+ {
+ $info = $data['_info'];
+ unset( $data['_info'] );
+ $data['_info'] = $info;
+ }
fputs( $fp, '$data = ' . var_export( $this->data( $schema ), true ) . ";\n" );
}
fputs( $fp, "\n" . '?>' );
|
- Made sure _info entry in data arrays are placed at the end.
git-svn-id: file:///home/patrick.allaert/svn-git/ezp-repo/ezpublish/trunk@<I> a<I>eee8c-daba-<I>-acae-fa<I>f<I>
|
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/ByteBuddy.java b/byte-buddy-dep/src/main/java/net/bytebuddy/ByteBuddy.java
index <HASH>..<HASH> 100644
--- a/byte-buddy-dep/src/main/java/net/bytebuddy/ByteBuddy.java
+++ b/byte-buddy-dep/src/main/java/net/bytebuddy/ByteBuddy.java
@@ -407,6 +407,15 @@ public class ByteBuddy {
}
/**
+ * Creates an interface that does not extend any interfaces.
+ *
+ * @return A builder for creating a new interface.
+ */
+ public DynamicType.Builder<?> makeInterface() {
+ return makeInterface(Collections.<TypeDescription>emptyList());
+ }
+
+ /**
* Creates a dynamic type builder for an interface that extends the given interface.
*
* @param type The interface to extend.
@@ -444,6 +453,17 @@ public class ByteBuddy {
/**
* Creates a dynamic type builder for an interface that extends a number of given interfaces.
*
+ * @param type The interface types to extend.
+ * @return A dynamic type builder for this configuration that defines an interface that extends the specified
+ * interfaces.
+ */
+ public DynamicType.Builder<?> makeInterface(TypeDescription... typeDescription) {
+ return makeInterface(Arrays.asList(typeDescription));
+ }
+
+ /**
+ * Creates a dynamic type builder for an interface that extends a number of given interfaces.
+ *
* @param typeDescriptions The interface types to extend.
* @return A dynamic type builder for this configuration that defines an interface that extends the specified
* interfaces.
|
Extended Byte Buddy DSL for interface creation.
|
diff --git a/keyboard/_winkeyboard.py b/keyboard/_winkeyboard.py
index <HASH>..<HASH> 100644
--- a/keyboard/_winkeyboard.py
+++ b/keyboard/_winkeyboard.py
@@ -524,7 +524,7 @@ def prepare_intercept(callback):
shift_is_pressed = False
is_keypad = (scan_code, vk, is_extended) in keypad_keys
- return callback(KeyboardEvent(event_type=event_type, scan_code=scan_code, name=name, is_keypad=is_keypad))
+ return callback(KeyboardEvent(event_type=event_type, scan_code=scan_code or -vk, name=name, is_keypad=is_keypad))
def low_level_keyboard_handler(nCode, wParam, lParam):
try:
|
Create Windows events with VK when scan code is missing
|
diff --git a/notrequests.py b/notrequests.py
index <HASH>..<HASH> 100644
--- a/notrequests.py
+++ b/notrequests.py
@@ -229,9 +229,16 @@ def _guess_filename(fileobj):
return os.path.basename(name)
+def _choose_boundary():
+ chars = 'abcdefghijklmnopqrstuvwxyz123456789'
+ boundary = ''.join(random.choice(chars) for _ in range(40))
+
+ return boundary.encode('ascii')
+
+
def _build_form_data(data=None, files=None):
# https://pymotw.com/2/urllib2/#uploading-files
- boundary = mimetools.choose_boundary()
+ boundary = _choose_boundary()
parts = []
parts_boundary = '--' + boundary
|
Replaced mimetools.choose_boundary(..) with our own.
Not sure if the string is long enough. And it may be that encoding it
is premature.
|
diff --git a/packages/ember-runtime/lib/mixins/evented.js b/packages/ember-runtime/lib/mixins/evented.js
index <HASH>..<HASH> 100644
--- a/packages/ember-runtime/lib/mixins/evented.js
+++ b/packages/ember-runtime/lib/mixins/evented.js
@@ -83,7 +83,7 @@ Ember.Evented = Ember.Mixin.create({
event.
```javascript
- person.on('didEat', food) {
+ person.on('didEat', function(food) {
console.log('person ate some ' + food);
});
|
Fix typo in evented mixin.
|
diff --git a/lib/apruve/version.rb b/lib/apruve/version.rb
index <HASH>..<HASH> 100644
--- a/lib/apruve/version.rb
+++ b/lib/apruve/version.rb
@@ -1,3 +1,3 @@
module Apruve
- VERSION = '0.9.2'
+ VERSION = '0.10.0'
end
|
Fixes issues #3 and #5
|
diff --git a/src/Command/ProjectGetCommand.php b/src/Command/ProjectGetCommand.php
index <HASH>..<HASH> 100644
--- a/src/Command/ProjectGetCommand.php
+++ b/src/Command/ProjectGetCommand.php
@@ -90,7 +90,10 @@ class ProjectGetCommand extends PlatformCommand
}
$environment = $environmentOption;
}
- elseif (count($environments) > 1 && $input->isInteractive()) {
+ elseif (count($environments) === 1) {
+ $environment = key($environments);
+ }
+ elseif ($environments && $input->isInteractive()) {
$environment = $this->offerEnvironmentChoice($environments, $input, $output);
}
else {
|
Accommodate one non-master environment. Addresses #<I>
|
diff --git a/lib/system/index.js b/lib/system/index.js
index <HASH>..<HASH> 100644
--- a/lib/system/index.js
+++ b/lib/system/index.js
@@ -28,7 +28,7 @@ system.get_logged_user = function(cb){
setTimeout(function(){
logged_user = null;
- }, 30000); // cache result for 30 seconds
+ }, 5000); // cache result for 5 seconds
})
|
Cache logged user for 5 secs only.
|
diff --git a/Services/Twilio/Rest/Sip.php b/Services/Twilio/Rest/Sip.php
index <HASH>..<HASH> 100644
--- a/Services/Twilio/Rest/Sip.php
+++ b/Services/Twilio/Rest/Sip.php
@@ -4,7 +4,7 @@
* For Linux filename compatibility, this file needs to be named Sip.php, or
* camelize() needs to be special cased in setupSubresources
*/
-class Services_Twilio_Rest_SIP extends Services_Twilio_InstanceResource {
+class Services_Twilio_Rest_Sip extends Services_Twilio_InstanceResource {
protected function init($client, $uri) {
$this->setupSubresources(
'domains',
|
Change class name to match filename
This is required in Linux for PSR-0.
|
diff --git a/examples/demo.py b/examples/demo.py
index <HASH>..<HASH> 100644
--- a/examples/demo.py
+++ b/examples/demo.py
@@ -14,7 +14,7 @@ import time
import enlighten
-# pylint: disable=wrong-import-order
+# pylint: disable=wrong-import-order,import-error
from multicolored import run_tests, load
from multiple_logging import process_files, win_time_granularity
|
Quiet pylint
|
diff --git a/lib/serf/agent.js b/lib/serf/agent.js
index <HASH>..<HASH> 100644
--- a/lib/serf/agent.js
+++ b/lib/serf/agent.js
@@ -114,8 +114,15 @@ Agent.prototype.tryStart = function() {
this._handleOutput(String(data));
}).bind(this));
} catch(error) {
- this._agentProcess = null;
+ this._logger.error('Failed to start Serf agent.');
this._logger.error(error);
+ try {
+ this._agentProcess.kill();
+ } catch(error) {
+ this._logger.error('Failed to stop Serf agent.');
+ this._logger.error(error);
+ }
+ this._agentProcess = null;
}
};
@@ -172,6 +179,7 @@ Agent.prototype.shutdown = function() {
this._agentProcess = null;
resolve();
} catch(error) {
+ this._logger.error('Failed to stop Serf agent.');
this._logger.error(error);
reject(error);
}
|
Handle errors around Serf agent more safely
|
diff --git a/test/test_core.rb b/test/test_core.rb
index <HASH>..<HASH> 100644
--- a/test/test_core.rb
+++ b/test/test_core.rb
@@ -110,6 +110,18 @@ class ParanoidTest < ParanoidBaseTest
end
end
+ # Rails does not allow saving deleted records
+ def test_no_save_after_destroy
+ paranoid = ParanoidString.first
+ paranoid.destroy
+ paranoid.name = "Let's update!"
+
+ assert_not paranoid.save
+ assert_raises ActiveRecord::RecordNotSaved do
+ paranoid.save!
+ end
+ end
+
def setup_recursive_tests
@paranoid_time_object = ParanoidTime.first
|
Specify behavior when saving destroyed records
This basically tests Rails' behavior for models where '#destroyed?'
returns true.
|
diff --git a/lfsapi/ssh.go b/lfsapi/ssh.go
index <HASH>..<HASH> 100644
--- a/lfsapi/ssh.go
+++ b/lfsapi/ssh.go
@@ -35,7 +35,7 @@ func (c *sshCache) Resolve(e Endpoint, method string) (sshAuthResponse, error) {
}
key := strings.Join([]string{e.SshUserAndHost, e.SshPort, e.SshPath, method}, "//")
- if res, ok := c.endpoints[key]; ok && (res.ExpiresAt.IsZero() || res.ExpiresAt.After(time.Now().Add(5*time.Second))) {
+ if res, ok := c.endpoints[key]; ok && (res.ExpiresAt.IsZero() || time.Until(res.ExpiresAt) > 5*time.Second) {
tracerx.Printf("ssh cache: %s git-lfs-authenticate %s %s",
e.SshUserAndHost, e.SshPath, endpointOperation(e, method))
return *res, nil
|
lfsapi: better time comparison
|
diff --git a/spec/model.rb b/spec/model.rb
index <HASH>..<HASH> 100644
--- a/spec/model.rb
+++ b/spec/model.rb
@@ -723,7 +723,7 @@ describe 'A created DBI::Model subclass instance' do
end
mc.id.should.not.be.nil
mc.c1.should.equal 123
- mc.class.should.equal DBI::Model
+ mc.class.should.equal @m_conflict
mc.class_.should.equal 'Mammalia'
mc.dup.should.equal mc
should.raise do
|
Corrected class check in Model spec.
|
diff --git a/lib/jira/base.rb b/lib/jira/base.rb
index <HASH>..<HASH> 100644
--- a/lib/jira/base.rb
+++ b/lib/jira/base.rb
@@ -374,7 +374,8 @@ module JIRA
}
)
end
- raise exception
+ # raise exception
+ save_status = false
end
save_status
end
|
Revert changes from #<I> and do not raise unexpected exceptions
|
diff --git a/kafka/codec.py b/kafka/codec.py
index <HASH>..<HASH> 100644
--- a/kafka/codec.py
+++ b/kafka/codec.py
@@ -229,13 +229,21 @@ def lz4_encode_old_kafka(payload):
assert xxhash is not None
data = lz4_encode(payload)
header_size = 7
- if isinstance(data[4], int):
- flg = data[4]
- else:
- flg = ord(data[4])
+ flg = data[4]
+ if not isinstance(flg, int):
+ flg = ord(flg)
+
content_size_bit = ((flg >> 3) & 1)
if content_size_bit:
- header_size += 8
+ # Old kafka does not accept the content-size field
+ # so we need to discard it and reset the header flag
+ flg -= 8
+ data = bytearray(data)
+ data[4] = flg
+ data = bytes(data)
+ payload = data[header_size+8:]
+ else:
+ payload = data[header_size:]
# This is the incorrect hc
hc = xxhash.xxh32(data[0:header_size-1]).digest()[-2:-1] # pylint: disable-msg=no-member
@@ -243,7 +251,7 @@ def lz4_encode_old_kafka(payload):
return b''.join([
data[0:header_size-1],
hc,
- data[header_size:]
+ payload
])
|
LZ4 support in kafka <I>/<I> does not accept a ContentSize header
|
diff --git a/addons/storyshots/src/test-bodies.js b/addons/storyshots/src/test-bodies.js
index <HASH>..<HASH> 100644
--- a/addons/storyshots/src/test-bodies.js
+++ b/addons/storyshots/src/test-bodies.js
@@ -16,7 +16,7 @@ function getSnapshotFileName(context) {
}
const { dir, name } = path.parse(fileName);
- return path.format({ dir, name, ext: '.storyshot' });
+ return path.format({ dir: path.join(dir, '__snapshots__'), name, ext: '.storyshot' });
}
export const snapshotWithOptions = options => ({ story, context }) => {
|
CHANGE path of the snapshots files into the regular `__snapshots__` folder
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -41,6 +41,7 @@ setup(
],
tests_require=[
'mock',
+ 'django-dynamic-fixture',
'django-nose',
'south',
],
|
added django dynamic fixture as test req
|
diff --git a/raft/storage.go b/raft/storage.go
index <HASH>..<HASH> 100644
--- a/raft/storage.go
+++ b/raft/storage.go
@@ -52,9 +52,6 @@ type Storage interface {
FirstIndex() (uint64, error)
// Snapshot returns the most recent snapshot.
Snapshot() (pb.Snapshot, error)
- // ApplySnapshot overwrites the contents of this Storage object with
- // those of the given snapshot.
- ApplySnapshot(pb.Snapshot) error
}
// MemoryStorage implements the Storage interface backed by an
@@ -133,7 +130,8 @@ func (ms *MemoryStorage) Snapshot() (pb.Snapshot, error) {
return ms.snapshot, nil
}
-// ApplySnapshot implements the Storage interface.
+// ApplySnapshot overwrites the contents of this Storage object with
+// those of the given snapshot.
func (ms *MemoryStorage) ApplySnapshot(snap pb.Snapshot) error {
ms.Lock()
defer ms.Unlock()
|
raft: remove the applysnap from Storage interface
|
diff --git a/crowd.py b/crowd.py
index <HASH>..<HASH> 100644
--- a/crowd.py
+++ b/crowd.py
@@ -503,7 +503,7 @@ class CrowdServer(object):
return True
- def get_membership(self):
+ def get_memberships(self):
"""Fetches all group memberships.
Returns:
|
Rename get_membership to get_memberships
|
diff --git a/capsule/src/main/java/Capsule.java b/capsule/src/main/java/Capsule.java
index <HASH>..<HASH> 100644
--- a/capsule/src/main/java/Capsule.java
+++ b/capsule/src/main/java/Capsule.java
@@ -187,6 +187,7 @@ public class Capsule implements Runnable {
private static final String PROP_TMP_DIR = "java.io.tmpdir";
private static final String ATTR_MANIFEST_VERSION = "Manifest-Version";
+ private static final String ATTR_PREMAIN_CLASS = "Premain-Class";
private static final String ATTR_MAIN_CLASS = "Main-Class";
private static final String ATTR_CLASS_PATH = "Class-Path";
private static final String ATTR_IMPLEMENTATION_VERSION = "Implementation-Version";
@@ -2696,6 +2697,10 @@ public class Capsule implements Runnable {
}
private void validateManifest(Manifest manifest) {
+ if (!Capsule.class.getName().equals(manifest.getMainAttributes().getValue(ATTR_PREMAIN_CLASS)))
+ throw new IllegalStateException("Capsule manifest must specify " + Capsule.class.getName()
+ + " in the " + ATTR_PREMAIN_CLASS + " attribute.");
+
if (manifest.getMainAttributes().getValue(ATTR_CLASS_PATH) != null)
throw new IllegalStateException("Capsule manifest contains a " + ATTR_CLASS_PATH + " attribute."
+ " Use " + ATTR_APP_CLASS_PATH + " and/or " + ATTR_DEPENDENCIES + " instead.");
|
Require 'Capsule' as manifest's 'Premain-Class'
|
diff --git a/pytime/filter.py b/pytime/filter.py
index <HASH>..<HASH> 100644
--- a/pytime/filter.py
+++ b/pytime/filter.py
@@ -273,7 +273,8 @@ class BaseParser(object):
numeric_month = NAMED_MONTHS[month]
return datetime.date(int(year), numeric_month, day)
except:
- raise CanNotFormatError('Not well formated. Expecting something like May,21st.2015')
+ raise CanNotFormatError('Not well formatted. Expecting something like May,21st.2015')
+
if __name__ == "__main__":
BaseParser.main(_current)
diff --git a/pytime/pytime.py b/pytime/pytime.py
index <HASH>..<HASH> 100644
--- a/pytime/pytime.py
+++ b/pytime/pytime.py
@@ -81,6 +81,7 @@ def daysrange(first=None, second=None, wipe=False):
:param first: datetime, date or string
:param second: datetime, date or string
+ :param wipe: boolean, excludes first and last date from range when True. Default is False.
:return: list
"""
_first, _second = parse(first), parse(second)
|
Fixed typo in filter.py and added additional blank space after. In pytime.py, documented wipe parameter in daysrange.
|
diff --git a/app/index.js b/app/index.js
index <HASH>..<HASH> 100644
--- a/app/index.js
+++ b/app/index.js
@@ -118,7 +118,7 @@ module.exports = generators.Base.extend({
this.npmInstall([
'can@^2.3.0-pre.0',
'can-connect',
- 'steal',
+ 'steal@^0.11.0-pre.0',
'jquery',
'can-ssr',
'done-autorender',
@@ -132,7 +132,7 @@ module.exports = generators.Base.extend({
'documentjs@^0.3.0-pre.4',
'funcunit',
'steal-qunit',
- 'steal-tools',
+ 'steal-tools@^0.11.0-pre.7',
'testee'
], {'saveDev': true});
|
Use the newest versions of Steal and StealTools
Fixes #4
|
diff --git a/lxd/certificates.go b/lxd/certificates.go
index <HASH>..<HASH> 100644
--- a/lxd/certificates.go
+++ b/lxd/certificates.go
@@ -517,7 +517,18 @@ func certificatesPost(d *Daemon, r *http.Request) response.Response {
}
// Access check.
- secret, err := clusterConfig.GetString(d.db.Cluster, "core.trust_password")
+ // Can't us d.State().GlobalConfig.TrustPassword() here as global config is not yet updated.
+ var secret string
+ err = d.db.Cluster.Transaction(r.Context(), func(ctx context.Context, tx *db.ClusterTx) error {
+ config, err := clusterConfig.Load(tx)
+ if err != nil {
+ return err
+ }
+
+ secret = config.TrustPassword()
+
+ return nil
+ })
if err != nil {
return response.SmartError(err)
}
|
lxd/certificates: Updates certificatesPost to use config.TrustPassword
|
diff --git a/kundera-hbase/src/main/java/com/impetus/client/hbase/admin/HBaseDataHandler.java b/kundera-hbase/src/main/java/com/impetus/client/hbase/admin/HBaseDataHandler.java
index <HASH>..<HASH> 100644
--- a/kundera-hbase/src/main/java/com/impetus/client/hbase/admin/HBaseDataHandler.java
+++ b/kundera-hbase/src/main/java/com/impetus/client/hbase/admin/HBaseDataHandler.java
@@ -531,7 +531,7 @@ public class HBaseDataHandler implements DataHandler
{
/* Set Row Key */
- PropertyAccessorHelper.setId(entity, m, hbaseData.getRowKey());
+ PropertyAccessorHelper.setId(entity, m, new String(hbaseData.getRowKey()));
// Raw data retrieved from HBase for a particular row key (contains
// all column families)
|
Fixed issue related to String byte conversion.
|
diff --git a/src/org/opencms/main/OpenCmsServlet.java b/src/org/opencms/main/OpenCmsServlet.java
index <HASH>..<HASH> 100644
--- a/src/org/opencms/main/OpenCmsServlet.java
+++ b/src/org/opencms/main/OpenCmsServlet.java
@@ -220,6 +220,8 @@ public class OpenCmsServlet extends HttpServlet implements I_CmsRequestHandler {
}
if (exportData != null) {
try {
+ // data found assume response code 200, may be corrected later
+ res.setStatus(HttpServletResponse.SC_OK);
// generate a static export request wrapper
CmsStaticExportRequest exportReq = new CmsStaticExportRequest(req, exportData);
// export the resource and set the response status according to the result
|
Fixing issue with wrong HTTP response code for static export resources.
|
diff --git a/src/Data/DataAggregateInterface.php b/src/Data/DataAggregateInterface.php
index <HASH>..<HASH> 100644
--- a/src/Data/DataAggregateInterface.php
+++ b/src/Data/DataAggregateInterface.php
@@ -21,8 +21,8 @@ interface DataAggregateInterface
/**
* Merges new data if possible.
*
- * @param array $data
+ * @param array|object $data
* @return $this
*/
- public function mergeData(array $data);
+ public function mergeData($data);
}
diff --git a/src/Data/DataAggregateTrait.php b/src/Data/DataAggregateTrait.php
index <HASH>..<HASH> 100644
--- a/src/Data/DataAggregateTrait.php
+++ b/src/Data/DataAggregateTrait.php
@@ -35,13 +35,16 @@ trait DataAggregateTrait
* @param array $data
* @return $this
*/
- public function mergeData(array $data)
+ public function mergeData($data)
{
$oldData = $this->getData();
if ($oldData === null) {
$this->setData($data);
return $this;
}
+ if (is_object($data)) {
+ $data = get_object_vars($data);
+ }
if (is_object($oldData)) {
\mp\setValues($oldData, $data, MP_USE_SETTERS | MP_CREATE_PROPERTIES);
$this->setData($oldData);
|
DataAggregate: it's possile now to merge objects
|
diff --git a/packages/components-react/src/components/Header/Header.js b/packages/components-react/src/components/Header/Header.js
index <HASH>..<HASH> 100644
--- a/packages/components-react/src/components/Header/Header.js
+++ b/packages/components-react/src/components/Header/Header.js
@@ -77,7 +77,7 @@ Header.defaultProps = {
},
unser_team: {
id: 'unser_team',
- url: 'https://www.mcmakler.de/unser-team/',
+ url: 'https://www.mcmakler.de/standorte-experten/',
title: 'Unser Team',
},
presse: {
@@ -85,11 +85,6 @@ Header.defaultProps = {
url: 'https://www.mcmakler.de/presse/',
title: 'Presse',
},
- standorte: {
- id: 'standorte',
- url: 'https://www.mcmakler.de/standorte/',
- title: 'Standorte',
- },
wohnlagenkarte: {
id: 'wohnlagenkarte',
url: 'https://www.mcmakler.de/wohnlagenkarte/',
|
chore(header) default props has been updated
|
diff --git a/dev/DebugView.php b/dev/DebugView.php
index <HASH>..<HASH> 100644
--- a/dev/DebugView.php
+++ b/dev/DebugView.php
@@ -51,17 +51,18 @@ class DebugView {
*/
public function Breadcrumbs() {
$basePath = str_replace(Director::protocolAndHost(), '', Director::absoluteBaseURL());
- $parts = explode('/', str_replace($basePath, '', $_SERVER['REQUEST_URI']));
+ $relPath = parse_url(str_replace($basePath, '', $_SERVER['REQUEST_URI']), PHP_URL_PATH);
+ $parts = explode('/', $relPath);
$base = Director::absoluteBaseURL();
- $path = "";
$pathPart = "";
+ $pathLinks = array();
foreach($parts as $part) {
if ($part != '') {
$pathPart .= "$part/";
- $path .= "<a href=\"$base$pathPart\">$part</a>→ ";
+ $pathLinks[] = "<a href=\"$base$pathPart\">$part</a>";
}
}
- return $path;
+ return implode('→ ', $pathLinks);
}
/**
|
BUGFIX Fixed DebugView Breadcrumbs to not include query string as separate link, and don't append an arrow after the last element
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@<I> <I>b<I>ca-7a2a-<I>-9d3b-<I>d<I>a<I>a9
|
diff --git a/test/test.js b/test/test.js
index <HASH>..<HASH> 100644
--- a/test/test.js
+++ b/test/test.js
@@ -16,6 +16,10 @@ describe('serveStatic()', function(){
server = createServer();
});
+ it('should require root path', function(){
+ serveStatic.bind().should.throw(/root path required/);
+ });
+
it('should serve static files', function(done){
request(server)
.get('/todo.txt')
|
tests: add test for root path requirement
|
diff --git a/course/lib.php b/course/lib.php
index <HASH>..<HASH> 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -1460,7 +1460,7 @@ function print_section($course, $section, $mods, $modnamesused, $absolute=false,
$completion=$hidecompletion
? COMPLETION_TRACKING_NONE
: $completioninfo->is_enabled($mod);
- if($completion!=COMPLETION_TRACKING_NONE) {
+ if($completion!=COMPLETION_TRACKING_NONE && isloggedin() && !isguestuser()) {
$completiondata=$completioninfo->get_data($mod,true);
$completionicon='';
if($isediting) {
|
MDL-<I>: Completion fix: hide completion icons for guest/not logged in
|
diff --git a/testing/test_collection.py b/testing/test_collection.py
index <HASH>..<HASH> 100644
--- a/testing/test_collection.py
+++ b/testing/test_collection.py
@@ -281,7 +281,7 @@ class TestPrunetraceback(object):
outcome = yield
rep = outcome.get_result()
rep.headerlines += ["header1"]
- outcome.set_result(rep)
+ outcome.force_result(rep)
""")
result = testdir.runpytest(p)
result.stdout.fnmatch_lines([
|
Fix call to outcome.force_result
Even though the test is not running at the moment (xfail), at least
we avoid future confusion
|
diff --git a/lib/friendly_id/active_record_adapter/tasks.rb b/lib/friendly_id/active_record_adapter/tasks.rb
index <HASH>..<HASH> 100644
--- a/lib/friendly_id/active_record_adapter/tasks.rb
+++ b/lib/friendly_id/active_record_adapter/tasks.rb
@@ -30,7 +30,7 @@ module FriendlyId
:include => :slug,
:limit => (ENV["LIMIT"] || 100).to_i,
:offset => 0,
- :order => ENV["ORDER"] || "#{klass.table_name}.id ASC",
+ :order => ENV["ORDER"] || "#{klass.table_name}.#{klass.primary_key} ASC",
}.merge(task_options || {})
while records = find(:all, options) do
|
fixed rake task to using class.primary_key rather than string "id"
|
diff --git a/src/share/classes/com/sun/tools/javac/code/TargetType.java b/src/share/classes/com/sun/tools/javac/code/TargetType.java
index <HASH>..<HASH> 100644
--- a/src/share/classes/com/sun/tools/javac/code/TargetType.java
+++ b/src/share/classes/com/sun/tools/javac/code/TargetType.java
@@ -80,7 +80,7 @@ public enum TargetType {
/** For annotations on a type argument or nested array of a local. */
LOCAL_VARIABLE_GENERIC_OR_ARRAY(0x09, HasLocation, IsLocal),
- /** For type annotations on a method return type */
+ /** For type annotations on a method return type. */
METHOD_RETURN(0x0A),
/**
@@ -89,15 +89,13 @@ public enum TargetType {
*/
METHOD_RETURN_GENERIC_OR_ARRAY(0x0B, HasLocation),
- /**
- * For type annotations on a method parameter
- */
+ /** For type annotations on a method parameter. */
METHOD_PARAMETER(0x0C),
/** For annotations on a type argument or nested array of a method parameter. */
METHOD_PARAMETER_GENERIC_OR_ARRAY(0x0D, HasLocation),
- /** For type annotations on a method parameter */
+ /** For type annotations on a field. */
FIELD(0x0E),
/** For annotations on a type argument or nested array of a field. */
|
Fix mistake in documentation. Re-format documentation.
|
diff --git a/relaxng/datatype/java/src/org/whattf/datatype/MetaName.java b/relaxng/datatype/java/src/org/whattf/datatype/MetaName.java
index <HASH>..<HASH> 100644
--- a/relaxng/datatype/java/src/org/whattf/datatype/MetaName.java
+++ b/relaxng/datatype/java/src/org/whattf/datatype/MetaName.java
@@ -29,10 +29,13 @@ import org.relaxng.datatype.DatatypeException;
public class MetaName extends AbstractDatatype {
private static final String[] VALID_NAMES = {
+ "apple-mobile-web-app-capable", // extension
+ "apple-mobile-web-app-status-bar-style", // extension
"application-name",
"author",
"baiduspider", // extension
"description",
+ "format-detection", // extension
"generator",
"googlebot", // extension
"keywords",
|
Update MetaName.java with the latest changes to the meta name registry.
|
diff --git a/javascript/bin/generate_static_data.js b/javascript/bin/generate_static_data.js
index <HASH>..<HASH> 100755
--- a/javascript/bin/generate_static_data.js
+++ b/javascript/bin/generate_static_data.js
@@ -34,9 +34,8 @@ function ll(str){
}
// We get our own manager.
-var gserv = new amigo.data.server();
var gconf = new bbop.golr.conf(amigo.data.golr);
-var gm_ann = new bbop.golr.manager.rhino(gserv.golr_base(), gconf);
+var gm_ann = new bbop.golr.manager.rhino('http://golr.geneontology.org/', gconf);
gm_ann.debug(false);
gm_ann.set_facet_limit(-1);
if( ! gm_ann.set_personality('bbop_ann') ){ // profile in gconf
|
try and get the image gen scripts to use the current public data now that the URL is stable
|
diff --git a/painter/__init__.py b/painter/__init__.py
index <HASH>..<HASH> 100644
--- a/painter/__init__.py
+++ b/painter/__init__.py
@@ -1,4 +1,9 @@
__version__ = '0.2-dev'
+__author__ = 'Fotis Gimian'
+__email__ = 'fgimiansoftware@gmail.com'
+__url__ = 'https://github.com/fgimian/painter'
+__license__ = 'MIT'
+__title__ = 'Painter'
from .ansi_styles import ansi # noqa
from .has_color import has_color # noqa
|
Added further metadata to the painter package
|
diff --git a/src/MvcCore/Ext/Debugs/Tracys/SessionPanel.php b/src/MvcCore/Ext/Debugs/Tracys/SessionPanel.php
index <HASH>..<HASH> 100644
--- a/src/MvcCore/Ext/Debugs/Tracys/SessionPanel.php
+++ b/src/MvcCore/Ext/Debugs/Tracys/SessionPanel.php
@@ -46,7 +46,7 @@ class SessionPanel implements \Tracy\IBarPanel
protected $session = [];
/**
- * Formated max. lifetime from `\MvcCore\Session` namespace.
+ * Formatted maximum lifetime from `\MvcCore\Session` namespace.
* @var string
*/
protected $sessionMaxLifeTime = '';
|
English grammar fixes. Assets View Helper update to remove \Nette\Utils\SafeStream, because it's not necessary anymore - atomic saving is part of core class \MvcCore\Tool.
|
diff --git a/src/Jobs/DbLogger.php b/src/Jobs/DbLogger.php
index <HASH>..<HASH> 100644
--- a/src/Jobs/DbLogger.php
+++ b/src/Jobs/DbLogger.php
@@ -49,7 +49,7 @@ class DbLogger implements ShouldQueue
'mobile' => $this->code->to,
'data' => json_encode($this->code),
'is_sent' => $this->flag,
- 'result' => json_encode($this->result),
+ 'result' => $this->result,
'created_at' => Carbon::now(),
'updated_at' => Carbon::now(),
]);
diff --git a/src/Sms.php b/src/Sms.php
index <HASH>..<HASH> 100644
--- a/src/Sms.php
+++ b/src/Sms.php
@@ -115,7 +115,7 @@ class Sms
$flag = false;
}
- DbLogger::dispatch($code, $results, $flag);
+ DbLogger::dispatch($code, json_encode($results), $flag);
return $flag;
}
|
fix serialization-of-closure for aliyun send failed result.
|
diff --git a/lib/pronto/github.rb b/lib/pronto/github.rb
index <HASH>..<HASH> 100644
--- a/lib/pronto/github.rb
+++ b/lib/pronto/github.rb
@@ -41,6 +41,7 @@ module Pronto
def create_pull_request_review(comments)
options = {
event: 'COMMENT',
+ accept: 'application/vnd.github.black-cat-preview+json', # https://developer.github.com/v3/pulls/reviews/#create-a-pull-request-review
comments: comments.map do |c|
{ path: c.path, position: c.position, body: c.body }
end
|
To access the API you must provide a custom media type in the Accept header
|
diff --git a/lib/xcode/install/cli.rb b/lib/xcode/install/cli.rb
index <HASH>..<HASH> 100644
--- a/lib/xcode/install/cli.rb
+++ b/lib/xcode/install/cli.rb
@@ -5,7 +5,10 @@ module XcodeInstall
self.summary = 'Installs Xcode Command Line Tools.'
def run
- fail Informative, 'Xcode CLI Tools are already installed.' if installed?
+ if installed?
+ print 'Xcode CLI Tools are already installed.'
+ exit(0)
+ end
install
end
|
Don't exit 1 if CLI tools are already installed
Previously `xcversion install-cli-tools` would exit 1 if they were
already installed, but `xcversion install VERSION` would exit 0. This
makes them have the same behavior.
|
diff --git a/src/response.js b/src/response.js
index <HASH>..<HASH> 100644
--- a/src/response.js
+++ b/src/response.js
@@ -108,7 +108,7 @@ const generate = (resource, associations, req, version, options) => {
// returned along with the result. A $count query option with a value of
// false (or not specified) hints that the service SHALL not return a
// count.
- if (count !== 'false') {
+ if (count !== false) {
response[iotCount] = totalCount;
}
diff --git a/test/test_query_language.js b/test/test_query_language.js
index <HASH>..<HASH> 100644
--- a/test/test_query_language.js
+++ b/test/test_query_language.js
@@ -138,8 +138,7 @@ db().then(models => {
});
});
- // XXX OData parser. $count is not supported.
- xit('should respond without count', done => {
+ it('should respond without count', done => {
get(modelName + '?$count=false')
.then(result => {
should.not.exist(result[CONST.iotCount]);
|
[Issue #<I>] $count=false is not working properly (#<I>)
|
diff --git a/peewee.py b/peewee.py
index <HASH>..<HASH> 100644
--- a/peewee.py
+++ b/peewee.py
@@ -33,7 +33,7 @@ class Database(object):
return result.fetchone()[0]
def create_table(self, model_class):
- framing = "CREATE TABLE %s (%s);"
+ framing = "CREATE TABLE IF NOT EXISTS %s (%s);"
columns = []
for field in model_class._meta.fields.values():
|
Create table only if it doesn't exist
|
diff --git a/charmhelpers/contrib/openstack/utils.py b/charmhelpers/contrib/openstack/utils.py
index <HASH>..<HASH> 100644
--- a/charmhelpers/contrib/openstack/utils.py
+++ b/charmhelpers/contrib/openstack/utils.py
@@ -153,7 +153,7 @@ SWIFT_CODENAMES = OrderedDict([
('newton',
['2.8.0', '2.9.0', '2.10.0']),
('ocata',
- ['2.11.0']),
+ ['2.11.0', '2.12.0']),
])
# >= Liberty version->codename mapping
|
Add <I> to swift list of releases for ocata
|
diff --git a/setup.py b/setup.py
index <HASH>..<HASH> 100644
--- a/setup.py
+++ b/setup.py
@@ -41,5 +41,5 @@ setup(
packages=find_packages('.'),
include_package_data=True,
zip_safe=False,
- install_requires=['django-inplaceedit==1.2.2']
+ install_requires=['django-inplaceedit>=1.2.3']
)
|
Update the django-inplaceedit
|
diff --git a/development-utility/development-server/src/com/thoughtworks/go/server/DevelopmentServer.java b/development-utility/development-server/src/com/thoughtworks/go/server/DevelopmentServer.java
index <HASH>..<HASH> 100644
--- a/development-utility/development-server/src/com/thoughtworks/go/server/DevelopmentServer.java
+++ b/development-utility/development-server/src/com/thoughtworks/go/server/DevelopmentServer.java
@@ -52,6 +52,7 @@ public class DevelopmentServer {
systemEnvironment.setProperty(SystemEnvironment.PARENT_LOADER_PRIORITY, "true");
systemEnvironment.setProperty(SystemEnvironment.CRUISE_SERVER_WAR_PROPERTY, webApp.getAbsolutePath());
+ systemEnvironment.set(SystemEnvironment.PLUGIN_LOCATION_MONITOR_INTERVAL_IN_SECONDS, 5);
systemEnvironment.set(SystemEnvironment.DEFAULT_PLUGINS_ZIP, "/plugins.zip");
systemEnvironment.setProperty(GoConstants.I18N_CACHE_LIFE, "0"); //0 means reload when stale
|
#NA - Setting plugin location monitor interval to 5secs for Development Server
This makes it convenient to test plugins and end-points while developing.
|
diff --git a/grunt.js b/grunt.js
index <HASH>..<HASH> 100644
--- a/grunt.js
+++ b/grunt.js
@@ -1,7 +1,7 @@
module.exports = function(grunt){
grunt.initConfig({
lint: {
- all: ['grunt.js', 'lib/*', 'test/*']
+ all: ['grunt.js', 'lib/*', 'test/*.js']
},
test: {
files: ['test/*.js']
|
Forced lint on js files only.
|
diff --git a/lib/simple_form/form_builder.rb b/lib/simple_form/form_builder.rb
index <HASH>..<HASH> 100644
--- a/lib/simple_form/form_builder.rb
+++ b/lib/simple_form/form_builder.rb
@@ -48,6 +48,11 @@ module SimpleForm
# label + input + hint (when defined) + errors (when exists), and all can
# be configured inside a wrapper html.
#
+ # If a block is given, the contents of the block will replace the input
+ # field that would otherwise be generated automatically. The content will
+ # be given a label and wrapper div to make it consistent with the other
+ # elements in the form.
+ #
# == Examples
#
# # Imagine @user has error "can't be blank" on name
|
Add docs for #input method with block
To explain what happens when you pass a block to the #input method
within the form builder
|
diff --git a/libraries/TeamSpeak3/Node/Host.php b/libraries/TeamSpeak3/Node/Host.php
index <HASH>..<HASH> 100644
--- a/libraries/TeamSpeak3/Node/Host.php
+++ b/libraries/TeamSpeak3/Node/Host.php
@@ -594,7 +594,7 @@ class TeamSpeak3_Node_Host extends TeamSpeak3_Node_Abstract
$permtree[$val]["permcatid"] = $val;
$permtree[$val]["permcathex"] = "0x" . dechex($val);
$permtree[$val]["permcatname"] = TeamSpeak3_Helper_String::factory(TeamSpeak3_Helper_Convert::permissionCategory($val));
- $permtree[$val]["permcatparent"] = $permtree[$val]["permcathex"]{3} == 0 ? 0 : hexdec($permtree[$val]["permcathex"]{2} . 0);
+ $permtree[$val]["permcatparent"] = $permtree[$val]["permcathex"][3] == 0 ? 0 : hexdec($permtree[$val]["permcathex"][2] . 0);
$permtree[$val]["permcatchilren"] = 0;
$permtree[$val]["permcatcount"] = 0;
|
Remove deprecated curly braces (#<I>)
|
diff --git a/Source/classes/DragSort.js b/Source/classes/DragSort.js
index <HASH>..<HASH> 100644
--- a/Source/classes/DragSort.js
+++ b/Source/classes/DragSort.js
@@ -49,9 +49,10 @@ Garnish.DragSort = Garnish.Drag.extend({
this.base();
// add the caboose?
- if (this.settings.container && this.$caboose)
+ if (this.$caboose)
{
- this.$caboose.appendTo(this.settings.container);
+ var $lastItem = $().add(this.$items).last();
+ this.$caboose.insertAfter($lastItem);
this.otherItems.push(this.$caboose[0]);
this.totalOtherItems++;
}
|
Cabooses (cabeese?) no longer require the drag class have a container
|
diff --git a/Entity/CronJob.php b/Entity/CronJob.php
index <HASH>..<HASH> 100644
--- a/Entity/CronJob.php
+++ b/Entity/CronJob.php
@@ -25,28 +25,28 @@ class CronJob
/**
* @var string
*
- * @ORM\Column(name="name", type="string", length=255)
+ * @ORM\Column(name="name", type="string", length=191)
*/
private $name;
/**
* @var string
*
- * @ORM\Column(name="command", type="string", length=255)
+ * @ORM\Column(name="command", type="string", length=191)
*/
private $command;
/**
* @var string
*
- * @ORM\Column(name="schedule", type="string", length=255)
+ * @ORM\Column(name="schedule", type="string", length=191)
*/
private $schedule;
/**
* @var string
*
- * @ORM\Column(name="description", type="string", length=255)
+ * @ORM\Column(name="description", type="string", length=191)
*/
private $description;
|
changed length of strings for utf8mb4 support (#<I>)
|
diff --git a/rtmbot.py b/rtmbot.py
index <HASH>..<HASH> 100755
--- a/rtmbot.py
+++ b/rtmbot.py
@@ -7,6 +7,7 @@ import client
sys.path.append(os.getcwd())
+
def parse_args():
parser = ArgumentParser()
parser.add_argument(
|
flake8
for reals this time
|
diff --git a/src/cli.js b/src/cli.js
index <HASH>..<HASH> 100644
--- a/src/cli.js
+++ b/src/cli.js
@@ -72,9 +72,18 @@ async function main() {
// We need to polyfill it for the server side.
const channel = new EventEmitter();
addons.setChannel(channel);
- await runner.run(filterStorybook(storybook, grep, exclude));
+ const result = await runner.run(filterStorybook(storybook, grep, exclude));
+ const fails = result.errored + result.unmatched;
+ const exitCode = fails > 0 ? 1: 0;
+ if(!program.watch){
+ process.exit(exitCode);
+ }
} catch (e) {
- console.log(e.stack);
+ console.log(e.stack || e);
+
+ if(!program.watch){
+ process.exit(1);
+ }
}
}
diff --git a/src/test_runner/index.js b/src/test_runner/index.js
index <HASH>..<HASH> 100644
--- a/src/test_runner/index.js
+++ b/src/test_runner/index.js
@@ -125,5 +125,6 @@ export default class Runner {
}
this.end();
+ return this.testState;
}
}
|
Exit with exit code 1 if some tests errored or unmatched
|
diff --git a/src/Graph/Presenters/GraphViz.php b/src/Graph/Presenters/GraphViz.php
index <HASH>..<HASH> 100644
--- a/src/Graph/Presenters/GraphViz.php
+++ b/src/Graph/Presenters/GraphViz.php
@@ -154,7 +154,7 @@ HTML;
/**
* @var Node $node
*/
- foreach($nodes as $node) {
+ foreach ($nodes as $node) {
/**
* @var Vertex $vertex
*/
@@ -190,4 +190,4 @@ HTML;
{
return $this->graphViz->createImageHtml($this->graph);
}
-}
\ No newline at end of file
+}
|
making it psr-2 compatible
|
diff --git a/src/main/java/com/semanticcms/section/servlet/impl/SectionImpl.java b/src/main/java/com/semanticcms/section/servlet/impl/SectionImpl.java
index <HASH>..<HASH> 100644
--- a/src/main/java/com/semanticcms/section/servlet/impl/SectionImpl.java
+++ b/src/main/java/com/semanticcms/section/servlet/impl/SectionImpl.java
@@ -1,6 +1,6 @@
/*
* semanticcms-section-servlet - Sections nested within SemanticCMS pages and elements in a Servlet environment.
- * Copyright (C) 2013, 2014, 2015, 2016, 2017, 2019, 2020, 2021 AO Industries, Inc.
+ * Copyright (C) 2013, 2014, 2015, 2016, 2017, 2019, 2020, 2021, 2022 AO Industries, Inc.
* support@aoindustries.com
* 7262 Bull Pen Cir
* Mobile, AL 36695
@@ -47,7 +47,7 @@ import javax.servlet.ServletRequest;
import javax.servlet.jsp.SkipPageException;
// TODO: Implement with https://www.w3.org/TR/wai-aria-1.1/#aria-label
-public abstract class SectionImpl {
+public final class SectionImpl {
/** Make no instances. */
private SectionImpl() {throw new AssertionError();}
|
Using final instead of abstract for static utility classes
NetBeans <I> is warning "Constructor is never used" when abstract, and
this cannot be suppressed with `@SuppressWarnings("unused")`.
|
diff --git a/isso/utils/hash.py b/isso/utils/hash.py
index <HASH>..<HASH> 100644
--- a/isso/utils/hash.py
+++ b/isso/utils/hash.py
@@ -3,7 +3,7 @@
import codecs
import hashlib
-from werkzeug.security import pbkdf2_bin as pbkdf2
+from hashlib import pbkdf2_hmac as pbkdf2
def _TypeError(name, expected, val):
@@ -68,7 +68,8 @@ class PBKDF2(Hash):
self.func = func
def compute(self, val):
- return pbkdf2(val, self.salt, self.iterations, self.dklen, self.func)
+ return pbkdf2(hash_name=self.func, password=val, salt=self.salt,
+ iterations=self.iterations, dklen=self.dklen)
def new(conf):
|
utils: hash: Use hashlib for pbkdf2
werkzeug <I> will deprecate `pbkdf2_bin` and recommends
pbkdf2_hmac as an alternative.
Adjust function invocation and use named args to avoid
confusion.
Compare:
<URL>
|
diff --git a/onecodex/lib/upload.py b/onecodex/lib/upload.py
index <HASH>..<HASH> 100644
--- a/onecodex/lib/upload.py
+++ b/onecodex/lib/upload.py
@@ -307,6 +307,9 @@ def _file_stats(file_path, enforce_fastx=True):
# this lets us turn off the click progressbar context manager and is python2 compatible
# https://stackoverflow.com/questions/45187286/how-do-i-write-a-null-no-op-contextmanager-in-python
class FakeProgressBar(object):
+ pct = 0
+ label = ''
+
def __init__(self):
pass
|
Make FakeProgressBar support pct and label. Closes #<I>.
|
diff --git a/cmd-ls.go b/cmd-ls.go
index <HASH>..<HASH> 100644
--- a/cmd-ls.go
+++ b/cmd-ls.go
@@ -59,6 +59,10 @@ func printObject(date time.Time, v int64, key string) {
func doListCmd(ctx *cli.Context) {
var items []*client.Item
+ if len(ctx.Args()) < 1 {
+ cli.ShowCommandHelpAndExit(ctx, "ls", 1) // last argument is exit code
+ }
+
urlStr, err := parseURL(ctx.Args().First())
if err != nil {
log.Debug.Println(iodine.New(err, nil))
diff --git a/cmd-mb.go b/cmd-mb.go
index <HASH>..<HASH> 100644
--- a/cmd-mb.go
+++ b/cmd-mb.go
@@ -25,6 +25,10 @@ import (
// doMakeBucketCmd creates a new bucket
func doMakeBucketCmd(ctx *cli.Context) {
+ if len(ctx.Args()) < 1 {
+ cli.ShowCommandHelpAndExit(ctx, "mb", 1) // last argument is exit code
+ }
+
urlStr, err := parseURL(ctx.Args().First())
if err != nil {
log.Debug.Println(iodine.New(err, nil))
|
show help when no args are passed
|
diff --git a/src/ThemeCompile.php b/src/ThemeCompile.php
index <HASH>..<HASH> 100644
--- a/src/ThemeCompile.php
+++ b/src/ThemeCompile.php
@@ -45,6 +45,8 @@ class ThemeCompile extends ParallelExec
*/
public function run()
{
+ // Print the output of the compile commands.
+ $this->printed();
if (file_exists($this->dir . '/Gemfile')) {
$bundle = $this->findExecutable('bundle');
$this->processes[] = new Process(
|
Issue #<I>: Print the output of the compile commands.
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.