Commit Graph

4777 Commits

Author SHA1 Message Date
JC Brand
042c1947ed Add file-upload button 2018-04-14 07:40:07 +02:00
JC Brand
a9d2881888 Fix disco hierarchy
Previously we kept all entities and their items (which are also
instances of _converse.DiscoEntity) in a flat array.

Instead, we should have a tree-like structure where items are stored
on the relevant entity (and recursively on other items).
2018-04-14 07:36:24 +02:00
JC Brand
77a51cc2a6 Initial work on XEP-0363: HTTP File Upload 2018-04-14 07:36:24 +02:00
JC Brand
d278a02778 General cleanup 2018-04-14 07:34:50 +02:00
JC Brand
2487d4d001 Merge branch 'httpFileUpload' of https://github.com/worlword/converse.js into worlword-httpFileUpload 2018-04-14 07:29:19 +02:00
JC Brand
24d55d6cbd Remove reference to inverse.min.js and fix tables 2018-04-13 20:22:58 +02:00
worlword
3b1d27636d problem fixed, that file-upload would not start. Also did some code cleanup 2018-04-13 11:45:43 +02:00
worlword
ca40cf6541 removed EmptyLines in ChatView.js and Change Lineendings to LF in toolbar_fileUpload.html 2018-04-12 09:37:58 +02:00
worlword
bf3e6f2363 some code-changes to align with the coding standard 2018-04-12 09:24:41 +02:00
worlword
7660dbfb31 merge httpFileUpload-Branch with master 2018-04-12 07:43:39 +02:00
Nÿco
2ec0dd752f Contributing 3 characters (#1067)
If "inVerse" is renamed to "fullscreen" then "inVerse" in the fullscreen.html file should be renamed to "Converse"?
2018-04-11 18:47:36 +02:00
JC Brand
3d29567ab6 Revert "Don't show typing from different device CSN messages"
This reverts commit 7303e96cdb.

Instead of dropping the feature entirely, we can check if the CSN is a
carbon message.
2018-04-11 18:46:50 +02:00
worlword
c9a9d01112 used code from 'http-file-upload' branch. Buttons are now added to the toolbars through converse-http-file-upload.js. 2018-04-11 17:09:32 +02:00
worlword
fa80749658 refactoring based on the review from jcbrand 06.Apr.2018 2018-04-11 15:29:41 +02:00
worlword
fa101d05c3 added tests from http-file-upload-Branch 2018-04-11 07:52:53 +02:00
JC Brand
0a757a25e7 Fixes #1059 Remove bottom borders, uppercase titles and tweak padding 2018-04-10 21:23:32 +02:00
JC Brand
7303e96cdb Don't show typing from different device CSN messages
To avoid showing them erroneously would mean keeping track of used
message ids which seems like more work than justified by the feature.

Fixes #1026
2018-04-10 20:56:54 +02:00
JC Brand
3d0435a755 Remove hack specific to the soon to be retired Slack XMPP gateway 2018-04-10 20:56:40 +02:00
JC Brand
eddc359a64 Fix height and padding for minimized chats toggle 2018-04-10 20:55:47 +02:00
JC Brand
9528d81c00 Move various MUC methods onto the Backbone.Model
To more cleanly separate views and models and to make MUC in headless
mode more viable.

Refs #1032
2018-04-10 18:59:02 +02:00
Kim Alvefur
a82f950e3c Put timestamp in a <time> tag for better semantics and easier styling 2018-04-07 21:47:22 +02:00
JC Brand
b0c22d983c Rename inverse.html to fullscreen.html 2018-04-07 08:33:28 +02:00
JC Brand
c3275d91b3 No need for font-awesome. Fix path 2018-04-06 22:28:55 +02:00
JC Brand
9a19d6f446 Use local files to serve the fullscreen version 2018-04-06 22:26:32 +02:00
JC Brand
9a526d4194 Refactoring of the XEP-0085 Chat State Notifications code
* Distinguish between CSN messages and other types of messages
* Properly clear previous notifications
* Better handling of notifications from multiple users (in MUC)
* Rename methods to make clarify intent
2018-04-06 17:02:28 +02:00
JC Brand
e961fb5129 Update changelog and re-add CSS files 2018-04-06 10:01:27 +02:00
worlword
258029457f Removed dist-files from pull request 2018-04-05 08:48:20 +02:00
worlword
7839f20846 fixed sendMessage for so that tests will work again 2018-04-05 08:45:58 +02:00
worlword
76d6b94703 changed testcase for toolbar. now expects 3 buttons instead of 2 2018-04-04 16:41:20 +02:00
worlword
83c0d42ecf changed line-endings in converse-httpFileUpload.js 2018-04-04 16:03:44 +02:00
worlword
530e7f9d3f fixed file-upload-button in MUC and added changes.md entry 2018-04-03 12:29:12 +02:00
worlword
b23712aec3 added httpFileUpload to converse.js 2018-04-03 11:20:57 +02:00
JC Brand
e31373a6ae Fixes #1055 Wrong paths in build.js 2018-03-31 19:51:55 +02:00
ChaosKid42
fce9ee0db9 replace geoURIs (e.g. from Convesations) by links to openstreetmap (#1054)
* replace geoURIs by link to openstreetmap

* Added testcase
2018-03-31 18:29:01 +02:00
Richard Fairthorne
8504722172 utf-8 info in changes file. 2018-03-31 15:59:09 +02:00
Richard Fairthorne
6bbbe8a393 add utf-8 tag so minified build will load on all platforms 2018-03-31 15:59:09 +02:00
JC Brand
44a2f7807c Hook in ar and eu locales and document. 2018-03-31 15:45:23 +02:00
JC Brand
6381128a5f Test was failing due to file rename 2018-03-30 15:41:09 +02:00
JC Brand
b39429b229 Bump timeouts to try and avoid unnecessary test failures on Travis 2018-03-30 15:25:31 +02:00
Emmanuel Gil Peyrot
b765f31cec Remove older PNG logos 2018-03-30 14:59:32 +02:00
Emmanuel Gil Peyrot
2267c8459d Add rules to generate PNG logos 2018-03-30 14:59:32 +02:00
Emmanuel Gil Peyrot
8efcbeabb0 Fix make help’s unclosed strings 2018-03-30 14:59:32 +02:00
Emmanuel Gil Peyrot
b56e816ad9 Rename the transparent SVG file 2018-03-30 14:59:32 +02:00
Emmanuel Gil Peyrot
8295fd8391 Add a SVG file with a white background 2018-03-30 14:59:32 +02:00
Emmanuel Gil Peyrot
bd6baf8316 Simplify the SVG logo 2018-03-30 14:59:32 +02:00
JC Brand
c9ce440219 Regenerated pot, po and json files 2018-03-30 14:37:05 +02:00
JC Brand
fd4c181fb2 Use https for wikisuite.org
They don’t have an automated redirection, nor HSTS preload, so it is
better to directly point to the HTTPS version of their website.

Thanks to @linkmauve
2018-03-30 14:34:53 +02:00
JC Brand
a3b008111c Merge remote-tracking branch 'remotes/weblate/master' 2018-03-30 14:24:08 +02:00
JC Brand
cd738735b4 Update Plone integration link to collective.converse 2018-03-30 14:23:40 +02:00
JC Brand
ebfd0a8f77 Move various funcitons related to MUC member lists to utils
and out of the MUC views plugin.

Refs #1032
2018-03-30 14:23:39 +02:00