3291 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Spagy	00efbf9e79	Remove call to ProfileLocker::clearAllLocks() ... The call to ProfileLocker::clearAllLocks() was unnecessary and could remove locks from other programs	2015-07-17 15:49:15 +01:00
tux3	f10b4eaee7	Merge branch 'pr2006'	2015-07-16 22:13:53 +02:00
tux3	45efaee15e	Merge branch 'pr2004'	2015-07-16 22:08:44 +02:00
Yuri	0895b89794	Prevent crashed when default video format not found.	2015-07-15 01:46:23 -07:00
sudden6	cf4c55b27c	German translation updates	2015-07-15 07:09:37 +02:00
tux3	49f7a02cbb	Merge branch 'pr1996'	2015-07-15 03:05:49 +02:00
tux3	9639421f18	Merge branch 'pr1994'	2015-07-15 03:04:45 +02:00
tux3	a7b577a1af	Merge branch 'pr1981'	2015-07-15 02:52:59 +02:00
tux3	1f10fd4c6b	Merge branch 'pr1980'	2015-07-15 02:52:18 +02:00
tux3	0d29c8c86b	Merge branch 'pr2003'	2015-07-15 02:49:15 +02:00
tux3	b01bf34106	Merge branch 'pr1997'	2015-07-15 02:48:54 +02:00
Zetok Zalbavar	06ee29618a	Update Polish translation ... some things aren't translated, help would be welcomed	2015-07-14 19:06:58 +01:00
minj	4827408076	fixup missing translations ... was not saved from linguist somehow	2015-07-12 17:46:32 +03:00
minj	fbeb033a30	update Lithuanian translation	2015-07-12 17:42:41 +03:00
Jookia	7fab49d665	core: TOX_ERR_NEW_LOAD_BAD_FORMAT is non-fatal. ... This fixes errors from save migrations between versions and architectures.	2015-07-12 23:58:40 +10:00
minj	90b9527b4d	update Lithuanian strings	2015-07-12 16:34:25 +03:00
FuzzyToothpaste	9ba09fbaa9	Update .gitattributes ... Fix GitHub being spelled github	2015-07-11 21:02:25 -04:00
agilob	aa05d71f4b	connect signal-slot in profileform	2015-07-09 13:06:23 +01:00
TheSpiritXIII	59d1416d96	Fix OSX readme format to match Linux instructions	2015-07-08 14:24:20 -04:00
tux3	cfeeb03c5b	Merge branch 'pr1968'	2015-07-07 20:36:23 +02:00
sudden6	444ababd55	fix formatting	2015-07-06 18:57:19 +02:00
sudden6	953847f02a	add a note for installing ffmpeg on openSUSE	2015-07-06 18:55:28 +02:00
tux3	965f871d0c	Merge branch 'pr1964'	2015-07-06 00:29:21 +02:00
Corey Sheldon	52acc1f934	Updated Fedora parts ... --- Added qt5-svg error warning, check it before building default fedora version is not >=5.2 --- Added mention of sudo ldconfig for /usr/local/bin users --- Added qt5-svg-devel to build instructions as otherwise a Unknown Modelu(s) SVG error occurs later in building process (some svg needed parts are in -devel	2015-07-05 15:14:37 -04:00
tux3	83d7b5f02b	Merge branch 'pr1957'	2015-07-04 13:36:20 +02:00
tux3	8425b48ae7	Merge branch 'pr1955'	2015-07-04 13:35:38 +02:00
PKEv	c2b246409f	add max size of emoji ... fix #1691 max size is calculated from the possibility of fully display the selection window of emoji and value Qt::AA_UseHighDpiPixmaps.	2015-07-02 21:41:14 +03:00
Zetok Zalbavar	50096d4d25	INSTALL.md: fix links; make it possible to click them ... Also change "Tox Core" → "toxcore"	2015-07-02 12:09:00 +01:00
tux3	1758928b4f	Merge branch 'pr1950'	2015-07-01 15:16:12 +02:00
TheSpiritXIII	bb29b07d70	Fix activity sorting out of bounds, update activity category when changed	2015-07-01 09:10:55 -04:00
tux3	4277ad832a	Merge branch 'pr1949'	2015-07-01 13:55:45 +02:00
PKEv	cd307bd52c	Update friendlistwidget.cpp	2015-07-01 14:54:34 +03:00
PKev	efe05a3ca5	fix sorting "by activity" #1948 ... fix spaces	2015-07-01 14:07:34 +03:00
tux3	1cbc9f51ed	Merge branch 'pr1945'	2015-06-30 16:14:47 +02:00
PKev	4682814442	fix the names in the history ... fix #1943 #1787	2015-06-30 16:56:38 +03:00
tux3	14c3fad97b	Merge branch 'pr1935'	2015-06-29 16:34:10 +02:00
Daniel Hrabovcak	cd5294c055	Fix OS X compile, change instructions to use brew	2015-06-29 10:31:00 -04:00
tux3	8d1a3b7357	Sleep while waiting for IPC events	2015-06-29 11:39:19 +02:00
Tux3 / Mlkj / !Lev.uXFMLA	3e8fe2db6c	Fix video not loading when A/V tab shown	2015-06-29 11:10:50 +02:00
tux3	4f0a517531	Merge branch 'pr1914'	2015-06-28 18:23:50 +02:00
PKev	6069036324	translate to russian "contacts groups"	2015-06-28 19:15:09 +03:00
tux3	e600d6056e	Merge branch 'pr1924'	2015-06-28 15:50:37 +02:00
Mario Preksavec	0f44fba093	Slackware install procedure update	2015-06-28 13:51:45 +02:00
tux3	62d298462b	Fix circles doubling when reloaded ... We do need to clear before reloading.	2015-06-27 21:32:11 +02:00
tux3	fc084d2795	Merge branch 'pr1921'	2015-06-27 21:16:24 +02:00
tux3	b88eacb037	Merge branch 'pr1920'	2015-06-27 21:16:11 +02:00
tux3	645b1e5566	Fix raciness of encryption API ... And make it saner by not having one global password that has to be set before encrypting/decrypting, which is as racy and poorly designed as it gets Fixes #1917 's immediate symtoms, which some potential for other regressions due to the mess that is encrypted persistence currently	2015-06-27 21:14:35 +02:00
Zetok Zalbavar	413243f86b	Update install instructions	2015-06-27 19:16:47 +01:00
urras	55d04bf3cb	Update Debian dependencies	2015-06-27 13:38:28 -04:00
tux3	636faac4db	Fix #1919	2015-06-27 19:27:01 +02:00