Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
converse.js
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
converse.js
Commits
61ed55db
Commit
61ed55db
authored
Oct 31, 2017
by
JC Brand
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename login and register urls
parent
ad0e4574
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
src/converse-muc.js
src/converse-muc.js
+5
-1
src/converse-register.js
src/converse-register.js
+2
-2
src/templates/register_link.html
src/templates/register_link.html
+1
-1
src/templates/register_panel.html
src/templates/register_panel.html
+1
-1
No files found.
src/converse-muc.js
View file @
61ed55db
...
...
@@ -839,7 +839,11 @@
affiliations
=
[
affiliations
];
}
return
new
Promise
((
resolve
,
reject
)
=>
{
const
promises
=
_
.
map
(
affiliations
,
_
.
partial
(
this
.
requestMemberList
,
this
.
model
.
get
(
'
jid
'
)));
const
promises
=
_
.
map
(
affiliations
,
_
.
partial
(
this
.
requestMemberList
,
this
.
model
.
get
(
'
jid
'
))
);
Promise
.
all
(
promises
).
then
(
_
.
flow
(
this
.
marshallAffiliationIQs
.
bind
(
this
),
resolve
),
_
.
flow
(
this
.
marshallAffiliationIQs
.
bind
(
this
),
resolve
)
...
...
src/converse-register.js
View file @
61ed55db
...
...
@@ -147,8 +147,8 @@
const
RegistrationRouter
=
Backbone
.
Router
.
extend
({
initialize
()
{
this
.
route
(
'
converse
-
login
'
,
_
.
partial
(
this
.
setActiveForm
,
'
login
'
));
this
.
route
(
'
converse
-
register
'
,
_
.
partial
(
this
.
setActiveForm
,
'
register
'
));
this
.
route
(
'
converse
/
login
'
,
_
.
partial
(
this
.
setActiveForm
,
'
login
'
));
this
.
route
(
'
converse
/
register
'
,
_
.
partial
(
this
.
setActiveForm
,
'
register
'
));
},
setActiveForm
(
value
)
{
_converse
.
api
.
waitUntil
(
'
controlboxInitialized
'
).
then
(()
=>
{
...
...
src/templates/register_link.html
View file @
61ed55db
<div
class=
"switch-form"
>
<p>
{{{ __("Don't have a chat account?") }}}
</p>
<p><a
class=
"register-account toggle-register-login"
href=
"#converse
-
register"
>
{{{__("Create an account")}}}
</a></p>
<p><a
class=
"register-account toggle-register-login"
href=
"#converse
/
register"
>
{{{__("Create an account")}}}
</a></p>
</div>
src/templates/register_panel.html
View file @
61ed55db
...
...
@@ -17,6 +17,6 @@
<div
class=
"switch-form"
>
<p>
{{{ __("Already have a chat account?") }}}
</p>
<p>
<a
class=
"login-here toggle-register-login"
href=
"#converse
-
login"
>
{{{__("Log in here")}}}
</a>
<a
class=
"login-here toggle-register-login"
href=
"#converse
/
login"
>
{{{__("Log in here")}}}
</a>
</p>
</div>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment