Philipp Hörist
a1d079108e
Merge branch 'remove-demandimport' into 'master'
...
Remove demandimport, which is now unused
See merge request !20
2017-01-04 23:17:32 +01:00
Emmanuel Gil Peyrot
3fa2db7c42
Remove demandimport, now unused.
2017-01-04 22:16:03 +00:00
Yann Leboulanger
90a80fedaf
use same date format as linux build
2017-01-04 13:55:09 +01:00
Yann Leboulanger
7b8eec955c
Fix some spaces in strings
2017-01-04 13:14:21 +01:00
Yann Leboulanger
65362358a9
ability to have a random string in the resource
2017-01-04 13:14:21 +01:00
Philipp Hörist
2b1b461e90
Merge branch 'dev' into 'master'
...
Switch to GtkApplication and clean up of Startup code
See merge request !16
2017-01-03 23:51:23 +01:00
Philipp Hörist
a6bda765eb
Merge/Comment not working win32 translation code
2017-01-03 23:10:58 +01:00
Philipp Hörist
9b0be66b50
Dont import MusicTrackListener in startup
2017-01-03 23:10:57 +01:00
Philipp Hörist
503c295eb3
Handle GTK shutdown event
...
do_shutdown() is called by GTK on quit()
2017-01-03 23:10:50 +01:00
Philipp Hörist
39ec724e45
Cleanup Paths/DB creation and init
2017-01-03 23:08:52 +01:00
Philipp Hörist
32604e99bf
Handle missing winsound module not in startup
2017-01-03 23:08:52 +01:00
Philipp Hörist
33041619ee
Dont depend on win32api for getting HOME dir
2017-01-03 23:08:51 +01:00
Philipp Hörist
f1693fa5a6
Remove unused code
2017-01-03 23:08:51 +01:00
Philipp Hörist
d5bb5d4034
Remove old GTK2 code
2017-01-03 23:08:51 +01:00
Philipp Hörist
1c8f08a3c8
Remove PID code, GApp should be single instance
2017-01-03 23:08:50 +01:00
Philipp Hörist
0443d5a69a
Ignore warnings on windows when not in dev mode
2017-01-03 23:08:50 +01:00
Philipp Hörist
079b5346fe
Set application name in init
...
Remove unnecessary error catching
- on missing gi libs we fail earlier
- 'could not open display' is good enough
2017-01-03 23:08:49 +01:00
Philipp Hörist
2676d7ea94
Add commandline option for logging on windows
...
Redirect all output to one log file or if -w is
provided do not redirect output
2017-01-03 23:08:49 +01:00
Philipp Hörist
815ecdcf47
Handle start of second instance
...
We bring the Roster Window to the front
Gtk exits on return immediately
2017-01-03 23:08:48 +01:00
Philipp Hörist
e7812cbd85
Move startup code into Gtk.Application()
2017-01-03 23:08:48 +01:00
Emmanuel Gil Peyrot
9d2223ea3b
Add a -V/--version option, printing the version
2017-01-03 23:08:48 +01:00
Emmanuel Gil Peyrot
2298af9dd9
Handle CommandLine inputs with GtkApplication
2017-01-03 23:08:47 +01:00
Philipp Hörist
42d4aa2ab4
Test required version of all GTK libs at start
2017-01-03 23:08:32 +01:00
Yann Leboulanger
4e7bd1fc39
Merge branch 'version-trailing-whitespace' into 'master'
...
Remove extraneous whitespace after git hash
See merge request !18
2017-01-03 22:20:30 +01:00
Yann Leboulanger
5173a2d112
Merge branch 'no-nbxmpp' into 'master'
...
Simplify nbxmpp import error checking
See merge request !17
2017-01-03 22:20:14 +01:00
Emmanuel Gil Peyrot
21df33993b
Remove extraneous whitespace after git hash.
2017-01-03 21:17:30 +00:00
Emmanuel Gil Peyrot
0eec41ee89
Simplify nbxmpp import error checking to exit(1).
...
There was no reason for distutils’ version support to fail.
2017-01-03 21:14:27 +00:00
Philipp Hörist
430c4b1536
Merge branch 'printline' into 'master'
...
print_conversation_line() refactoring
See merge request !3
2017-01-03 21:20:32 +01:00
Philipp Hörist
d129abbed6
Catch exceptions on invalid URLs
...
Closes #8494
Conflicts:
src/common/helpers.py
2017-01-03 20:17:14 +01:00
Philipp Hörist
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
Yann Leboulanger
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
Emmanuel Gil Peyrot
03446bb74f
Make sure strings don’t contain unescaped backslashes.
2017-01-01 21:48:44 +00:00
Philipp Hörist
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
Emmanuel Gil Peyrot
aab2451507
Fix python2-ism in configure.ac.
2017-01-01 21:41:10 +00:00
Yann Leboulanger
7db6211230
don't install README.html anymore
2016-12-31 13:23:10 +01:00
Yann Leboulanger
6da03e09b5
Merge branch 'master' of dev.gajim.org:gajim/gajim
2016-12-30 00:54:48 +01:00
Yann Leboulanger
3409a40cdd
get git version when running configure
2016-12-30 00:54:33 +01:00
Philipp Hörist
b76b089790
Update .gitignore
2016-12-29 13:56:50 +01:00
Philipp Hörist
2a0c58c94b
Update and rename README files
2016-12-29 13:56:05 +01:00
Philipp Hörist
f274322820
Update appveyor build files
2016-12-28 18:06:39 +01:00
Philipp Hörist
c52046f565
Merge branch 'formatting-menu' into 'master'
...
Make the formatting menu declarative.
See merge request !10
2016-12-24 09:01:39 +01:00
Philipp Hörist
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
Emmanuel Gil Peyrot
bd07478574
Use GLib to retrieve the pictures directory.
...
Also remove an unused function.
2016-12-24 04:58:30 +01:00
Emmanuel Gil Peyrot
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
Emmanuel Gil Peyrot
db2b6e5ee5
Apply automatic changes from glade 3.20.
2016-12-24 02:49:59 +01:00
Philipp Hörist
b43811df88
Fix getting commit hash for version info
2016-12-23 20:52:24 +01:00
Thilo Molitor
f15497b0c0
Merge branch 'master' of dev.gajim.org:gajim/gajim
2016-12-23 15:21:03 +01:00
Philipp Hörist
ac4859fb87
Remove unused imports
2016-12-22 18:19:24 +01:00
Thilo Molitor
c48f0419f2
Merge branch 'master' of dev.gajim.org:gajim/gajim
2016-12-18 04:22:08 +01:00
Yann Leboulanger
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