Commit Graph

3395 Commits

Author SHA1 Message Date
JC Brand
f43084861e Remove references to bower in docs 2017-02-16 15:39:52 +01:00
JC Brand
0a7a35372f renamed: non_amd.html -> demo/without_bundled_dependencies.html 2017-02-16 15:39:11 +01:00
JC Brand
29ddf0b4db CSS: fix line heights 2017-02-16 14:42:50 +01:00
JC Brand
d8b2813feb Use local files for non_amd.html 2017-02-16 14:27:00 +01:00
JC Brand
a2081d656c Add shim for awesomplete 2017-02-16 14:26:48 +01:00
JC Brand
026bb0cdde The wrong fontawesome was being used 2017-02-16 14:12:16 +01:00
JC Brand
e7670a780a remove bower stuff from makefile 2017-02-16 13:02:09 +01:00
JC Brand
4a37c6940b Use individual strophe plugins instead of entire repo 2017-02-16 13:02:09 +01:00
JC Brand
16688ebe1c Install fontawesome via NPM and remove last bower stuff 2017-02-16 12:03:56 +01:00
JC Brand
8b19ba51e8 Use NPM to install bourbon 2017-02-16 11:50:31 +01:00
JC Brand
bf7add78a3 Get the non-bundled example to work again. 2017-02-16 11:33:22 +01:00
JC Brand
53468800bd Install and use bootstrap via NPM 2017-02-16 11:33:00 +01:00
JC Brand
9218d649e9 Bugfix. Avoid infinite recursion (used wrong model). 2017-02-16 11:17:38 +01:00
JC Brand
65fa39dd81 Properly fix and test the /me command 2017-02-15 21:03:02 +00:00
JC Brand
a033899946 Fix leaky abstraction of MUC 2017-02-15 20:30:32 +00:00
JC Brand
148516e0cc Fix almond builds. updates #779 2017-02-15 20:01:41 +00:00
JC Brand
61568aca32 The notification option wasn't being used consistently 2017-02-15 19:12:45 +00:00
JC Brand
2a7e19f957 Updated fuzzy af translations 2017-02-15 11:15:03 +00:00
JC Brand
ba9d3c36d5 Refactored converse-otr.js
- Removed password encryption of the key.
  It never properly worked and bloated the build through extra dependencies.
- Store the key and instance tag on the ChatBox model.
2017-02-15 11:15:03 +00:00
JC Brand
fd97edf4f5 Small CSS fix for requesting contacts 2017-02-15 10:20:50 +00:00
JC Brand
70d385bc28 Use AMD-aware cryptojs from NPM. Update to 0.2.16 2017-02-15 10:02:15 +00:00
JC Brand
073a95b7e6 Avoid visibility transience and fix failing test 2017-02-15 07:46:24 +00:00
JC Brand
fbdbea223d Ensure consistent behavior from show_controlbox_by_default 2017-02-14 17:23:22 +00:00
JC Brand
e52a775430 Bugfix. See below.
"TypeError: this.sendConfiguration(...).then is not a function" when a room is created
2017-02-14 16:55:32 +00:00
JC Brand
bc8e3e1a01 Return a Backbone.View object instead of a wrapper
When returning chat boxes via the API.

We can do this now because these API methods are only available to
(whitelisted) plugins.
2017-02-14 15:10:46 +00:00
JC Brand
fe6a9ca748 Merge converse-api and converse-core
Otherwise `require('converse-core')` can be called, exposing the inner converse
object.
2017-02-14 14:35:52 +00:00
JC Brand
d3bdcd865e Fix failing test 2017-02-14 13:39:22 +00:00
JC Brand
495c6060f9 Allow non-roster contacts to be invited to a chatroom. 2017-02-14 14:35:31 +01:00
JC Brand
7b65155d5b Don't show chat-state notifications by default. 2017-02-14 13:00:45 +00:00
JC Brand
33fad75154 Workaround to get tests on phantomjs to pass 2017-02-14 12:52:03 +00:00
JC Brand
fad7d9a868 Update .gitignore to ignore buildout eggs 2017-02-14 12:26:56 +01:00
JC Brand
d2227c8d44 Replace typeahead with awesomplete.
Much smaller library.
No dependence on jQuery.

Updates #779
2017-02-14 12:26:56 +01:00
JC Brand
994c961d9c Add a waitUntil API for promises. 2017-02-14 11:24:20 +01:00
JC Brand
1a0cb07098 Install sinon via npm. Bump version in package.json 2017-02-14 08:21:05 +01:00
JC Brand
3b8431dd7a Revert "Escape interpolated values. Updates #779"
This reverts commit e63607227d.
2017-02-14 07:47:38 +01:00
JC Brand
e6f8648bf0 Install jasmine via npm 2017-02-14 07:47:15 +01:00
JC Brand
e63607227d Escape interpolated values. Updates #779 2017-02-14 07:28:04 +01:00
JC Brand
e8cf903dc0 Small CSS fixes 2017-02-13 17:12:41 +00:00
JC Brand
50c1b99448 Generate new dist files. 2017-02-13 16:16:13 +00:00
JC Brand
e74d2feeae update changelog 2017-02-13 16:12:12 +00:00
JC Brand
54136a9447 Merge branch 'pr/chats_open_attrs' of https://github.com/Ape/converse.js into Ape-pr/chats_open_attrs 2017-02-13 15:26:40 +00:00
JC Brand
d334870d00 Render the login form again upon authfail. 2017-02-13 15:23:26 +00:00
JC Brand
48a3c30e75 i18n locale can now be specified with only the language code 2017-02-13 15:16:16 +00:00
JC Brand
fddcd1c6cf Improved roster filter UX.
Keep the focus in the input after filtering.
Prevent form submission from reloading the page.
2017-02-13 15:07:46 +00:00
JC Brand
f73a1d3fc0 Don't name the modules.
According to the require.js docs this shouldn't be done.
http://requirejs.org/docs/whyamd.html#namedmodules
2017-02-13 14:37:17 +00:00
JC Brand
fd2f1c22e4 Fixes #775 2017-02-13 14:26:59 +00:00
JC Brand
acf0e19d99 Fixes #774 2017-02-13 14:20:16 +00:00
JC Brand
5f67797202 Fixes #749 2017-02-13 14:00:05 +00:00
JC Brand
85f6a75fed Escape user-generated input to avoid injection attacks 2017-02-13 13:41:37 +00:00
JC Brand
bfd3e7f0b6 Bugfix. Show custom status, not chat status. 2017-02-13 12:00:46 +00:00