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

4865 Commits

Author SHA1 Message Date
sudden6
791d871737
Merge pull request #3070
Zetok Zalbavar (1):
      docs(CONTRIBUTING.md): add section about commit message format
2016-03-29 01:23:15 +02:00
Zetok Zalbavar
99bf6aeec6
docs(CONTRIBUTING.md): add section about commit message format
With a proper, (not yet) enforced commit message format qTox would get
both clean commit messages and automatically generated changelog.

In regard to #2887.

Content of the commit taken from `CONTRIBUTING.md` @
96e2cec95a
and adjusted for qTox needs.
2016-03-29 00:20:22 +01:00
Zetok Zalbavar
8df7fbe63f
Merge pull request #3067
kehugter (1):
      Update Spanish translation
2016-03-28 19:37:30 +01:00
ProMcTagonist
084f6962d2 change picture
#3020
2016-03-28 10:35:11 -07:00
kehugter
4bc95c8c7c Update Spanish translation 2016-03-27 21:53:17 +02:00
sudden6
d28c371786
style: fix indentation of simple_make.sh 2016-03-27 17:12:49 +02:00
sudden6
5e0c0704cc
Merge pull request #3060
Flemming Richter (2):
      added missing dependency to libsqlcipher-dev in simple_make.sh
      added missing dependency to sqlcipher-devel in simple_make.sh
2016-03-27 17:09:26 +02:00
sudden6
c5ad132b02
Merge pull request #3059
ovalseven8 (1):
      Update for the German translation file
2016-03-27 17:03:04 +02:00
Flemming Richter
3804ceb9f7 added missing dependency to sqlcipher-devel in simple_make.sh 2016-03-26 19:33:38 +01:00
ovalseven8
e07d81e7c7 Update for the German translation file 2016-03-26 14:03:41 +01:00
sudden6
de4878909d
fix: Close logfile only after the disabling logging to file
This fixes a segfault when closing qTox, because the logfile was closed
before the last message was written.
2016-03-26 13:49:51 +01:00
sudden6
631c37aef1
Merge pull request #2839
apprb (4):
      Groupchats: fix user list update
      Grouplist: tracking of the friend's alias changing (fix: #1847)
      Fix #2600: Missing username in group chat
      Check for empty username in a groupchat
2016-03-26 12:48:17 +01:00
Flemming Richter
7896c53930 added missing dependency to libsqlcipher-dev in simple_make.sh 2016-03-26 12:17:36 +01:00
sudden6
a7ffc08cdb
fix: Make logMessageHandler thread-safe
Make use of mutexes and atomic operations to make logging thread-safe
and deadlock free.
2016-03-26 11:00:22 +01:00
sudden6
c1e2a3c5b6
fix: Deadlock while rotating logs
based on #2974
fixes #2920
2016-03-26 11:00:22 +01:00
sudden6
0f0113e72f
Merge pull request #2994
Chiitoo (1):
      Chatlog: Adjust whitespace behaviour/handling.
2016-03-26 10:56:27 +01:00
sudden6
0330cd7627
Merge pull request #2990
Erik Edrosa (3):
      remove hard coded system tray include paths
      Update list of dependencies with pkg-config
      add ffmpeg libraries to PKGCONFIG
2016-03-26 10:45:47 +01:00
Erik Edrosa
44e7655546 add ffmpeg libraries to PKGCONFIG 2016-03-25 14:18:26 -04:00
sudden6
da2f892d63
fix #3052 2016-03-25 08:45:44 +01:00
sudden6
cda05bb772
Merge pull request #3044
Andrew Morgan (1):
      Removed uneccessary for loop in markdown and url parsing.
2016-03-24 20:44:16 +01:00
sudden6
78551e970e
Merge pull request #2978
sudden6 (12):
      Revert "Revert changes from merge of  #2092 pull request"
      port groupinvitform to new ui
      fix segfaults
      adapt groupinviteform to existing conventions
      Fix notification opening wrong form
      notify on friendrequest and groupchat invite
      fix layout of friendrequest form
      fix segfault when logging out and in again
      reject multiple friend requests from one person     makes https://github.com/TheSpiritXIII/qTox/commit/
      fix wrong text on button
      fix friend request notification if friendrequestform is hidden
      fix notification if friendrequest tab is visible, don't display     friendrequests with html
2016-03-24 20:37:35 +01:00
sudden6
875f910fb6
Merge pull request #3040
Zetok Zalbavar (1):
      fix: increase faux offline message timeout
2016-03-24 20:15:55 +01:00
sudden6
cc204a564a
Merge pull request #3048
Jason Papakostas (1):
      fix initial disabled state for "Focus window" checkbox
2016-03-24 19:57:33 +01:00
sudden6
7576216871
Merge pull request #3049
Jason Papakostas (1):
      fix sound sliders not saving when moved by keyboard
2016-03-24 19:50:38 +01:00
Jason Papakostas
0c67831b4e fix sound sliders not saving when moved by keyboard
closes #2866
2016-03-24 05:38:22 -05:00
Jason Papakostas
c829c24b56 fix initial disabled state for "Focus window" checkbox 2016-03-24 04:43:55 -05:00
sudden6
9a80950ac6
Fix #2161 2016-03-24 01:14:25 +01:00
Andrew Morgan
d343408749 Removed uneccessary for loop in markdown and url parsing. 2016-03-23 19:39:10 -04:00
sudden6
252c9c8fae
Merge pull request #2980
Michał Šrajer (4):
      fix #2976
      make fix for #2976 Qt5.3 compatible.
      fix logs and screenshots path on linux
      ensure screenshots directory exists
2016-03-23 15:49:46 +01:00
Michał Šrajer
4f32acba3e ensure screenshots directory exists 2016-03-23 12:16:38 +01:00
sudden6
6c5d70d862
Merge pull request #3033
sudden6 (1):
      update friend activity on groupchat events     fixes #2848
2016-03-23 11:55:20 +01:00
Zetok Zalbavar
76d8e19320
fix: increase faux offline message timeout
Should make problem with duplicated messages less common.
Related to #2726.
2016-03-23 10:53:43 +00:00
sudden6
4ce3bf1290
Merge pull request #3039
RowenStipe (4):
      Auto ver finding for lib sodium & qt + attempt to make brew less noisy
      Make update silent for travis
      Make Brew quitter: Round 3
      Applied ductile to home-brew's mouth on update
2016-03-23 11:48:14 +01:00
sudden6
990a50f1ca
Merge pull request #3037
Zetok Zalbavar (1):
      chore(merge-script): add a way to add optional merge message
2016-03-23 11:45:15 +01:00
Michał Šrajer
528b0d99a2 fix logs and screenshots path on linux
The QStandardPaths generates paths with app name (qTox) subdirectory
for DataLocation and CacheLocation. No need to add '/tox'.
Both screenshots dir and log file are now in qTox dir in proper location on linux.
2016-03-23 09:56:21 +01:00
RowenStipe
9dd46c249b Applied ductile to home-brew's mouth on update 2016-03-22 14:36:30 -04:00
RowenStipe
ff41443b1e Make Brew quitter: Round 3 2016-03-22 14:20:05 -04:00
RowenStipe
bfe730241b Make update silent for travis 2016-03-22 14:06:18 -04:00
RowenStipe
ac72a12eb3 Auto ver finding for lib sodium & qt + attempt to make brew less noisy 2016-03-22 13:52:38 -04:00
Zetok Zalbavar
65608596d5
chore(merge-script): add a way to add optional merge message
This allows to close related to PR issues when PR submitter forgets to
include that in commit message, or add some other additional info.

E.g. `./merge-pr.sh 3033 'Fu fu fu. :3'` would result in:
```
    Merge pull request #3033

    Fu fu fu. :3

    sudden6 (1):
          update friend activity on groupchat events     fixes #2848
```
2016-03-22 15:13:05 +00:00
sudden6
a770b9be20
fix build on mac 2016-03-22 15:44:50 +01:00
sudden6
69424c63be
update friend activity on groupchat events
fixes #2848
2016-03-22 14:25:32 +01:00
sudden6
b6ae3d02d6
Merge pull request #3034
Zetok Zalbavar (1):
      fix: remove unnecessary qDebug call
2016-03-22 14:05:58 +01:00
sudden6
4efbda5f87
Merge pull request #3036
Zetok Zalbavar (1):
      docs: correct info about events that update `By Activity` sorting
2016-03-22 14:03:38 +01:00
Zetok Zalbavar
8ce9ea2eb4
docs: correct info about events that update By Activity sorting 2016-03-22 13:01:12 +00:00
sudden6
772f2c54f0
fix whitespace 2016-03-22 13:28:25 +01:00
sudden6
191aa9079f
limit webcam to 60fps 2016-03-22 13:19:31 +01:00
sudden6
46adb586c9
Coding Style fixes 2016-03-22 13:17:59 +01:00
sudden6
3f89cd95d5
Merge pull request #2867
Sean (5):
      generic pixel format selection
      Merge branch 'master' of https://github.com/seanlaguna/qTox into pixfmt
      Merge branch 'pixfmt' of https://github.com/seanlaguna/qTox into pixfmt
      tabs to spaces
      camera res option reduction

Sean Laguna (1):
      whoops, forgot an else in an else if
2016-03-22 13:13:13 +01:00
Zetok Zalbavar
66f96019cb
fix: remove unnecessary qDebug call
qTox logs shouldn't contain any info that might include even parts of
user messages/etc.
2016-03-22 10:54:59 +00:00