Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity
4,027 Commits 2 Branches 109 Tags 304 MiB
24afd73842
Commit Graph

1199 Commits

Author SHA1 Message Date
JC Brand
6f7fb8356a Use mainConfigFile option to avoid having to configure paths again. 2014-10-28 17:40:18 +01:00
JC Brand
55e32c735d Fix tests 2014-10-27 23:06:11 +01:00
JC Brand
7e4c1d6d8d Keep a local customized copy of strophe.roster.js 
The new changes made to strophe.roster.js are incompatible with the way
converse.js works.

Will likely replace strophe.roster.js completely.
 2014-10-27 21:54:00 +01:00
JC Brand
2f968f7095 More optimizations. 
Don't sort the global ContactRosters collection (we only need to sort the
individual groups).
Only add the roster to the DOM once the users have been added.
 2014-10-25 12:33:24 +02:00
JC Brand
55c57a346d Move translation factory to utils 
So that it can be used by plugins.
 2014-10-13 22:02:55 +02:00
JC Brand
970da2acf0 Keep track of groupchat messages... fixes #240 
by way of msgid attribute.
 2014-10-13 21:15:25 +02:00
JC Brand
1955c611e1 Merge branch 'master' into private-jquery 2014-10-12 11:37:35 +02:00
JC Brand
eaa18cc4c2 Merge branch 'master' of github.com:jcbrand/converse.js 2014-10-10 10:52:41 +02:00
Sergey Fedoseev
ea641607e3 templates: close li tags 2014-10-10 14:35:14 +06:00
Sergey Fedoseev
642302ad60 login_panel.html: remove useless quote character 2014-10-08 01:04:51 +06:00
JC Brand
d6110a1e52 Patch all scripts that rely on jquery to be AMD compatible. 2014-10-07 18:17:19 +02:00
JC Brand
f7c943549b otr.js also has jquery.browser as dependency 2014-10-06 21:10:35 +02:00
JC Brand
6b2dd9b3cb Update build files and created new builds. 2014-10-06 21:10:07 +02:00
JC Brand
f2e42b4111 otr.js also has jquery.browser as dependency 2014-10-06 20:58:54 +02:00
JC Brand
0c83ac4524 Explicitly set jQuery as a dependency of converse.js 
Also in utils.js and otr.js (this will help reach to goal of having a private
jquery which doesn't pollute the global $ var).
 2014-10-06 20:23:59 +02:00
JC Brand
d8bf1961a7 Making a 0.8.3 release. 
The 0.8.2 release didn't include new builds due to an unnoticed build error.
 2014-09-22 18:17:40 +02:00
JC Brand
46400efa97 Markup fix 2014-09-22 13:16:43 +02:00
JC Brand
e860343eb2 Bugfix. The chatroom was being joined twice, causing duplication. 2014-09-21 00:19:59 +02:00
JC Brand
dbd45397a3 Move password form for chatrooms to an external template. 2014-09-20 22:59:29 +02:00
JC Brand
0babac2b17 More fixes to properly tear down session after logout. 
Fixed problem with Strophe handlers zombies.
Remove zombie handlers for minimized chats (caused duplicate minimized chats).
 2014-09-20 15:08:53 +02:00
JC Brand
785919a019 Make login method post. 
Avoids username and pw inadvertently being added to the URL if the submit event
handler for some reason fails (which shouldn't happen of course).
 2014-09-18 18:49:37 +02:00
JC Brand
90859a9811 New build which fixes the issues with room invite and typeahead. 2014-09-17 23:32:54 +02:00
JC Brand
450ce04fd9 Refactor chat rooms. 
When re-attaching to an existing session, chat rooms are fetched from
sessionStorage and we join them again.

However, unless we send a presence of type unavailable before reloading the
page, from the XMPP server's perspective we never left the chat room.

It therefore doesn't send us again the room occupants or room messages.

To send a presence of type unavailable is a hack and not desireable. Rather, we
want to stay in the room and just re-attach to it upon page reload.
In order to do this, we need some new functionality.

* Refactor the chat room sidebar into a new Backbone Model/View combo. (done).
* Store/fetch room occupants in/from sessionStorage (done).
* Store/fetch room messages in/from sessionStorage (not yet done).
* Instead of re-joining a chat room which we never left, just register the event handlers again. (not yet done).
 2014-09-12 15:30:28 +02:00
JC Brand
e59071aeea Add the ability to log out of a session. updates #80 2014-09-07 13:18:36 +02:00
JC Brand
31de78f020 Also declare the template paths in main.js 2014-09-06 14:30:21 +02:00
JC Brand
e64153b83f Implement the participants show/hide feature. 2014-09-03 20:04:32 +02:00
JC Brand
4087b8dea1 Made new builds containing room invite feature. fixes #215 2014-09-03 18:02:12 +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
ad99e72279 Merge branch 'master' into user-invite 2014-08-31 02:06:02 +02:00
JC Brand
53f87b566e Include the search_contacts templates. updates #216 2014-08-29 16:09:39 +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
1299a1d4ba Add support for filtering by group. update #212 2014-08-11 21:48:48 +02:00
JC Brand
e31ded9f77 Rename jquery.fastLiveSearch.js to utils.js and regenerate 2014-08-08 20:18:42 +02:00
JC Brand
52ce812694 Much better live filter implementation. updates #212 2014-08-08 19:08:47 +02:00
JC Brand
aff91fc683 updates #212 
* Make sure that the roster container has a fixed height, so that we can better
check whether the roster is overflowing.
* Call update after inserting the roster into the DOM
 2014-08-08 18:00:48 +02:00
JC Brand
ecf667dc33 More tweaks. updates #212 2014-08-07 22:38:30 +02:00
JC Brand
00e05c029b Style the live filter and make sure that it... 
only shows when the roster is overflowing. updates #212
 2014-08-07 22:18:44 +02:00
JC Brand
1441f4ab64 Add text input to act as live filter. updates #212 2014-08-07 21:33:19 +02:00
JC Brand
26e7e82f5b Build a non-OTR version for the website on IE < 9. 2014-08-05 17:44:53 +02:00
JC Brand
5b430eef1a Don't throw an error when no CSPRNG 2014-08-05 17:29:11 +02:00
JC Brand
ce75bc4737 Override otr.js so that we can fallback gracefully on IE 2014-08-05 16:59:38 +02:00
JC Brand
3fea9a09a8 Add a new build without OTR to be used on IE. 2014-08-05 16:11:20 +02:00
JC Brand
ab934b8573 Turns out we need to patch bigint... 2014-08-04 23:00:43 +02:00
JC Brand
c5f2c88f84 Revert "Use the bigint shipped with newest otr.js" 
This reverts commit a7247a7c6d.
 2014-08-04 23:00:01 +02:00
JC Brand
a7247a7c6d Use the bigint shipped with newest otr.js 2014-08-04 22:37:55 +02:00
JC Brand
2ff7061ea2 jquery.tinysort is no longer used. 2014-08-04 20:18:51 +02:00
JC Brand
8c20388ba9 Merge branch 'groups-refactor' 
Conflicts:
	index.html
 2014-08-04 20:15:45 +02:00
JC Brand
539bd2db10 Fixed some problems with rendering roster contacts 2014-08-03 23:55:20 +02:00
JC Brand
3984aadb9f More work (with tests) on showing roster items under groups. 
updates #83
 2014-07-29 19:53:57 +02:00
JC Brand
482d09777c Fix width for pending and requesting contacts 2014-07-23 18:25:26 +02:00
Stefan Schoettelndreyer
86c250f325 add 'zh'-locale to fix build task 2014-07-21 15:34:28 +02:00
JC Brand
e1a19678ad Allow group headings to be toggleable. updates #83 2014-07-20 19:11:34 +02:00
JC Brand
04d2b3aefd Some initial refactoring to support roster groups. updates #83 
Made sure that the non-group usecase is still covered.
 2014-07-19 23:45:21 +02:00
JC Brand
a338ede0d1 Replace accept/decline buttons with font icons 2014-07-19 14:50:25 +02:00
JC Brand
6bded11304 Add connection feedback on the controlbox. 
Now that the toggle is hidden when the controlbox is visible.
 2014-07-14 20:41:26 +02:00
JC Brand
c5ae10d962 Make an extra build specifically for including the website deps 2014-07-06 16:10:27 +02:00
JC Brand
9d84ede2f9 Two website deps (jquery-easing & bootstrap) now managed by bower 2014-07-06 15:56:44 +02:00
JC Brand
166b3bd003 Increase the clickable area for restoring a minimized chat 2014-07-06 12:40:50 +02:00
JC Brand
8aedc3fcf7 Integrate backbone.browserStorage. Fixes #176 
Data is now by default cached in sessionStorage and not localStorage.
Can be configured via the "storage" option.
 2014-06-30 18:53:58 +02:00
JC Brand
d0411dfb81 Add settings for mustache-like variable interpolation 2014-06-30 14:55:43 +02:00
JC Brand
7e95d3d01d Work on getting a working build for 0.8 2014-06-29 20:49:22 +02:00
JC Brand
27cce2c229 Refactor to store number of unread messages 2014-06-29 15:59:39 +02:00
JC Brand
0d3977d3d4 Remember the state of the minimized chats toggle 2014-06-14 20:32:45 +02:00
JC Brand
7d6595435e Add the logic for toggling minimized chats 2014-06-11 22:01:18 +02:00
JC Brand
ef9fd9617d Fix rendering of minimized chatrooms 2014-06-02 04:47:23 +02:00
JC Brand
afcb49b6b6 Show the consolidation in the mockup. 2014-06-01 20:56:58 +02:00
JC Brand
6e5bf44ada This branch marks the start of a significant conceptual change. 
Instead of differentiating between trimmed chats and minimized chats, the two
are now combined into the same thing.

This commit contains some initial work, but functionality is still impaired.
 2014-06-01 20:09:09 +02:00
JC Brand
81f3814e32 Refactor code out into backbone.overview 2014-06-01 15:28:52 +02:00
JC Brand
ad51e1c0f7 More working on trimming chats. (still very buggy) 
More flesh on the view and superview for trimmed chats.
Add event handlers.
Renamed some methods to make them shorter, more consistent.
 2014-05-27 18:34:22 +02:00
JC Brand
2d237f9e6d More work on trimming chat boxes. 
Added a view for trimmed chat boxes and a super-view for keeping track of them.
 2014-05-27 09:57:06 +02:00
JC Brand
c05c2ee991 Add trimmed chats to templates 2014-05-13 09:26:13 +02:00
JC Brand
0b10ad00fd Some initial work on adding trimmed chat functionality 2014-05-11 20:45:28 +02:00
JC Brand
9b3601314e Add a new toolbar button to clear chat messages 
Configuration options have changed a bit.

show_emoticons and show_call_button are now removed. Instead the toolbar is
configured via a new config option: "visible_toolbar_buttons".
 2014-04-24 18:10:04 +02:00
Greg Tam
72f95b3ae1 fixed dependencies 2014-04-21 12:25:24 -07:00
JC Brand
bf6474ff6d Upgrade jquery to 1.11.0 and add jquery.browser 2014-04-19 01:52:44 +02:00
JC Brand
7d472eb26d Add new dependency moment.js 
Use it to better compare dates when trying to determine whether a message falls
on a different day.

Also upgraded some dependencies' versions.
 2014-04-19 01:30:48 +02:00
JC Brand
909f78503e Show "refresh" instead of "start" when already encrypted. 2014-03-09 13:31:43 +02:00
JC Brand
bb0f49cf4d Add a counter to show unread msgs when chat is minimized 2014-03-09 13:31:01 +02:00
JC Brand
9849daacf9 Merge branch 'master' into 0.8 
Conflicts:
	bower.json
	converse.js
	docs/CHANGES.rst
	spec/chatbox.js
	tests/utils.js
	tests_main.js
 2014-03-09 08:18:00 +02:00
JC Brand
9b3af57d13 Release version 0.7.4 2014-03-05 08:44:01 +02:00
JC Brand
4f2125c20e Simplified by setting height via template, not JS 
Also dropped the minimum height restriction
 2014-03-01 01:57:20 +02:00
JC Brand
7d58d856b8 Save chat box's toggle state between page loads. 2014-03-01 01:57:20 +02:00
JC Brand
1ce7620b88 Merge remote-tracking branch 'origin' into 0.8 
Conflicts:
	converse.js
	docs/CHANGES.rst
	index.html
 2014-02-23 02:54:35 +02:00
JC Brand
319a955f65 Add code that allows resize by click+drag. 
Removed dragresize.js and instead wrote new much smaller and simpler code
in converse.js.
 2014-02-22 23:20:36 +02:00
JC Brand
3687631d2c Refactored, simplified and removed unused code. 2014-02-20 12:40:03 +02:00
JC Brand
fb1ed29c8f Bump release to version 0.7.3 2014-02-12 14:41:56 +02:00
JC Brand
12fc286ca6 Various changes, see below: 
- disable drag resizing when chatboxes are minimized.
- refactored chat box and chat room markup so that they are more similar.
- don't make the chat box title clickable if no vcard URL is available
- make only the title text clickable, not the whitespace
- fixed toggling of resized chats
 2014-01-27 02:26:55 +02:00
JC Brand
62f6997a25 Chat boxes and rooms can now be resized vertically 
The new size is not stored/persisted.
 2014-01-23 00:55:52 +02:00
JC Brand
d2358a6a93 Controlbox and its toggle are now mutually exclusive. 
When the one is visible, the other is hidden and vice versa.
 2014-01-22 23:19:45 +02:00
JC Brand
0bc40eed25 Start updating the templates with the new markup 2014-01-22 20:44:47 +02:00
JC Brand
18cacdc94b More templates refactored into separate files. 2014-01-19 11:22:56 +02:00
JC Brand
feb81a02f3 Move more templates out into separate files. 2014-01-19 06:37:55 +02:00
JC Brand
55b9a4e568 Initial support for external HTMl templates. Updates #77 2013-12-31 01:07:11 +02:00
JC Brand
e729471bbf Event emitting code. Updates #48 
Include the event emitting code in converse.js itself and start emitting events.

Still needs tests and to be thoroughly tested manually.
Still needs docs.
 2013-12-15 16:58:46 +02:00
JC Brand
c6e57c0051 Add jquery.eventemitter 2013-12-15 15:51:12 +02:00
JC Brand
512a463750 Create 3 different builds. 
* converse.min.js
* converse-no-otr.min.js (Without OTR encryption)
* converse-no-locales-no-otr.min.js (Without OTR encryption or any translations)
 2013-11-17 16:55:38 +02:00
JC Brand
d1d896a3be HAS_CRYPTO was actually checking for the opposite 2013-11-16 11:52:45 +02:00
JC Brand
36c3a21036 Patch bigint.js so that it doesn't throw an error when a CSPRNG is not present 
Instead, we'll check for it in converse.js and just disable OTR if it's not
there.
 2013-11-15 23:33:54 +02:00