Merge branch 'soon' into fileManager
This commit is contained in:
@@ -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))
|
||||
|
||||
@@ -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 = [
|
||||
|
||||
Reference in New Issue
Block a user