Commit Graph

1540 Commits

Author SHA1 Message Date
JC Brand
0a1614741b Make sure main.js is loaded before calling require.
When calling require from within HTML, then don't use data-main, but instead
load main.js via a require call.

See here: http://requirejs.org/docs/api.html#data-main
2014-09-06 16:58:20 +02:00
JC Brand
31de78f020 Also declare the template paths in main.js 2014-09-06 14:30:21 +02:00
JC Brand
07b7393088 Update translation docs to mention paths in main.js 2014-09-06 14:12:31 +02:00
JC Brand
5ee8c5470d Move all path declarations from locales.js to main.js
Makes it easier to integrate converse.js into other bower/require projects.
2014-09-06 14:10:48 +02:00
JC Brand
1468de6b79 Sort dependencies by name 2014-09-06 14:04:11 +02:00
JC Brand
5d4deffc48 Define jed path in main.js, not locales.js 2014-09-06 14:02:05 +02:00
JC Brand
0ca5f602e7 Use strophe from bower packages 2014-09-06 13:03:58 +02:00
JC Brand
ad3350587b Tell travis to run 'make dev' first 2014-09-06 12:50:15 +02:00
JC Brand
dfb130fb32 Test that user is properly informed when kicked out of a room 2014-09-06 12:46:24 +02:00
JC Brand
9e5dc21aa4 Refactor showing of chat room status messages.
onChatRoomPresence and showStatusMessages have been refactored to give more
detailed information and to also show the reasons given to actions taken by
moderators.
2014-09-06 12:25:37 +02:00
JC Brand
e8a70abcc1 Bugfix. Chat room status messages weren't being shown in certain cases. 2014-09-05 23:24:35 +02:00
JC Brand
a3e540fa67 Provide feedback if a chat room command didn't work. 2014-09-05 19:36:31 +02:00
JC Brand
82659e87d7 Add extra chat room commands: /nick, /mute and /voice.
Also document the available chat room commands.
2014-09-05 18:27:32 +02:00
JC Brand
78ac525e18 Add cuationary note against using localStorage (instead of sessionStorage) 2014-09-04 10:27:24 +02:00
JC Brand
ae90c7420e Update docs and rename option to use underscore instead of dash. 2014-09-03 20:15:46 +02:00
JC Brand
e64153b83f Implement the participants show/hide feature. 2014-09-03 20:04:32 +02:00
JC Brand
68714e9db5 Update the mockup with show/hide button for chat room participants. 2014-09-03 19:49:15 +02:00
JC Brand
4d479ae51d Update fonticons to add icons for toggling the chatroom participants. 2014-09-03 19:01:22 +02:00
JC Brand
3aaa8df41a Notification sound now also plays when nickname is mentioned in chat room.
updates #62
2014-09-03 18:47:24 +02:00
JC Brand
01ba7361d6 CSS tweak 2014-09-03 18:18:11 +02:00
JC Brand
4087b8dea1 Made new builds containing room invite feature. fixes #215 2014-09-03 18:02:12 +02:00
JC Brand
9d886a9f1d Add a test for the onInvite method. refs #215 2014-09-02 20:01:49 +02:00
JC Brand
cebf8c2451 See below...
* Update docs on message carbons and stanza forwarding.
* Mention latest bug fix.
2014-09-02 16:53:44 +02:00
JC Brand
14ce4a0e6d Bugfix. Don't override chat_status retrieved from sessionStorage.
See http://librelist.com/browser//conversejs/2014/8/26/problem-with-contact-list-everyone-is-offline/
2014-09-02 16:42:08 +02:00
JC Brand
1b4658745c Add a magnifying glass icon to invitee search field. updates #215 2014-09-01 13:05:10 +02:00
JC Brand
18cbe06d58 Add some initial tests for the room invite feature. updates #215 2014-08-31 22:48:26 +02:00
JC Brand
bf0d0320c5 Emit an event after the user has sent out a chat room invitation. refs #215 2014-08-31 21:54:17 +02:00
JC Brand
67c00d779d Tweak invite widget style and make the placeholder text translateable.
updates #215
2014-08-31 21:29:47 +02:00
JC Brand
ff32866f21 Mention live filter bugfix and add tests for it. updates #212 2014-08-31 21:20:28 +02:00
JC Brand
37255a2692 updates #215, see below.
* Filter by both fullname and jid when searching for users to invite.
* Combine the confirm and prompt popups into a single confirm popup.
* Bugfix in groups filter. Make sure to show group that were previously filtered out.
2014-08-31 19:44:05 +02:00
JC Brand
4a31978e5e Add disco methods to test mock 2014-08-31 14:19:20 +02:00
JC Brand
156d231c95 Converse.js now responds to XEP-0030 Service discovery requests. 2014-08-31 14:14:50 +02:00
JC Brand
9f6e36e38d Merge branch 'master' into user-invite 2014-08-31 02:18:28 +02:00
JC Brand
db24bf7a70 Bugfix. Don't append, replace.
Otherwise, if the same error presence is received twice, the form will render
twice.
2014-08-31 02:17:48 +02:00
JC Brand
ad99e72279 Merge branch 'master' into user-invite 2014-08-31 02:06:02 +02:00
JC Brand
6f80bd5a3d Pin newer version of strophe.muc.js that contains bugfix 2014-08-31 02:05:39 +02:00
JC Brand
59505c0c48 Show the invitation reason if it exists. updates #215
Also, call the directInvite method on the XmppRoom obj of Strophe.MUC. This
will automatically include the room name and password.
2014-08-31 01:17:52 +02:00
JC Brand
b158c328dd Include reason for invite, if there is one. updates #215 2014-08-30 17:56:45 +02:00
JC Brand
bea7687bac Add protocol code for sending and receiving invites. updates #215 2014-08-30 16:00:52 +02:00
JC Brand
0a7d05c0e5 Handle contact selection. update #215 2014-08-30 13:34:57 +02:00
JC Brand
c17f085d30 updates #215
* Fix filter predicates.
* Include contact JID in suggestions list
2014-08-30 13:26:33 +02:00
JC Brand
53f87b566e Include the search_contacts templates. updates #216 2014-08-29 16:09:39 +02:00
JC Brand
172d18fa0a Typeahead now has actual queried suggestions. updates #215 2014-08-27 18:57:03 +02:00
JC Brand
84c2242c91 Enable typeahead on the input and style the suggestions dropdown. updates #215 2014-08-27 11:16:29 +02:00
JC Brand
f1555774f0 Add typeahead.js as dependency and integrate. updates #215. 2014-08-26 19:59:48 +02:00
JC Brand
28827428e7 Add initial markup for inviting someone to a room. updates #215 2014-08-26 19:41:47 +02:00
JC Brand
b039b1d80d Mention Alfresco integration 2014-08-25 18:08:35 +02:00
JC Brand
0969f4ca62 Include new strophe.muc.js. fixes #178 2014-08-25 15:27:06 +02:00
JC Brand
1d2b4c4523 Add sound file credits 2014-08-25 15:22:49 +02:00
JC Brand
c44649a820 Generate new pot and po files 2014-08-25 14:39:32 +02:00