21df33993b
Remove extraneous whitespace after git hash.
2017-01-03 21:17:30 +00:00
430c4b1536
Merge branch 'printline' into 'master'
...
print_conversation_line() refactoring
See merge request !3
2017-01-03 21:20:32 +01:00
d129abbed6
Catch exceptions on invalid URLs
...
Closes #8494
Conflicts:
src/common/helpers.py
2017-01-03 20:17:14 +01:00
39216af2de
print_conversation_line() refactoring
...
It now orders all messages with the given timestamp
this also includes inserting messages at the correct
point
The timestamp precision for incoming and outgoing messages
was raised to include fractions of a second
2017-01-02 19:09:06 +01:00
5716efde68
Merge branch 'fix-backslashes' into 'master'
...
Make sure strings don’t contain unescaped backslashes
See merge request !15
2017-01-01 22:50:51 +01:00
03446bb74f
Make sure strings don’t contain unescaped backslashes.
2017-01-01 21:48:44 +00:00
4bc6f19f19
Merge branch 'python3-fix' into 'master'
...
Fix python2-ism in configure.ac
See merge request !14
2017-01-01 22:42:46 +01:00
aab2451507
Fix python2-ism in configure.ac.
2017-01-01 21:41:10 +00:00
7db6211230
don't install README.html anymore
2016-12-31 13:23:10 +01:00
6da03e09b5
Merge branch 'master' of dev.gajim.org:gajim/gajim
2016-12-30 00:54:48 +01:00
3409a40cdd
get git version when running configure
2016-12-30 00:54:33 +01:00
b76b089790
Update .gitignore
2016-12-29 13:56:50 +01:00
2a0c58c94b
Update and rename README files
2016-12-29 13:56:05 +01:00
f274322820
Update appveyor build files
2016-12-28 18:06:39 +01:00
c52046f565
Merge branch 'formatting-menu' into 'master'
...
Make the formatting menu declarative.
See merge request !10
2016-12-24 09:01:39 +01:00
8212bc250b
Merge branch 'use-glib-directories' into 'master'
...
Use GLib to retrieve the pictures directory.
See merge request !12
2016-12-24 08:50:35 +01:00
bd07478574
Use GLib to retrieve the pictures directory.
...
Also remove an unused function.
2016-12-24 04:58:30 +01:00
c1c2a5162c
Replace formatting button with declarative menu.
...
This prevents Gajim from having to regenerate the menu everytime it is
clicked on.
2016-12-24 02:51:55 +01:00
db2b6e5ee5
Apply automatic changes from glade 3.20.
2016-12-24 02:49:59 +01:00
b43811df88
Fix getting commit hash for version info
2016-12-23 20:52:24 +01:00
f15497b0c0
Merge branch 'master' of dev.gajim.org:gajim/gajim
2016-12-23 15:21:03 +01:00
ac4859fb87
Remove unused imports
2016-12-22 18:19:24 +01:00
c48f0419f2
Merge branch 'master' of dev.gajim.org:gajim/gajim
2016-12-18 04:22:08 +01:00
458d1083bc
do not list all keys when we want to know if we have a key. Fixes #8477
2016-12-17 14:06:36 +01:00
d9efb31b2e
don't crash when gnupg doesn't have a status attribute.
2016-12-17 13:32:35 +01:00
58341e9742
correctly check if python-gnupg is installed
2016-12-17 13:31:37 +01:00
55eaf70f9f
Correctly search for chat_control when message receipts are received (XEP-0184) and chat_control is not currently bound to a session
2016-12-16 21:53:51 +01:00
638843ba08
Fix Author list
2016-12-14 13:40:44 +01:00
46cd1a3c53
Add keyring dependency to windows build
2016-12-11 17:22:45 +01:00
82cfcbff8b
Merge branch 'keyring' into 'master'
...
Store passwords in Windows Credential Vault Fixes #8367
See merge request !4
2016-12-11 15:37:51 +01:00
9d13631731
Store passwords in Windows Credential Vault
2016-12-11 01:20:16 +01:00
995a154c59
Remove gnupg from our sources and optionnaly depend on it. Fixes #8475
2016-12-10 17:32:04 +01:00
197f910757
Add time string to appveyor.yml
2016-12-10 11:35:22 +01:00
7a2cbcf5bc
Merge branch 'master' into 'master'
...
Add Deployment Setting to appveyor.yml
See merge request !2
2016-12-10 00:49:22 +01:00
6a369702f8
Add Deployment Setting to appveyor.yml
2016-12-10 00:45:58 +01:00
deab82aa46
Merge branch 'master' into 'master'
...
Master
See merge request !1
2016-12-09 18:32:35 +01:00
fc0be965f5
Remove demandimport
2016-12-09 18:19:39 +01:00
acc5baf353
Update AUTHORS
2016-12-09 18:17:43 +01:00
80e0f8a425
Add .gitignore
2016-12-09 18:16:06 +01:00
7db4d6c0cb
Update files for appveyor Windows build
2016-12-08 21:52:35 +01:00
dba7210bc3
Update README.md
2016-12-06 10:30:40 +01:00
080876fbff
Update README
2016-12-05 21:05:12 +01:00
6e26bee460
Update README
2016-12-05 21:03:57 +01:00
7b3d595665
fix time.time() call. Fixes #8446
2016-11-28 22:23:42 +01:00
471329a0e0
prevent too long tooltips. Fixes #8465
2016-11-28 21:52:40 +01:00
ab0a98ac3b
[SaltyBones] Updated German translation
2016-11-28 21:09:40 +01:00
f1ce214596
Fixed c&p error
2016-11-28 17:33:12 +01:00
6fbb4ce6cb
fix sending zeroconf messages
2016-11-24 22:44:52 +01:00
25fb8c9a3a
don't crash when we get a wrong feature negotiation form
2016-11-24 22:42:33 +01:00
6d03af9dee
Fix wrong label in preferences.
2016-11-21 21:46:59 +00:00
Emmanuel Gil Peyrot
Philipp Hörist
Yann Leboulanger
Thilo Molitor
Simon Friedberger