You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Baris Usakli 1fa52267d4 Merge remote-tracking branch 'origin/master' ... # Conflicts: # public/src/admin/manage/category.js		8 years ago
..
admin	Merge remote-tracking branch 'origin/master'	8 years ago
client	closes #5642	8 years ago
installer	ESlint no-unused-vars	8 years ago
modules	adjusted cropbox max-height calculation to be dynamic	8 years ago
ajaxify.js	fix lint	8 years ago
app.js	fix eslint	8 years ago
overrides.js	add back timeago.allowFuture so we can notify when a ban will expire	8 years ago
require-config.js	ESlint strict	8 years ago
sockets.js	refactor ban messaging; add ban duration to message; use bootbox instead of alert	8 years ago
utils.js	utils tests	8 years ago
widgets.js	ESlint no-useless-concat, no-mixed-spaces-and-tabs	8 years ago