Commit Graph

1120 Commits

Author SHA1 Message Date
JC Brand
cf4cec1e29 Refactored sendMessage
Let the message only be sent when an event has been triggered.
This allows us to first (if necessary) let OTR process the image.
2013-08-16 16:05:24 +02:00
JC Brand
a2aeec8449 Add initial OTR code.
- /otr will generate a new private key (or fetch it from storage).
2013-08-16 15:48:23 +02:00
JC Brand
57fc8b9832 Merge branch 'master' into otr
Conflicts:
	docs/html/_static/stylesheet.css
	docs/html/searchindex.js
2013-08-16 11:28:34 +02:00
JC Brand
fc4bec1e9c Regenerated docs 2013-08-16 11:27:29 +02:00
JC Brand
cac9d9c55e Mention debug option in docs 2013-08-16 11:25:58 +02:00
JC Brand
ed7905d10e Padding tweaks 2013-08-16 11:20:19 +02:00
JC Brand
fadae7a453 Restyle chat toolbar and add more icons 2013-08-15 22:50:13 +02:00
JC Brand
74cc8ceead Add two toolbar buttons for the send message textarea 2013-08-15 21:22:14 +02:00
JC Brand
72d0f566fc Merge branch 'master' into mockup 2013-08-15 20:47:50 +02:00
JC Brand
cf161a729a Add contacts regardless of how getVCard failed 2013-08-15 20:47:19 +02:00
JC Brand
66b92fedcb Add debug option explicitly 2013-08-15 20:43:39 +02:00
JC Brand
c43c34013b Add font icon required changes for chatrooms. 2013-08-15 20:36:06 +02:00
JC Brand
414553ef57 Better icon class name 2013-08-15 20:35:44 +02:00
JC Brand
f846e70c10 Merge branch 'master' into mockup 2013-08-15 20:34:04 +02:00
JC Brand
7e0f538029 Bugfix. removeRoom doesn't exist anymore 2013-08-15 20:33:42 +02:00
JC Brand
15ed513345 Start making the markup changes required for the font icons 2013-08-15 20:14:00 +02:00
JC Brand
1036fc12d9 Put icon inside link 2013-08-15 20:13:50 +02:00
JC Brand
359dbc68f7 Merge branch 'master' into mockup 2013-08-15 19:36:46 +02:00
JC Brand
a9c1978804 Rename icon classes to match chat states 2013-08-15 19:36:19 +02:00
JC Brand
44d094f56f Add a debug option (logs to browser console) 2013-08-15 19:34:40 +02:00
JC Brand
53359b7ddc Register presence and message handlers before getting the roster
Otherwise some presence notifications might be lost
2013-08-15 19:30:33 +02:00
JC Brand
9b9bf1ce89 Fix markup 2013-08-15 19:30:33 +02:00
JC Brand
ae0c561d88 Indentation 2013-08-15 18:32:07 +02:00
JC Brand
c32f4bb171 Replace fonticons. Tweaked offline and busy fonts 2013-08-15 18:30:12 +02:00
JC Brand
ae96dc1e64 Merge branch 'master' into mockup
Conflicts:
	docs/html/_static/stylesheet.css
	docs/html/searchindex.js
2013-08-15 18:01:26 +02:00
JC Brand
a5051f0061 Fix markup 2013-08-15 17:58:28 +02:00
JC Brand
d55c608552 Merge pull request #36 from HaNdTriX/patch-1
Update bower.json
2013-08-13 03:26:44 -07:00
HaNdTriX
fd6fdd748d Update bower.json
The version specified in the bower.json of package converse mismatches the tag (0.5.2 vs 0.5.0)
2013-08-13 12:06:58 +02:00
JC Brand
af1a08e9b6 Docs are more stable and featured now. 2013-08-13 11:29:56 +02:00
JC Brand
867d42fdfd Update .gitignore 2013-08-13 11:25:45 +02:00
JC Brand
5be5428ca7 Remove pickle, which causes many merge errors 2013-08-13 11:23:04 +02:00
JC Brand
30b61fb40a Add info on facebook integration 2013-08-13 11:19:40 +02:00
JC Brand
b79c12e8a1 Mockup tweaks 2013-08-12 22:10:01 +02:00
JC Brand
fadbb7757d Turns out sprite_download.png is being used 2013-08-12 22:04:16 +02:00
JC Brand
b03ee33a88 Remove unused images (replaced with fonticons) 2013-08-12 22:03:27 +02:00
JC Brand
84f4e47127 More tweaks and fixes 2013-08-12 21:32:00 +02:00
JC Brand
62534bf73d mockup: configure close and configure buttons 2013-08-12 21:07:35 +02:00
JC Brand
f23e480baf Remove more images with fonticons 2013-08-12 20:52:30 +02:00
JC Brand
9976085e3e Remove unused sprite files 2013-08-12 20:52:11 +02:00
JC Brand
4e606b3510 Mockup: add chatroom with error, fix box heights. 2013-08-12 20:10:12 +02:00
JC Brand
e2c11bf19f More mockup work.
- Added requesting contacts.
- Fix contact width on hover.
- Add tooltips for status icons
2013-08-12 19:22:43 +02:00
JC Brand
7f7bdbb5fc Extend docs with info on the HTML snippet converse expects. updates #31 2013-08-12 10:37:13 +02:00
JC Brand
3e16256a71 More work on the mockup. Add js to switch tabs 2013-08-11 14:38:40 +02:00
JC Brand
39665516a1 Darker font colors 2013-08-10 09:04:13 +02:00
JC Brand
e01dc0398d Give proper names and tweak font colors 2013-08-09 23:30:59 +02:00
JC Brand
cb5a75d310 Tweak contact status fonticon 2013-08-09 23:20:50 +02:00
JC Brand
396e54c0a7 fixed markup for 'add a contact' 2013-08-09 23:16:46 +02:00
JC Brand
b1f32df9b6 Add mockup.html 2013-08-09 20:26:30 +02:00
JC Brand
861887fd77 Initial markup, testing out font icons 2013-08-09 20:25:21 +02:00
JC Brand
e268681541 Add font icon set from IcoMoon 2013-08-09 19:23:08 +02:00