Commit Graph

2665 Commits

Author SHA1 Message Date
JC Brand
b366bf309b Add Gemfile.lock 2015-06-02 12:03:00 +02:00
JC Brand
d0a0c7f79a The dev-ruby target is replaced with stamp-bundler. 2015-06-01 22:32:25 +02:00
JC Brand
217f3255f7 Sorted the latest changes and combine some. 2015-05-31 14:52:18 +02:00
JC Brand
a77744d867 Two trimChats bugfixes. See below.
- TrimChats was called before a newly maximized chat had its final width which
  prevented it from working as intended.
- We cannot check for available space by using the width of the #conversejs
  element anymore, since it now has variable (auto) width. So we check against
  the body width instead.
2015-05-31 14:50:41 +02:00
JC Brand
f4edf75c72 Bugfix. Fetched chat boxes weren't being shown automatically. 2015-05-31 14:46:12 +02:00
JC Brand
bf61122805 Avoid trying to retrieve non-existing models. fixes #415 2015-05-31 14:39:28 +02:00
JC Brand
e3f20bf1ad Reduce the rightmost margin to 15px instead of 30px. 2015-05-31 13:18:57 +02:00
JC Brand
2ee691fc1f Merge branch 'thierrytiti-icomoon-xa-icon' 2015-05-29 12:00:29 +02:00
JC Brand
15e5df74e0 Merge branch 'icomoon-xa-icon' of https://github.com/thierrytiti/converse.js into thierrytiti-icomoon-xa-icon 2015-05-29 12:00:14 +02:00
JC Brand
7481fab034 Merge branch 'thierrytiti-MUC-toggle-Call' 2015-05-29 10:12:52 +02:00
JC Brand
a412bd92c4 Merge branch 'MUC-toggle-Call' of https://github.com/thierrytiti/converse.js into thierrytiti-MUC-toggle-Call 2015-05-29 10:12:40 +02:00
JC Brand
97ebcb3324 Update list of supported features and XEPs 2015-05-29 10:07:40 +02:00
thierrytiti
85915a6498 Add XA status icon
fonts built with icomoon
2015-05-28 16:55:14 +02:00
JC Brand
66420962f7 Make sure the pong handler is always registered.
47e00ae005
2015-05-28 10:59:10 +02:00
thierrytiti
0745cdeaca toggleCall already inherits from ChatBoxView 2015-05-28 10:31:04 +02:00
JC Brand
47e00ae005 Various bugfixes.
- HAS_CSI might be called before features have been received. Instead, set a
  flag whenever a feature is received and check for that flag.
- Converse.ping was sending stanzas to the bare jid instead of to the domain.
- The handler that updates the date the last stanza was received must return
  true so that it gets called again.
- Only register the Pong handler if Ping is enabled.
- Rename lastMessage to lastStanzaDate to make it more clear.
2015-05-27 21:53:15 +02:00
JC Brand
e0a58efcfa Linting and code formatting.
Also use and add a Strophe namespace for CSI.
2015-05-27 21:49:12 +02:00
JC Brand
c7ce646f6d Mention two new supported XEPs 2015-05-27 20:57:51 +02:00
JC Brand
00e0ffe2ce Merge branch 'thierrytiti-auto-away' 2015-05-27 20:01:30 +02:00
JC Brand
8e5d481e1c Merge branch 'auto-away' of https://github.com/thierrytiti/converse.js into thierrytiti-auto-away
Conflicts:
	converse.js
2015-05-27 20:01:22 +02:00
JC Brand
c4698613ac Merge pull request #414 from thierrytiti/ping-pong
XEP-0199: XMPP Ping
2015-05-27 19:25:32 +02:00
thierrytiti
fb589398ad XEP-0199: XMPP Ping
Use modified StropheJS ping plugin (AMD support)
Add Ping functionality
Add Pong handler

Fix to issue #144:
2015-05-27 18:14:58 +02:00
thierrytiti
f75b3a075a I18N: detect language for MomentJS
user language detection in order to format date and time in correct
locale
2015-05-27 14:29:22 +02:00
JC Brand
7c21341d74 Merge pull request #410 from thierrytiti/offline-status
Offline Pretty Status
2015-05-27 13:52:49 +02:00
thierrytiti
24b204e8a4 Offline Pretty Status
add offline as possible case to enable translation
2015-05-26 18:36:17 +02:00
thierrytiti
7366bb709d MUC: missing toggle Call handler and function
the Call button is visible but no action is done
2015-05-26 16:39:06 +02:00
JC Brand
0e47e72cf4 Merge pull request #407 from thierrytiti/CSS-font-path
CSS: Fonts Path: editable $font-path via sass/variables.scss
2015-05-22 14:20:27 +02:00
thierrytiti
05cc4d714a CSS: Fonts Path: editable $font-path via sass/variables.scss
Add a variable to build CSS with another path for the fonts
import added in  ``sass/converse.scss`` : Undefined variable $font-path
with ``make css``
2015-05-22 13:57:50 +02:00
JC Brand
fc1768d12d Fixes #406.
Call to registerRosterXHandler and registerPresenceHandler on onReconnected give exception.
2015-05-21 17:04:56 +02:00
JC Brand
6afcc0fbe1 Bring lang detect code in line with coding style.
Change html files so that we auto-detect the lang now.
2015-05-20 19:31:59 +02:00
JC Brand
99a017fc8a Merge branch 'thierrytiti-detect_lang' 2015-05-20 19:20:25 +02:00
JC Brand
1d0ffe34ab Merge branch 'detect_lang' of https://github.com/thierrytiti/converse.js into thierrytiti-detect_lang 2015-05-20 19:20:17 +02:00
JC Brand
b08b225308 Merge pull request #405 from thierrytiti/css-fix
Css fixes
2015-05-20 18:43:21 +02:00
thierrytiti
7fb4ad3050 CSS rebuild with sass 2015-05-20 18:27:21 +02:00
thierrytiti
08c94be1b7 CSS Fixes
main div conversejs
- left and width: The last 35px at bottom of the page is not clickable
- right: in some case (e.g. frame in div), the div is over the vertical
scrollbar

room-info:
- wrong placement on hover after information fetched on a room
2015-05-20 17:52:19 +02:00
thierrytiti
a660f853c1 XEP-0352: Client State Indication
XEP-0352 support added to Auto Away Mode
2015-05-20 12:12:08 +02:00
JC Brand
44b13c1da3 Delete unused build files.
These files can still be built by running `make build`. However we remove them
from version control because they bloat the repo, especially diffs of minified
files, which are large.
2015-05-20 09:34:41 +02:00
JC Brand
efae4a7eae Merge branch 'master' into plugins-refactor 2015-05-20 09:30:56 +02:00
JC Brand
61843c2838 Updated JSON file with French translations. 2015-05-20 09:26:32 +02:00
JC Brand
df0222d543 Merge pull request #401 from thierrytiti/French_translation
French Translation
2015-05-20 09:25:09 +02:00
JC Brand
6dcda4ad42 Ensure that roster contact's jids are bare 2015-05-18 11:42:29 +02:00
JC Brand
9db289df86 Bugfix. Automatic anonymous login didn't work if keepalive=false. 2015-05-16 16:28:23 +02:00
JC Brand
6260ba2864 Bugfix. Don't overwrite _super every time an override is made. 2015-05-16 16:27:51 +02:00
thierrytiti
aebd59825c Changelog
French translation
2015-05-15 19:09:12 +02:00
thierrytiti
871336fe56 French Translation 2015-05-15 19:07:45 +02:00
JC Brand
ea687d67f9 Merge branch 'master' into plugins-refactor 2015-05-15 14:48:12 +02:00
JC Brand
3cbb93479f Mention json header. updates #395. 2015-05-15 14:46:09 +02:00
JC Brand
68bcc9d0eb Merge pull request #399 from thierrytiti/bugfixes
Bugfix. fullname is null
2015-05-15 14:41:18 +02:00
JC Brand
2d30689a86 Merge branch 'thierrytiti-Placeholder-for-translation' 2015-05-15 14:39:18 +02:00
JC Brand
96df8dea97 Merge branch 'Placeholder-for-translation' of https://github.com/thierrytiti/converse.js into thierrytiti-Placeholder-for-translation
Conflicts:
	src/templates/toolbar.html
2015-05-15 14:39:02 +02:00