Merge branch 'soon' into fileManager

This commit is contained in:
yflory
2017-01-10 15:07:48 +01:00
17 changed files with 207 additions and 104 deletions

View File

@@ -120,6 +120,7 @@ define([
.append($('<td>').append(readOnlyText).append($('<a>', {
href: pad.href,
title: pad.title,
target: '_blank',
}).text(shortTitle)))
.append($('<td>').text(created))
.append($('<td>').text(date))

View File

@@ -246,7 +246,7 @@ define(function () {
out.login_cancel_prompt = "...or if you may have entered the wrong username or password, cancel to try again.";
out.login_registerSuccess = "registered successfully. Make sure you don't forget your password!"
out.login_registerSuccess = "registered successfully. Make sure you don't forget your password!";
out.login_passwordMismatch = "The two passwords you entered do not match. Try again";
out.login_warning = [