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
Tux3 / Mlkj / !Lev.uXFMLA
532b8cec83
Add Jenkins build config
2014-09-01 20:33:04 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
3c8f39c2ca
Merge pull request #244 from apprb/dev
...
fix #243 : Smileys are broken
2014-09-01 19:48:12 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
984949bc8a
Merge pull request #242 from krepa098/master
...
Added editing functionality to the CroppingLabel
2014-09-01 19:44:04 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
2d952992fc
Merge pull request #240 from dubslow/master
...
Update bootstrap.sh, match nodes to wiki.tox.im
2014-09-01 19:41:34 +02:00
apprb
e76464a320
further GroupWidget and FriendWidget unification: activeFriendWidget and activeGroupWidget pointers replaced by the unified activeChatroomWidget pointer
2014-09-01 23:58:01 +07:00
apprb
35b7ad3a58
Chatroom: common parts moved to the parent class
2014-09-01 23:57:51 +07:00
krepa098
f845bfb756
xD smiley
2014-09-01 18:03:31 +02:00
apprb
24971f50e9
fix #243 : Smileys are broken
2014-09-01 18:55:07 +07:00
krepa098
7e6c4f5129
cleanup
2014-09-01 12:27:41 +02:00
krepa098
1cd954ba42
compatibility with old widgets
2014-09-01 11:16:41 +02:00
krepa098
26c028f416
removed ClickableLabel, EditableLabelWidget, ElideLabel, EscLineEdit,
...
CopyableElideLabel
2014-09-01 11:08:02 +02:00
krepa098
7c0cdd710f
editable CroppingLabel
2014-09-01 11:00:06 +02:00
Bill Winslow
0de3ddaacd
Update bootstrap.sh, match nodes to wiki.tox.im
...
This might help #221 or #237 , several of the old list are probably offline
2014-09-01 00:25:22 -05:00
Bill Winslow
125af3f8bc
Merge branch 'master' of https://github.com/tux3/qTox
2014-08-31 23:22:30 -05:00
Tux3 / Mlkj / !Lev.uXFMLA
c54cfd6ff3
Reduce precision of human readable, now more readable!
2014-08-31 23:07:07 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
628d9a0aae
Tweak file transfer speed
...
Hopefully increase stability by replacing a sleep by a longer timer interval
2014-08-31 23:06:31 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
c5c3513ee9
Write settings on toggling 'Make Tox Portable'
2014-08-31 22:44:52 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
73309d8b90
Fix #235 , Fix #84
2014-08-31 22:26:45 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
4b570c88f9
Debian bash script to build .deb and .rpm qTox packages
...
Just run buildPackages.sh from a Debian box with the qTox build dependencies installed
2014-08-31 19:47:09 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
d69eb0d34e
Merge pull request #233 from apprb/dev
...
Widget code cleanup
2014-08-31 19:11:51 +02:00
apprb
fd4c47cba3
Widget code cleanup: removed isFriendWidgetActive and isGroupWidgetActive
2014-08-31 23:49:15 +07:00
Tux3 / Mlkj / !Lev.uXFMLA
76971f5238
Make notifications consistent
...
Notify of AV and FT requests if we're selected but not active or minimised, and add sound (consistent with how message notifications work)
2014-08-31 18:30:04 +02:00
Tux3 / Mlkj / !Lev.uXFMLA
f531d5672d
Merge pull request #232 from apprb/dev
...
Dev
2014-08-31 18:17:46 +02:00
