tux3
32237077c7
Merge branch 'pr1502'
2015-04-05 22:37:15 +02:00
quatrox
68f098e27d
Make qTox build again
...
Without this #include, qWarning() cannot be streamed to (in Qt 5.4)
2015-04-02 20:56:45 +02:00
Dubslow
885dc0638a
No more PRs shall be merged until the new_api branch in my repo is merged. Contributions are welcome.
...
This commit fixes some minor style issues with #1406
2015-03-27 17:36:35 -05:00
Dubslow
72e78ff6cd
Merge branch 'pr1480'
...
Conflicts:
src/widget/form/addfriendform.cpp
2015-03-27 17:36:08 -05:00
Dubslow
2e388f03df
Merge branches 'pr1474', 'pr1406', 'pr1463' and 'pr1472'
2015-03-27 17:33:53 -05:00
Dubslow
5d129b471f
Possibly fix an old segfault that may or may not be a problem
2015-03-27 15:01:42 -05:00
Rohil Surana
b98af21456
On add friend clicked pastes Tox Id from clipboard if there is one
2015-03-27 22:13:25 +05:30
PKEv
4f650b3177
System menu translation
2015-03-26 23:02:08 +03:00
Rohil Surana
5a4443b7bb
Set focus to toxId Line edit on add friend window
2015-03-26 16:53:20 +05:30
kushagra
b2481fc1d8
proper splitting in friends chat,fixes #1375
...
what happened was- When message exceeded TOX_MESSAGE_LENGTH, the whole message was inserted in sender's chatlog X times.
if length of message is N,
X = (N/TOX_MESSAGE_LENGTH) + 1
There is no bug in recieving end. Receving end gets X messages (splitted).
In the sample case provided, the message had whitespaces in the end, so the reciever thought the message is empty.
2015-03-26 11:15:05 +05:30
Yuri
ce3033a0cf
Fixed bash shebangs to use /usr/bin/env for better compatibility
2015-03-25 22:16:22 -07:00
Dubslow
41efb1491b
Merge branches 'pr1447' and 'pr1459'
2015-03-25 12:32:42 -05:00
Dubslow
bab280a0ea
Change default datetime formats (d/m m/d agnostic), style fixes, removed unnecessary signals
2015-03-25 11:45:58 -05:00
Dubslow
14a565bc3a
Merge branch 'pr1393'
2015-03-25 11:32:05 -05:00
Dubslow
27f58c9ca6
Style fixes
2015-03-25 11:27:33 -05:00
Dubslow
2a730d5e22
Merge branch 'pr1371'
2015-03-25 11:22:12 -05:00
zero-one
0b64235c69
Settings singleton no longer emits signal when groupchat position changes
2015-03-23 03:06:44 -07:00
Ansa89
79df0c60f7
Italian translation: update
2015-03-23 10:42:41 +01:00
zero-one
a1e228e60d
style fixes to conform to Allman style
2015-03-23 02:38:24 -07:00
zero-one
c15cc60137
Merge branch 'master' into friend_list
2015-03-23 02:35:20 -07:00
zero-one
de8eb5293c
Merge branch 'master' into friend_list
...
Conflicts:
src/widget/form/settings/generalform.cpp
2015-03-23 02:34:12 -07:00
Dubslow
f55fd40ec6
Merge branches 'pr1452', 'pr1453', 'pr1456' and 'pr1457'
2015-03-22 16:17:00 -05:00
PKEv
72c45a65fa
Correct #1448
2015-03-22 23:44:42 +03:00
Jookia
e3bdd6d221
Added option to disable notification sounds.
2015-03-23 07:27:44 +11:00
Rohil Surana
c540c4dc91
Corrected a spelling mistake
2015-03-23 00:49:48 +05:30
PKEv
becd923c09
#1441 correct
2015-03-22 02:26:17 +03:00
Dubslow
ff4b431e5e
Fix minor memleak
2015-03-21 15:58:26 -05:00
agilob
5f15bc8b75
iso date
2015-03-21 15:48:43 +00:00
agilob
77e333ab05
long time format
2015-03-21 15:47:09 +00:00
PKEv
d8f414f84a
Update translation profile widget
2015-03-20 23:48:42 +03:00
Dubslow
d33f87772d
Merge branches 'pr1440' and 'pr1443'
2015-03-20 12:10:40 -05:00
minj
896f624037
update Lithuanian translation
...
tweak a few words in previous translations
2015-03-20 14:54:06 +02:00
agilob
a873bb571f
generalsettings: time and date format from qlocale
2015-03-20 08:17:18 +00:00
Zetok Zalbavar
ab5704fd59
[INSTALL.md] fix typo
2015-03-20 07:01:57 +00:00
Dubslow
9079b334b9
Merge branches 'pr1433', 'pr1435', 'pr1436', 'pr1438' and 'pr1439'
2015-03-19 23:02:02 -05:00
PKEv
b201cb22ee
manual how to build in Windows with qrencode
2015-03-20 01:11:32 +03:00
Stefan Merettig
15ff9355df
INSTALL.md: Fixed package name of 'libvpx' on ArchLinux
2015-03-19 22:42:23 +01:00
PKEv
eabff1b8e4
Correct hearder file for windows
2015-03-20 00:13:56 +03:00
niXman
7b13bc88fe
Update simple_make.sh
...
in Ubuntu `libqrencode-dev` should be used for `qrencode.h` header.
2015-03-19 22:40:45 +02:00
PKEv
e940459596
Correct for Maximized window
2015-03-19 22:41:31 +03:00
Dubslow
44662310da
Merge branches 'pr1429' and 'pr1431'
2015-03-19 11:03:37 -05:00
sudden6
df785e6608
Add some error handling in attempt to fix #1240
...
This should prevent the application from crashing, but there is still no
way to tell there is no webcam attached.
2015-03-19 13:30:19 +01:00
novist
a8cd541cb5
IPC improvements
...
* Removed waitUntilProcessed() because waitUntilAccepted() fits the job. They were nearly identical too so decreased code duplication
* Global events are set as processed only by instance that accepts them. Solves issue where global event would be consumed by first instance that saw it even if that instance ignored that event
* Fixed bug where running qtox instance would not properly exit after sending window activation event that was accepted by already running instance
2015-03-19 12:06:05 +02:00
Dubslow
2286d953d9
Merge branch 'pr1425'
2015-03-18 11:51:37 -05:00
kushagra
cb8d892724
fixed display of contact_dark.svg
2015-03-18 21:21:58 +05:30
Dubslow
6a43aa8680
Merge branches 'pr1419', 'pr1420', 'pr1421' and 'pr1424'
2015-03-18 08:21:19 -05:00
Ansa89
46d0122489
Italian translation: update
2015-03-18 11:25:10 +01:00
kushagra
41dc562b64
fixes #1091
2015-03-18 14:15:51 +05:30
kushagra
dc7cd7c027
fixes #1412
2015-03-18 12:40:23 +05:30
TheLastProject
6164426b13
Oops, forgot about groups
2015-03-18 00:51:22 +01:00
