JC Brand
5e853d5d30
Use fork of strophe.js which includes already built file.
...
Instead of having to build it manually in a Grunt/Makefile step.
Clean up the Makefile a bit as well.
Conflicts:
Makefile
2014-03-17 22:40:29 +02:00
JC Brand
3cfcb2ae34
2 controlbox bugfixes and spec typo.
...
* Save controlbox to containing collection
* Call refreshWebkit after closing controlbox
2014-03-15 05:52:00 +02:00
JC Brand
7e0bb8b11a
Delete icon must appear on same line as pending contact
2014-03-15 05:49:11 +02:00
JC Brand
fae9b84577
Bugfix: undefined template and a typo
2014-03-15 05:49:11 +02:00
JC Brand
6290f954a7
Add toggle test for chatrooms
2014-03-14 21:35:43 +02:00
JC Brand
b552b885f0
Add MakeFile target for setting up dev env.
2014-03-14 21:01:39 +02:00
JC Brand
ad4d959df5
Use my fork of requirejs-tpl since jfparadis isn't merging my changes
2014-03-14 20:16:31 +02:00
JC Brand
5282ae25fe
Delete icon must appear on same line as pending contact
2014-03-09 17:02:03 +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
8001444a1c
Add another URL test with double quotes.
2014-03-09 05:51:21 +02:00
JC Brand
77e6c0a490
Two more typos
2014-03-05 09:02:56 +02:00
JC Brand
5e8b61858c
Fix release version typo
2014-03-05 08:51:24 +02:00
JC Brand
9b3af57d13
Release version 0.7.4
2014-03-05 08:44:01 +02:00
JC Brand
74779afd66
Ensure that URLs in messages are properly escaped
2014-03-05 08:03:52 +02:00
JC Brand
34fa05888d
Add (currently still disabled) test for...
...
message counter for minimized chats
2014-03-05 02:10:29 +02:00
JC Brand
25cc229019
Refactor message handling
...
- use the same method for both normal and OTR messages
- fix /me actions for OTR messages
- rename messaging methods to minimize ambiguity
Conflicts:
converse.js
tests/utils.js
2014-03-05 01:46:19 +02:00
JC Brand
317ab95cd8
Refactor message handling
...
- use the same method for both normal and OTR messages
- fix /me actions for OTR messages
- rename messaging methods to minimize ambiguity
2014-03-05 01:23:45 +02:00
JC Brand
c38e4f1c81
Properly define the crypto dependencies. Fixes #125
2014-03-05 00:38:47 +02:00
JC Brand
2094ca1207
Properly define the crypto dependencies. Fixes #125
2014-03-04 22:42:21 +02:00
JC Brand
c2b7caaedf
Add a test for chatbox toggling.
2014-03-04 20:16:39 +02:00
JC Brand
ec39e6e802
Emit new event onChatBoxToggled
2014-03-04 20:16:03 +02:00
JC Brand
b14538b441
Rename ChatBoxesView to ChatBoxViews
2014-03-04 15:54:36 +02:00
JC Brand
1567b212c3
Add closure get/set methods for rosteritem views
2014-03-04 15:49:02 +02:00
JC Brand
d20ca10638
Add closured get/set methods for views from chatboxesview
2014-03-04 15:09:16 +02:00
JC Brand
ac0042fdf9
Extend the "close chat" test with a normal chatbox usecase
2014-03-04 13:22:49 +02:00
JC Brand
c030494ef0
Fix tests and simplify code for showing controlbox
2014-03-01 08:21:36 +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
891f291c32
Add new mockup specifically for minimized chats
2014-03-01 01:57:20 +02:00
JC Brand
6a421af9a1
Give the controlbox toggle same margin as chat boxes.
...
... and remove dragresize stuff from the mockup
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
8294162f9d
Store and maintain a chatbox's custom size.
2014-03-01 01:57:20 +02:00
JC Brand
11b59b31d3
Fix tests after all the refactoring...
2014-03-01 01:57:20 +02:00
JC Brand
b9cf79505a
use new CryptoJS repo since the old one was removed.
...
Conflicts:
bower.json
tests_main.js
2014-02-28 09:45:10 +02:00
JC Brand
085234f9e8
use new CryptoJS repo since the old one was removed.
2014-02-28 04:08:09 +02:00
JC Brand
8feeb73320
Fix webkit bug that prevents boxes from reordering when one is closed
2014-02-23 05:49:30 +02:00
JC Brand
0414fa02c2
Add some resistance around chatbox's original height when resizing
2014-02-23 03:38:26 +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
839dd0bd7e
Fix BOSH url
2014-02-23 01:15:05 +02:00
JC Brand
0cffd78ff1
Get ready to release 0.7.3 of converse.js
2014-02-23 01:11:35 +02:00
JC Brand
8a628f48ca
Update Hebrew translations with changes from PO file. Fixes #124
2014-02-23 01:01:11 +02:00
JC Brand
7de769fd78
Merge pull request #124 from GreenLunar/patch-1
...
Hebrew translation update
2014-02-24 05:52:50 +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
GreenLunar
8b166d0f06
Hebrew translation update
...
Fix minor typing errors
2014-02-21 06:11:33 +02:00
JC Brand
3687631d2c
Refactored, simplified and removed unused code.
2014-02-20 12:40:03 +02:00
JC Brand
f6e5b07729
Added a section to the documentation concerning OTR
2014-02-12 19:32:25 +02:00
JC Brand
fb1ed29c8f
Bump release to version 0.7.3
2014-02-12 14:41:56 +02:00
JC Brand
4190727c6e
Mention mailing list in README and update HTML docs.
2014-02-12 13:03:44 +02:00
JC Brand
94c135a6d8
Merge branch 'otr-by-default' of git://github.com/Aupajo/converse.js into Apajo-otr-by-default
...
Conflicts:
converse.js
Fixes #102
2014-02-12 12:52:57 +02:00