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
2a83d557d1
Order Makefile a bit more and bump release number
2014-04-18 17:47:47 +02:00
JC Brand
b88113c246
Fixed some failing tests.
...
Some of the tests were failing because they didn't expect the controlbox to be
returned from localStorage.
It's too long ago that I've looked at this branch for me to say whether this is
a legitimate bug or not.
Will have to investigate further.
2014-04-18 17:42:35 +02:00
JC Brand
53a8f288bc
Better phantomjs test runnning and reporting
...
* Use phantom-jasmine instead of jasmine-reporters
* Update Makefile to use the test runner from phantom-jasmine
* Use newest phantomjs
* Use latest bower
* Turn of jquery effects when testing
2014-04-18 17:41:59 +02:00
JC Brand
a9da15bb2f
New BOSH service address
...
Conflicts:
docs/doctrees/index.doctree
docs/html/_sources/index.txt
docs/html/index.html
docs/html/searchindex.js
2014-04-09 17:24:37 +02:00
JC Brand
01d8047fc2
Mention that git is needed
...
Conflicts:
docs/source/index.rst
2014-04-09 17:23:44 +02:00
JC Brand
8aa975c4a3
Formatting
...
Conflicts:
CONTRIBUTING.rst
2014-04-09 17:20:31 +02:00
JC Brand
ce7a3b3ff5
Update contribution guidelines to mention mailing list
...
Conflicts:
CONTRIBUTING.rst
2014-04-09 17:05:11 +02:00
JC Brand
e6cff4e807
New BOSH service address
2014-04-09 17:03:04 +02:00
JC Brand
ee6a30b495
Mention that git is needed
2014-04-04 09:01:40 +02:00
JC Brand
f4ab194c21
Merge branch 'master' of github.com:jcbrand/converse.js
...
Conflicts:
CONTRIBUTING.rst
2014-04-04 04:57:09 +02:00
JC Brand
597cf6625a
Formatting
2014-04-04 04:56:07 +02:00
JC Brand
e9d31ce62a
Update contribution guidelines to mention mailing list
2014-04-04 04:52:25 +02:00
JC Brand
df599238f8
Update contributors text, readme and add new license (MPL)
2014-03-22 02:11:34 +02:00
JC Brand
7dfdd085a0
Merge branch 'master' of github.com:jcbrand/converse.js
2014-03-21 23:21:33 +02:00
JC Brand
d5a41e1739
Clean up readme
2014-03-21 23:20:55 +02:00
JC Brand
aef2db82aa
Clean up readme
2014-03-18 03:12:47 +02:00
JC Brand
8e12e230a0
Clean up readme
2014-03-18 03:12:25 +02:00
JC Brand
17a05ce801
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.
2014-03-17 22:41:21 +02:00
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
