Gio
8ab3c7de26
Merge branch 'master' into android
2016-11-07 14:37:23 +01:00
mr-alice
8c7c7647b0
fixed conflicts in merging upstream/master to v0.6-FTEncryption
2016-11-01 14:23:13 +01:00
mr-alice
34dcb410b4
fixed a few bugs in ftServer for encrypted tunnel management
2016-10-30 11:36:00 +01:00
mr-alice
babc126be3
added default encryption policy variable and GUI to change it
2016-10-29 17:59:03 +02:00
Gio
ea42d822c2
Merge branch 'master' into android
2016-10-26 13:43:24 +02:00
hopetech
ecaea051fa
Fix some compilation warnings
2016-10-19 15:41:25 +02:00
Phenom
4db6d6b56f
Fix the "Desktop file is missing" shown in option page.
2016-10-13 13:26:44 +02:00
Phenom
4b0f82a6d0
Fix Desktop Filename for option page message.
2016-10-08 12:12:37 +02:00
mr-alice
de104d3e34
fixed up GUI parameters in Directories. Removed HashCache duration handles since this is now automatic
2016-09-18 18:34:39 +02:00
mr-alice
53c65fff9f
removed cache transfers from the GUI
2016-09-13 18:54:00 +02:00
Gio
9d83d56811
Merge branch 'master' into android
2016-09-04 15:16:57 +02:00
defnax
57c9bef993
updated settings icons and some missed one
2016-08-27 18:15:13 +02:00
Gio
279551fe8d
Retroshare android service now run and start at boot on android, the qml app is still disfunctional
2016-08-23 12:15:28 +02:00
Gio
9a980def2c
libretroshare now compiles for Android, instruction on how to do it included
2016-08-23 12:15:28 +02:00
Phenom
f71aad4b9c
Add Chat Load Embedded Images Option like forum and message.
2016-08-13 09:46:31 +02:00
Phenom
d0482707c5
Add Case Sensitive option for Lobby Notify.
2016-08-07 19:00:23 +02:00
csoler
7545ad4d11
simplied/improved reputation system. Now ids can be banned based on their owner node using a single checkbox in the Person tab, with immediate effect
2016-08-04 11:43:35 +02:00
Cyril Soler
60cf2991d4
Merge pull request #436 from G10h4ck/libresapilocal
...
Libresapilocal
2016-08-03 08:46:15 +02:00
csoler
5fac5a8d76
moved all getOpenFilename to use misc::getOpenFilename
2016-07-31 22:15:56 +02:00
Gio
fe7de83529
WebUI is now optional but enabled by default at compile time
2016-07-28 14:08:49 +02:00
csoler
ed05ec7008
fixed text in People tab
2016-07-25 16:06:28 -04:00
csoler
f5e55e849b
fixed a few bugs in the People tab
2016-07-25 16:04:30 -04:00
csoler
218977170c
added two new options to people page for handlign reputations: change the ban limit from friend opinions, and allow to auto-set positive opinions to contacts
2016-07-25 15:45:49 -04:00
csoler
95edc5ba8e
fixed variable name problem in ServerPage (with no consequences)
2016-07-22 10:06:24 -04:00
Gio
b5f95cb651
libresapilocal is now optional (enabled by default)
2016-07-15 11:25:31 +02:00
Gio
47414acb62
Basic support to access libresapi via unix socket / windows named pipes
2016-07-15 11:25:31 +02:00
Phenom
e6347d7aef
Fix "!!!The RetroShare's desktop file is missing or wrong!!!" message
...
for Linux.
2016-06-25 11:09:28 +02:00
csoler
07bda26192
fixed permission matrix widget crash
2016-06-18 16:27:15 -04:00
csoler
dbd78d2401
merged with upstream/master
2016-06-16 20:19:03 -04:00
Cyril Soler
ceecdb2771
Merge pull request #414 from PhenomRetroShare/Add_MessageWhenSendingArgToOtherInstance
...
Add message, when sending arguments to other instance, to disable this
2016-06-14 20:31:38 -04:00
Phenom
ddbcd2150c
Add buttons to send message in plain text and without EmoteIcon.
2016-06-14 23:01:08 +02:00
Phenom
9b09187340
Add message, when sending arguments to other instance, to disable this
...
option.
2016-06-14 16:49:18 +02:00
csoler
f55b283887
second pass over compilation warnings
2016-06-05 11:05:52 -04:00
csoler
927f782bef
pass over compiler warnings
2016-06-05 10:43:57 -04:00
sehraf
6e38554bcd
rename define UBUNTU to HAS_GNOME_KEYRING
...
The name UBUNTU is misleading since it is only used to select the keyring backend (which is gnome keyring on linux).
This also allows to support other keyrings on linux in the future (e.g. KDEs keyring)
2016-06-02 14:57:46 +02:00
Phenom
42a2b37abb
Move SearchBar to Tool Bar and remove Show/Hide action.
...
As asked by Cyril in PR#346
2016-04-13 19:21:18 +02:00
Phenom
10bb542e83
Allow only one instance for useLocalServer option activated. If exists,
...
pass to it arguments.
For now, only allow to pass RsCollection file and retroshare://
protocol.
2016-04-06 22:04:53 +02:00
csoler
5bbaa1e8e5
added people settings page, removed debug output
2016-04-02 16:14:18 -04:00
Phenom
16c59af9f4
Correct Colored Name Contrast in chat, same way than text.
2016-03-12 13:25:10 +01:00
defnax
abf7a72ce8
increase default font size for the ListWidget.
2016-02-13 17:38:01 +01:00
defnax
70bf938654
reduced the default width & height
...
reorder in MessagePage, move Distant Message box to the top.
2016-01-23 13:37:08 +01:00
csoler
6a32da2420
removed explicit size constraint on listview for config page (screws up the view in HDPI screens) to let the list take its preferred size
2016-01-21 21:40:48 -05:00
csoler
c597c8cb6f
removed explicit spacing sizes in plugins page
2016-01-19 23:19:46 -05:00
csoler
1471979e0e
added a few tooltips in Tor configuration panel
2016-01-19 18:08:47 -05:00
defnax
312cea7481
Fixed double selection bug on Windows Vista style
2015-12-28 16:42:42 +01:00
csoler
9dfac71822
connected GUI to distant chat permission flags system
2015-12-27 21:10:20 -05:00
csoler
140205108a
added backend for distant message and distant chat filtering based on contact list
2015-12-25 22:37:06 -05:00
defnax
7afcc2a91e
Enabled back counting People
...
Enabled "Sort by Posts" for Channels/Forums/Posted
Fixed Width/Height of Message Composer
Moved Chat Settings Page order.
2015-12-24 17:46:02 +01:00
csoler
5d9272055f
merged with upstream/master
2015-12-22 18:33:01 -05:00
defnax
8e9fe6d800
Merge pull request #189 from hunbernd/feature/chat-enhancements
...
Chat enhancements
2015-12-22 01:07:02 +01:00
hunbernd
77804bbf16
Remove location from user name when using /me
2015-12-20 21:31:45 +01:00
csoler
0c1e6301b3
merged with latest upstream trunk
2015-12-05 16:49:00 -05:00
csoler
325956e8ed
renamed flag for messaging permissions to a more appropriate name
2015-12-04 23:15:52 -05:00
csoler
be17a563d1
fixed compilation and added flag function for permissions in messaging
2015-12-04 23:08:49 -05:00
csoler
39f4878244
incorporated changed from defnax
2015-12-04 22:42:56 -05:00
csoler
9193d3579b
merged with latest master before creating PR
2015-12-04 21:24:51 -05:00
csoler
81ab43beb9
fixed GUI update of avatars and status for distant chat. Updated backend for new model. Fixed a few bugs in serialisation
2015-11-30 00:02:44 -05:00
Cyril Soler
17dc7c7dfc
Merge pull request #68 from chozabu/systray_tweaks
...
add option to disable updates to systray tooltip
2015-11-16 23:56:37 -05:00
electron128
b340d8a37e
Hide about button and add better description for unloaded plugins
2015-10-25 11:49:44 +01:00
defnax
bcfb3be460
Hide some Labels on Hidden Mode
2015-10-21 22:39:48 +02:00
defnax
aec42a8e1f
Improved Network Settings Layout, better look and order
2015-10-21 04:16:20 +02:00
csoler
6f3ba57314
fixed up default sizes for list icons and main page icons for high DPI screens
2015-10-20 22:00:15 -04:00
Cyril Soler
bd94fcd08e
Merge pull request #98 from PhenomRetroShare/AddMinimumFontSizeInChat
...
Add minimum font size in chat.
2015-10-02 10:53:00 -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
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
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
Phenom
3f155b9b75
Add minimum font size in chat.
2015-09-13 17:35:19 +02:00
Ivan Lucas
840e9306d6
Fix Spelling and Grammar
2015-09-10 10:29:15 +01:00
sehraf
fed43450ae
made server settings more generic and added i2p support
2015-09-07 23:01:24 +02:00
sehraf
95d6b06eb5
first working version
2015-09-07 21:34:10 +02:00
sehraf
0107f4e406
first run on gui integration
2015-09-07 21:34:10 +02:00
Chozabu
1630577e04
dont set tooltip if enabling updates, set tooltip on save incase of update between click and save
2015-09-02 01:09:39 +01:00
Chozabu
da90bfec08
add option to disable updates to systray tooltip
2015-09-01 13:43:29 +01:00
hunbernd
acc3e4bb62
Replaced Q_WS_ --> Q_OS_
...
Q_WS macros are not available in Qt5
Restores some functions in Options->General dialog that were not available under Qt5
2015-08-30 22:51:15 +02:00
defnax
e66707111b
Moved IP Filter Widgets into Tabs
2015-08-13 13:48:57 +02:00
Cyril Soler
13e77fb7e5
Merge pull request #19 from sehraf/pr-fix_crash_on_shutdown
...
Thx sehraf. Indeed, the object was created twice, before your patch. Not good.
2015-08-09 17:04:24 -04:00
thunder2
9d0b0664f1
Fixed hide offline friends in ServicePermissionsPage
2015-08-09 22:30:47 +02:00
thunder2
d5c95c4b28
Fixed layout of the ServicePermissionsPage
2015-08-08 22:46:31 +02:00
sehraf
48bb8b48c9
sequel to 6b2ed2fb2d
2015-08-05 23:45:45 +02:00
electron128
6b2ed2fb2d
fix #20 crash on shutdown with plugins enabled. Settings window did leak plugin config pages (patch from hunbernd)
2015-07-31 17:26:52 +02:00
electron128
a9ef48d133
webui: added chat
2015-07-31 17:26:11 +02:00
csoler
249c827f95
improved debug info in a few places
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8584 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-09 20:55:11 +00:00
csoler
0dbd5a22a0
fixed up permission matrix icons
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8577 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-04 19:07:17 +00:00
csoler
13e25ea432
fixed icon sizes in lobby participant list
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8576 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-03 20:27:30 +00:00
csoler
d3257e4455
fixed a few more icons (help icons, grou tree widgets, bullets)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8573 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-30 16:44:58 +00:00
csoler
ebc8bb072c
fixed a few icons and sizeHint functions. Removed unused SFListDelegate files from compilation
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8571 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-29 16:08:17 +00:00
electron128
18df09e032
fixed typo in server page "127.0.01"
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8570 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-29 13:28:29 +00:00
csoler
3b889e595a
changed default news feeds to include security_IP, remove Peer connects (this one drives most people crazy)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8496 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-16 18:41:13 +00:00
defnax
0755786037
Set again the default tab Network settings
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8488 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-16 13:32:12 +00:00
electron128
d3f33b029e
change label "Security Ip" to "Ip security" in feed settings(patch from Henry)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8483 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-16 11:04:30 +00:00
thunder2
6adeb52e93
Fixed possible dereference of null pointer in NotifyPage.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8478 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-15 22:00:00 +00:00
thunder2
ad4f57d756
Added own flag and new checkbox in settings for security ip feed items.
...
Changed NewsFeed::addUnique for SecurityIpItem to compare the ip addresses.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8424 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-13 01:28:01 +00:00
electron128
d9e1473533
fixed whitespaces in strings (patch from Henry)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8421 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-12 08:27:26 +00:00
thunder2
53daf911fb
Changed string TOR to Tor.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8412 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-11 14:30:26 +00:00
