Cyril Soler
bd94fcd08e
Merge pull request #98 from PhenomRetroShare/AddMinimumFontSizeInChat
...
Add minimum font size in chat.
2015-10-02 10:53:00 -04:00
Cyril Soler
f6abe2fb46
Merge pull request #115 from PhenomRetroShare/AddWebUI_LobbyOrderByType
...
Order in WebUI Lobbies by first:
2015-10-02 10:50:14 -04:00
Phenom
d6ba9a22ad
Order in WebUI Lobbies by first:
...
auto_subscribe, is_private and then subscribed
2015-09-25 17:00:50 +02:00
csoler
3025f4d485
removed aliasign problem that breaks compilation on gentoo
2015-09-24 18:18:11 -04:00
csoler
22d4893721
removed a few compilation warning that might cause compilation errors on some systems
2015-09-24 18:03:19 -04:00
Cyril Soler
0614a24bbb
Merge pull request #111 from csoler/v0.6-ImprovedExtIPDetermination
...
Improved reliability of the determination of external address
2015-09-23 22:11:50 -04:00
csoler
24b3325792
Improved reliability of the determination of external address: removed DHT stunner from the pool, added mPeerMgr which vote is based on ext address most often reported by peer discovery
2015-09-23 21:45:15 -04:00
Cyril Soler
323d894782
Merge pull request #110 from sirjenster/newbranchformychanges
...
First Mac/OSX compile fixes
2015-09-22 23:21:14 -04:00
sirjenster
68fd1b206e
First Mac/OSX compile fixes
2015-09-22 18:33:16 -07:00
Cyril Soler
6071be922f
Merge pull request #109 from AsamK/workaround_broken_sqlcipher
...
Add workaround for broken sqlcipher
2015-09-22 11:20:28 -04:00
AsamK
c80ad59fb2
Add workaround for broken sqlcipher packages
2015-09-22 16:36:02 +02:00
csoler
7293cd3afa
updated ubuntu changelog
2015-09-21 22:58:58 -04:00
thunder2
1d54630007
Fixed Windows compile.
2015-09-17 10:05:31 +02:00
Cyril Soler
66691d4f37
Merge pull request #108 from sehraf/i2p
...
Adding I2P support to RS
2015-09-16 20:01:39 -04:00
sehraf
04abfad894
manually reverted changes by Qt Creator
2015-09-16 17:01:20 +02:00
sehraf
7c7e4f86dc
added ip addr. field to the add certificate dialog
2015-09-16 12:13:54 +02:00
sehraf
6202e83c32
add default case to gui instead of falling back to tor labeling
2015-09-16 11:48:32 +02:00
sehraf
d3d184f2eb
added simple step-by-step guide to add a I2P server tunnel
2015-09-16 11:09:04 +02:00
sehraf
e54358ac11
added simple step-by-step guide to add a I2P client tunnel
2015-09-16 10:55:33 +02:00
sehraf
1dd3375c59
hide debug output
2015-09-15 17:14:55 +02:00
sehraf
d24b281948
optimizations
...
* reduced calls to mPeermgr
* use switch convenience
* small fixes
2015-09-15 17:10:48 +02:00
sehraf
bfcf43f0e1
fixed connection type detection and other small things
2015-09-15 16:18:46 +02:00
sehraf
8725aab180
gui fixes
2015-09-14 15:14:39 +02:00
sehraf
6b87c38951
small fixes
2015-09-14 14:56:14 +02:00
sehraf
6ec191944d
gui changes
2015-09-14 12:39:46 +02:00
sehraf
b0251e3806
generalized tooltips
2015-09-14 12:12:28 +02:00
sehraf
4b19e73975
added comments to functions
2015-09-14 09:56:43 +02:00
Cyril Soler
900e51bf31
Merge pull request #107 from PhenomRetroShare/AddFriendListItemMouseEvents
...
Send Mouse event to FriendList's item, since ElidedLabel was fixed.
2015-09-13 18:08:06 -04:00
Phenom
48e6618c8d
Send Mouse event to FriendList's item, since ElidedLabel was fixed.
2015-09-13 19:00:31 +02:00
Phenom
3f155b9b75
Add minimum font size in chat.
2015-09-13 17:35:19 +02:00
Cyril Soler
7195d4c20d
Merge pull request #105 from ericthefish/master
...
Improve wordings
2015-09-10 09:41:28 -04:00
Ivan Lucas
4880fc489b
Fixed grammar on add friend wizard by rewording slightly
2015-09-10 11:21:01 +01:00
Ivan Lucas
840e9306d6
Fix Spelling and Grammar
2015-09-10 10:29:15 +01:00
Ivan Lucas
770e9340b3
Merge remote-tracking branch 'upstream/master'
2015-09-10 10:18:14 +01:00
Cyril Soler
4a0539c035
Merge pull request #103 from AsamK/html_parsing
...
Improve HTML parsing in libresapi
2015-09-09 19:57:07 -04:00
Cyril Soler
1acd4a3b01
Merge pull request #104 from PhenomRetroShare/Fix_ElidedLabel_mousePresEvent
...
Fix ElidedLabel::mousePressEvent.
2015-09-09 16:44:59 -04:00
Phenom
ce9fc7b7b5
Fix ElidedLabel::mousePressEvent.
2015-09-09 22:37:38 +02:00
Ivan Lucas
75a7a89e8f
Fix typo
2015-09-09 15:19:17 +01:00
AsamK
7aad9c12d0
Improve HTML parsing in libresapi
...
- Completely ignore content of <style> tags, otherwise CSS declarations
from newer RS builds are displayed
- Only remove <…> tags if it's really html, to prevent destroying messages
from other webui users
2015-09-09 13:36:00 +02:00
AsamK
b8c3c89ae0
Extract getPlainText method
2015-09-09 12:42:41 +02:00
thunder2
ebd5da5e83
Optimizations in RsGenExchange, p3GxsForums and p3GxsChannels.
...
- Removed not used variables
- avoid copy constructors
- Use swap instead of operator= to move elements of std containers
2015-09-09 09:46:46 +02:00
Cyril Soler
490b88c16a
Merge pull request #100 from ericthefish/master
...
Fix a couple of minor spelling issues
2015-09-08 14:17:29 -04:00
Ivan Lucas
a2e7e4de41
Fixed spelling/grammar
2015-09-08 16:12:50 +01:00
Ivan Lucas
4f8b098e94
Fixing spelling
2015-09-08 16:00:00 +01:00
thunder2
c4061fc6aa
Removed not used time consuming calculation of row count from RetroCursor.
2015-09-08 15:14:26 +02:00
thunder2
29a1fa2ce4
Removed unnecessary copy of results in RsGxsDataAccess.
2015-09-08 15:07:45 +02:00
sehraf
0bc77d75ae
added some error handling
2015-09-08 13:48:30 +02:00
Cyril Soler
da417eede9
Merge pull request #96 from AsamK/qmake_3
...
Qmake: Use PKGCONFIG and reduce duplicate code in .pro files
2015-09-07 20:38:47 -04:00
Cyril Soler
63e38af19c
Merge pull request #94 from AsamK/correct_libav_version
...
Fix libav version check
2015-09-07 20:36:03 -04:00
sehraf
03d99ae4af
made GenCertDislog more generic
2015-09-07 23:55:57 +02:00
