Marcel
9306887b55
some fixes
2014-09-09 21:22:22 +02:00
Marcel
2f749d5484
inital commit for INSTALL.md
2014-09-09 21:22:22 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
1e9e5dc35b
Merge pull request #267 from Ansa89/italian-translation
...
Italian translation: update
2014-09-09 21:10:32 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
188f0f78f7
Merge pull request #268 from krepa098/master
...
Various UI changes, fix #255
2014-09-09 21:08:40 +02:00
krepa098
a39339e06f
cleanup
2014-09-09 18:29:03 +02:00
krepa098
ddf955afd3
fixed #255
2014-09-09 18:28:07 +02:00
krepa098
39ba354651
use "white-space: nowrap" for div.date
2014-09-09 18:09:51 +02:00
Ansa89
b90c9731b0
Italian translation: update
2014-09-09 17:46:34 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
31af9dc49d
Merge pull request #264 from apprb/chatform
...
ChatForm
2014-09-09 15:55:33 +02:00
apprb
f0b34dc40d
filetransfer: original buttons positions
2014-09-07 23:14:06 +07:00
Ansa89
4406892d50
Italian translation: fix typo
2014-09-07 15:55:36 +02:00
apprb
aa2f67c983
code cleanup
2014-09-07 19:17:47 +07:00
Tux3 / Mlkj / !Lev.uXFMLA
cfb3313821
Merge pull request #262 from apprb/dev
...
ChatForm unification
2014-09-07 13:35:59 +02:00
apprb
16949cfdba
FileTransferInstance: correct buttons displaying
2014-09-07 16:14:50 +07:00
apprb
1233357649
show image preview after file receiving completed
2014-09-07 15:52:26 +07:00
apprb
0a1eaac9a4
filetransferinstance should use own pictures
2014-09-07 15:04:42 +07:00
apprb
b3d6102a20
code cleanup: html creation code moved to the separated functions
2014-09-07 12:52:01 +07:00
apprb
9970fe293d
files renaming
2014-09-07 00:28:26 +07:00
apprb
b68cc66ede
scroll fix
2014-09-07 00:21:47 +07:00
apprb
db4c84a222
cleanup
2014-09-07 00:21:47 +07:00
apprb
92b2848916
rewrite
2014-09-07 00:21:47 +07:00
apprb
0fe14953c8
somehow working example
2014-09-07 00:21:47 +07:00
apprb
25ee6a24d9
new chat beginning
2014-09-07 00:21:39 +07:00
apprb
502229a6f2
cleanup
2014-09-05 23:35:29 +07:00
apprb
2826e83cef
addMessage moved to parent class
2014-09-05 23:03:26 +07:00
apprb
522d570e62
code cleanup
2014-09-05 23:03:26 +07:00
apprb
02da6803f1
initial merging common parts of chatforms' widget
2014-09-05 23:03:08 +07:00
Dubslow
5ae82b125a
Merge branch 'master' into profiles
2014-09-05 06:19:35 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
aa4e806d27
Merge pull request #259 from Ansa89/italian-translation
...
Italian translation: update
2014-09-05 12:34:52 +02:00
Dubslow
97f107e7f5
oops
2014-09-05 05:06:35 -05:00
Dubslow
f21d8d50b7
Merge branch 'master' into profiles
...
get the last few commits from master
Conflicts:
core.cpp
2014-09-05 04:20:15 -05:00
Dubslow
7aab85251e
Merge branch 'master' into profiles
...
Holy shit first big merge of my career, I'm mildly amazed it even compiles
Conflicts:
core.cpp
widget/form/settingsform.cpp
widget/form/settingsform.h
widget/widget.cpp
2014-09-05 03:53:00 -05:00
Ansa89
cac28fbbd5
Italian translation: update
2014-09-05 09:49:27 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
86ca598a48
Option to use custom list of bootstrap nodes
...
False by default, to allow for auto-updates and fix problems with people who can't connect to the DHT due to the old list not being updated and not working
2014-09-04 23:13:59 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
bf8e1101c5
Fix Make Tox Portable impossible to disable
2014-09-04 23:11:46 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
7576795cca
Update DHT bootstrap list
2014-09-04 22:28:59 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
22d792b5dc
Merge pull request #254 from dubslow/master
...
package version is more appropriate
2014-09-03 22:17:54 +02:00
dubslow
69b2befe6f
Update changelog
2014-09-03 05:22:41 -05:00
dubslow
ef2eb5f3c0
Update buildPackages.sh
2014-09-03 05:22:29 -05:00
Bill Winslow
2956c82091
package version is more appropriate
2014-09-02 18:03:55 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
627f58087c
Disable status button when disconnected
2014-09-03 00:01:04 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
620ee196e8
Merge pull request #251 from dubslow/master
...
Updated README.md, fix #239
2014-09-01 23:54:51 +02:00
Bill Winslow
9ea2566ba0
minutiae
2014-09-01 15:52:51 -05:00
Bill Winslow
3ea7fc0f0a
Updated README.md, fix 239
2014-09-01 15:47:40 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
bedc995659
Merge pull request #248 from apprb/chat_widget
...
FriendWidget and GroupWidget improvements
2014-09-01 21:24:30 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
4e6f0c1e7e
Merge pull request #249 from dubslow/master
...
Fancier packaging script
2014-09-01 21:24:08 +02:00
Bill Winslow
8a64a415a0
moved packages script back to tools
2014-09-01 14:20:06 -05:00
Bill Winslow
68649cb448
Fancy package script
2014-09-01 14:09:31 -05:00
Bill Winslow
7d3f98bc2a
Merge branch 'master' of https://github.com/tux3/qTox
2014-09-01 13:46:05 -05:00
Bill Winslow
33064cdd17
modify buildPackages
2014-09-01 13:45:48 -05:00