1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Commit Graph

3001 Commits

Author SHA1 Message Date
tux3
9082783483
Merge branch 'pr1725' 2015-05-25 13:00:12 +02:00
tux3
6e97c7f9c3
Merge branch 'pr1724' 2015-05-25 12:59:49 +02:00
tux3
c3927f9cfc
Merge branch 'pr1726' 2015-05-25 12:58:51 +02:00
Zetok Zalbavar
1403ee970b
Improve error message when profile is alrady used
I.e. don't imply that profile belongs to same user, since it is possible
that multiple users are using qTox.
2015-05-25 09:39:47 +01:00
Ansa89
98031bd68f Italian translation: update 2015-05-25 09:38:01 +02:00
ovitei
52e0dae0d8 added Norwegian Bokmal (nb_NO) translations 2015-05-25 02:15:34 +02:00
tux3
435b4d98be
Merge branch 'pr1722' 2015-05-25 01:41:31 +02:00
TheLastProject
5e9081abd7 Update profileform.cpp 2015-05-25 01:25:00 +02:00
tux3
21ff829be1
Merge branch 'pr1721' 2015-05-25 00:53:57 +02:00
PKEv
9a239ed4a6 Correct for win install 2015-05-25 00:43:37 +03:00
tux3
f83dacb9c4
Update busy icons 2015-05-24 21:40:24 +02:00
tux3
1178df61ef
Merge branch 'pr1719' 2015-05-24 17:46:55 +02:00
Ansa89
6b337ce935 Italian translation: update 2015-05-24 17:30:13 +02:00
tux3
4d21f34e72
Merge branch 'pr1718' 2015-05-24 17:20:56 +02:00
Ansa89
264732bf10 chatmessage.cpp: detectQuotes() simplify conditional statement 2015-05-24 17:16:30 +02:00
tux3
a32609230f
Merge branch 'pr1717' 2015-05-24 16:49:22 +02:00
Zetok Zalbavar
87e6b038f9
Properly fix quoting in action messages
* Allow quoting in action messages if line number is >1.
* Fix regression introduced by 1244d689f6 where
  '\n' was being trimmed in action messages.
* Add comment about typing notifications placeholder that needs to be fixed.
2015-05-24 15:30:21 +01:00
tux3
874abd363f
Merge branch 'pr1714' 2015-05-24 15:17:00 +02:00
Ansa89
ce162ae91d Italian translation: update 2015-05-24 14:47:04 +02:00
tux3
d16f9a542e
Merge branch 'pr1712' 2015-05-24 14:43:13 +02:00
tux3
be87047896
Merge branch 'pr1710' 2015-05-24 14:42:40 +02:00
tux3
326dc3973a
Merge branch 'pr1707' 2015-05-24 14:39:28 +02:00
tux3
5b036a1784
Merge branch 'pr1706' 2015-05-24 14:39:04 +02:00
tux3
b8077775ce
Merge branch 'pr1684' 2015-05-24 14:38:30 +02:00
tux3
65490654f9
Merge branch 'pr1713' 2015-05-24 14:36:18 +02:00
Ansa89
f716027180 Fix needed to compile on slackware64 14.1 (with multilib) 2015-05-24 14:33:51 +02:00
Zetok Zalbavar
1244d689f6
Don't quote with action messages
Quoting with action messages produces badly looking messages,
where nick is blue coloured, while rest of text that is preceded
by '> ' is green. To avoid that, quoting should not be triggered
in action messages.
2015-05-24 01:56:57 +01:00
Zetok Zalbavar
227c061ea1
Code consistency fixes → 's/ToxID/ToxId/'
Since consistency in code is most important, 'ToxId' is used
for code, whereas 'Tox ID' anywhere outside of code.

Also fixed wrong comments in core.h:
* qTox gets only public key of a grouchat peer, not their
  Tox ID
* qTox tries to return full address (Tox ID) or public key
2015-05-23 20:15:41 +01:00
dcapeletti
91a74563c1 Renovation and improvements to Spanish language. 2015-05-22 16:11:26 -03:00
Zetok Zalbavar
a756b443fa
[bootstrap.sh] Add some clarification regarding its purpose
At times people may be confused with what bootstrap.sh is there for, and
thus some clarification regarding it should be available.
2015-05-22 16:42:46 +01:00
Zetok Zalbavar
1554b3b131
Better error message for image resizing
Now user will know what is the acceptable file size limit.
2015-05-20 07:17:12 +01:00
tux3
a841224683
Use proper random for IPC 2015-05-19 20:37:42 +02:00
tux3
4306f87df4
Fix call on null object, unititialized bool 2015-05-19 19:40:01 +02:00
tux3
9fdf382d7b
Correctly send avatar hashs as file_idS 2015-05-19 12:34:38 +02:00
tux3
eda513b6cf
Merge branch 'pr1682' 2015-05-18 23:10:54 +02:00
Sean
b8bbe3654f Revert "Fixing behaviour for a tray icon on OS X"
This reverts commit f35f7e261a.
2015-05-18 13:55:19 -07:00
Sean
a0ecf86c20 Revert "Fixing tray icon visibility issue on OS X"
This reverts commit a4df4125e3.
2015-05-18 13:54:58 -07:00
tux3
9b5df9c67d
Merge branch 'pr1679' 2015-05-18 14:57:24 +02:00
tux3
3c3d7137e3
Don't fallback on tox1 for inexistant tox IDs
We now consider an empty reply from a tox3 server to mean that the ID doesn't exist, instead of only accepting DNS protocol level errors
2015-05-18 14:55:59 +02:00
Ansa89
0ed64f929e Italian translation: update 2015-05-18 14:49:35 +02:00
tux3
7590d3d422
Fix tr() without QObject 2015-05-18 14:43:18 +02:00
tux3
2334add011
Merge branch 'pr1675' 2015-05-18 13:37:44 +02:00
marcel
f96db5a761 replaced ToxID struct with ToxId class. 2015-05-17 22:55:50 +02:00
marcel
66dc368662 added isActiveProfile function and fixed a typo 2015-05-17 22:48:24 +02:00
marcel
2ffabb19ec Renamed function isMine to isActiveProfile.
As an user can have multiple profiles where each profile has its own
Tox ID the name isMine is not very accurate.
2015-05-17 22:26:56 +02:00
marcel
a41765a58d added documentation 2015-05-17 21:54:21 +02:00
tux3
24fb67f415 Merge branch 'pr1669' 2015-05-17 21:24:20 +02:00
tux3
d7e5606bed Merge branch 'pr1666' 2015-05-17 21:24:20 +02:00
Yuri
cfd04d22d9 Copy ToxID into XA_PRIMARY clipboard too to make retrieval easier. 2015-05-17 21:24:20 +02:00
tux3
09503f0bfa Install for all users on Windows 2015-05-17 21:24:19 +02:00