Commit Graph

2052 Commits

Author SHA1 Message Date
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