Dubslow
29cc9e1b7d
Merge branch 'encryption' into master
...
Conflicts:
src/main.cpp
2015-01-23 01:51:39 -06:00
Dubslow
44ddb8789c
In groupchats, check for sanitized name as well
...
Fixes #952
2015-01-23 01:35:21 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
aa9d0e06d1
Use Yes/No, not Ok/No when asking questions
2015-01-22 20:21:13 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
3eb11c518e
Merge branch 'pr1035'
2015-01-22 19:45:52 +01:00
Ansa89
f9f04e1ded
Italian translation: update
2015-01-22 19:36:48 +01:00
Dubslow
89544c5d16
Merge branches 'pr1030' and 'pr1032'
2015-01-22 10:29:35 -06:00
Dubslow
908dafd3b8
Simplify regex
2015-01-22 10:20:38 -06:00
Dubslow
34b9236d58
Fix most of the things suhr mentioned
...
also added colons a buncha places
translation->language
save files in->save to
moved emoticon size after smiley pack
Ignoring the excellent point raised by zer0-One for now
2015-01-22 10:07:20 -06:00
Dubslow
0428b5c87a
Move "Make Tox portable" to advanced settings tab
2015-01-22 09:55:24 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
aef083934f
Merge branch 'pr1029'
2015-01-21 19:16:33 +01:00
Lednerb
00bea1fdf6
Added tox1-protocol prompt.
2015-01-21 18:15:07 +01:00
Lednerb
101a6ec2d3
Fixed translation errors.
2015-01-21 17:42:04 +01:00
novist
3bec2751e0
Separate setting to show window on new message (without focusing window)
...
Setting to always notify on messages in group chats (like normal chats)
Check for mentioned name only triggers if name is not in the middle of other word
2015-01-21 13:54:51 +02:00
novist
eade2969fe
General settings UI cleanup
2015-01-21 13:14:08 +02:00
Zetok Zalbavar
953009b0e0
Update Polish translation
2015-01-21 08:19:56 +00:00
Dubslow
f121937016
Merge branch 'pr1028'
2015-01-21 02:11:51 -06:00
Zetok Zalbavar
4d045950e9
Remove unnecesary word
2015-01-21 06:35:28 +00:00
Dubslow
b245fe034a
Merge branch 'pr949'
2015-01-20 03:48:37 -06:00
Dubslow
120af8f889
correct static lib extension on *nix
2015-01-20 03:46:28 -06:00
Dubslow
f0c3ca1c9e
check -P option for invalid profiles
...
closes #977
2015-01-20 02:24:25 -06:00
Dubslow
96fd1e514d
Fix #967
2015-01-20 02:07:56 -06:00
Dubslow
2d2522626c
Typing notifications disappear automagically
...
Fixes #984
2015-01-20 01:27:48 -06:00
Dubslow
7aa52ff754
Fix profile settings issue from command line, default unencrypt history is Cancel
2015-01-19 22:23:13 -06:00
Dubslow
5ea6e412f8
Slightly more useful initial password dialogs
2015-01-19 21:59:27 -06:00
Dubslow
f645faff51
Ignore empty history files on start
...
This fixes an esoteric issue of enabling chat log encryption and then restarting before adding any messages
2015-01-19 21:49:41 -06:00
Dubslow
b1180a2038
Improve dialogs around unencrypting history, per zetok's suggestions
2015-01-19 21:16:28 -06:00
Dubslow
e233c8171f
minor reword
...
(I meant to apply this with the relevant merge commit, but forgot to "git add"... life is hard)
2015-01-19 19:21:34 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
c0fef7851c
Merge branch 'pr1024'
2015-01-20 00:13:07 +01:00
saneki
f3c0b7c24c
Context menu style fix for chat title
2015-01-19 13:32:34 -06:00
Dubslow
2805737b8d
Merge branch 'pr1015'
...
also minor re-reword
2015-01-18 19:55:15 -06:00
Tux3 / Mlkj / !Lev.uXFMLA
f4ef93d8aa
Update french translation
2015-01-19 00:43:44 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
ef64a0ef4c
Check that dropped files are readable&non-sequential
...
Fixes #934
No, you're not allowed to send /dev/urandom to your friends. Ever.
2015-01-19 00:22:40 +01:00
Tux3 / Mlkj / !Lev.uXFMLA
aa95c3cbf5
Fix tux3-dev.tox.im links in README
2015-01-18 23:53:56 +01:00
Zetok Zalbavar
a23d2acf21
Re-word 'Compact layout' → 'Compact contact list'
...
Apparently it can be worded better, to be more self-explanatory for users
2015-01-16 06:36:20 +00:00
Dubslow
826d60c876
fix bug with "use other password"
...
It's more trouble than it's worth to shallow copy; changed to deep copy with STL
2015-01-15 21:41:10 -06:00
Dubslow
33dfb88962
Merge branches 'pr990', 'pr1008', 'pr1009' and 'pr1011'
2015-01-15 01:48:11 -06:00
Dubslow
1ab9bb77e6
Fix OS X bug with overlapping buttons
...
Fixes #910
2015-01-15 01:45:42 -06:00
derMart
4540fb09aa
fix resetting AVForm resolution combobox index to get change signal always fired during init
2015-01-14 23:44:38 +01:00
derMart
c018165497
fix missing showEvent in AVForm
2015-01-14 15:27:57 +01:00
derMart
def43706eb
fix incompatibility of MSAA (SampleBuffers) and SingleBuffer mode in VideoSurface
2015-01-14 15:26:02 +01:00
Zetok Zalbavar
a45b72701f
Small spelling fix
2015-01-13 15:55:06 +00:00
Lednerb
ad44512842
Added German translations
2015-01-12 19:43:15 +01:00
derMart
290f6d4697
refactoring audio device initialization in av setting to prevent opening devices twice
2015-01-12 18:08:25 +01:00
derMart
7d11e9192c
0x0 resolution removed
...
better camera initializing in av settings
2015-01-12 18:08:14 +01:00
derMart
e5d736e6c0
fix videosurface flipping buffers
2015-01-12 18:07:58 +01:00
derMart
3a107e33c8
fix utf8 audio device specifier names on windows
2015-01-12 18:07:30 +01:00
Dubslow
d74b95a7b7
Merge branches 'pr920', 'pr1001', 'pr1003' and 'pr1005'
2015-01-12 06:01:50 -06:00
Ildar Akhmetgaleev
575247218d
Defining link color in chat area css
...
Fixes #852 . Links now visible with white on black system theme.
Defining with a {...}
2015-01-11 22:56:41 +07:00
Ildar Akhmetgaleev
416f1565cc
Defining link color in chat area css
...
Fixes #852 . Links now visible with white on black system theme.
2015-01-11 10:52:57 +07:00
Lednerb
5d6953662c
Fixed translation bug.
2015-01-10 23:32:40 +01:00
