Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-15 02:44:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,638 Commits 63 Branches 22 Tags 195 MiB
3fc6f6b2db
Commit Graph

4860 Commits

Author SHA1 Message Date
Cyril Soler
463ebe7a7c Merge pull request #154 from sehraf/pr-lobby-time 
mark chat participants as inactive as long as no activity was seen an…
 2015-10-21 18:47:22 -04:00
sehraf
164c7265aa suggestion from cyril 2015-10-21 22:40:49 +02:00
defnax
bcfb3be460 Hide some Labels on Hidden Mode 2015-10-21 22:39:48 +02:00
sehraf
c06118904e mark chat participants as inactive as long as no activity was seen and reduce time to inactivity from 30 min to 10 min (patches #67) 2015-10-21 22:18:43 +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
Sergei Reznikov
34758be52a Add Haiku support 2015-10-20 20:32:44 +03:00
Phenom
79d761ae2e Add Win32 section in retroshare.pri 
And add MSys2 directories.
 2015-10-17 12:15:36 +02:00
Phenom
625461bf69 Fix Windows 7 32b Compilation from scratch. 
Add scripts to build Libs on branch.
 2015-10-17 12:15:35 +02:00
defnax
febea809b1 Fixed Reputation display, and set text Alignment. 2015-10-17 02:23:46 +02:00
Phenom
0cadfef3d3 Fix priority Speed Menu for download file. 
Not only downloading file can be setted.
 2015-10-15 18:34:56 +02:00
defnax
66670315dc Moved to display pending packets on a QTreeWidget. 
Fixed People layout/spacing & display votes column.
 2015-10-15 02:14:52 +02:00
csoler
441b164c73 fixed small bugs in average friend reputation display 2015-10-13 21:54:52 -04:00
Phenom
245a2826c6 Fix centered Typing Label on ChatWidget. 2015-10-13 20:11:30 +02:00
defnax
791f5fe886 Fixed ID Details Dialog with Reputation 2015-10-13 02:18:41 +02:00
csoler
71c8dfdc58 manual merge before creating a conflict-free PR 2015-10-12 14:45:11 -04:00
csoler
e6bb3073bd added update for forum messages list when an author gets banned 2015-10-12 14:04:23 -04:00
csoler
7dc59845e9 added update for forum messages list when an author gets banned 2015-10-12 14:03:53 -04:00
csoler
86b47d818b reduced icon size a little bit in GxsTreeWidgetItem 2015-10-12 10:58:24 -04:00
csoler
5a3756f058 fixed bug on reputation cutoff. Updated tooltips 2015-10-12 10:41:48 -04:00
csoler
82c16c6a27 fixed GUI tooltips over banned items. Added dropping of messages from banned identities in chat lobbies 2015-10-11 22:08:19 -04:00
csoler
1a76bea6ff enabled bannign button in forums, and disable message passing for banned users 2015-10-11 21:41:35 -04:00
csoler
e309dd6fed fixed banning users from forum threads 2015-10-11 10:00:11 -04:00
csoler
f750818402 added proper icons and names for banned users 2015-10-10 21:25:06 -04:00
csoler
68ca57ce75 added removal of messages frm banned users 2015-10-10 18:27:15 -04:00
defnax
1a229ef817 Fixed to display GXS ID item with a better icon size 2015-10-10 14:16:12 +02:00
csoler
338fcee865 added button in forums to flag poster identity as bad 2015-10-09 18:51:16 -04:00
defnax
e97f23d91a Improved icon size display on GroupTree. 2015-10-09 12:06:16 +02:00
csoler
8c6c9344fe fixed a few bugs in reputation items serialisation code and GUI display 2015-10-08 23:02:34 -04:00
defnax
3cbf0f6657 Fixed Cert Display on Email Invite Page 2015-10-07 20:13:18 +02:00
defnax
95bdd7f0a7 Fixed ChatWidget Margin's 
Set Alignment for frame off's Video icon
 2015-10-07 01:35:31 +02:00
Phenom
2b1d39cea1 Add HideChat Button. 
Change layout of video when text is hidden.
Add toolbar in fullscreen.
 2015-10-05 21:04:26 +02:00
Phenom
8a7e359557 Add a button on VOIP to hide text when video is on. 2015-10-05 21:04:26 +02:00
sehraf
6a570afb84 disable sorting while editing network view 2015-10-05 09:26:36 +02:00
csoler
317e7ea5ab added some backend for reputation system 2015-10-04 23:14:49 -04:00
csoler
c17dddb79c updated GUI for reputation 2015-10-04 17:47:30 -04:00
Phenom
64389e35d8 Fiw Delete key event in ChatWidget. 2015-10-03 11:00:16 +02: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
sirjenster
68fd1b206e First Mac/OSX compile fixes 2015-09-22 18:33:16 -07: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
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
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
defnax
4116f4b5cc Added Context menus for Edit Circle or Add/Remove Member 
Changed for OK Button renaming to Create (New Mode) or Update(Edit Mode)
 2015-09-11 02:46:34 +02:00
defnax
cecaf31f7d Clean up naming and added to display avatar icons. 2015-09-11 01:15:45 +02:00
defnax
b1527b608f Improved layout better look & feel for Circles View 
Added activity column
 2015-09-10 17:37:42 +02: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
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
csoler
0769dabb2e incorporated defnax changes 2015-09-08 22:40:35 -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
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
sehraf
03d99ae4af made GenCertDislog more generic 2015-09-07 23:55:57 +02:00
defnax
e2768e0c87 Added last used field to Person Details Window 2015-09-07 23:34:39 +02: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
defnax
2c1743f5bb Added send message function for Participants list. 2015-09-07 15:13:32 +02:00
defnax
cc4be39025 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2015-09-07 15:08:56 +02:00
csoler
734a308aa3 fixed some gui bits in IdDialog 2015-09-07 00:01:50 -04:00
csoler
a2d686351f move circles code to IdDialog 2015-09-06 23:53:21 -04:00
csoler
08be890339 added circle edit functionality to People tab 2015-09-06 18:19:51 -04:00
csoler
a1ce7f2d6f updated branch to upstream/master 2015-09-06 17:37:13 -04:00
csoler
697b7be5d1 fixed compilation of circles 2015-09-06 17:34:43 -04:00
AsamK
fe1ec9d510 Fixed mac compile. Moved sqlcipher.a to libretroshare.pro 2015-09-06 22:27:22 +02:00
AsamK
571336e1f4 Move duplicate common stuff out of platform parts 2015-09-06 22:27:22 +02:00
AsamK
66b9557833 Use PKGCONFIG instead of manually specifying LIBS for Linux 
- The advantage is that this method automatically includes additional
  dependencies of LIBS (e.g. libupnp needs -lixml).
- Also if some distribution moves headers to non default locations the
  correct locations get added by PKGCONFIG
 2015-09-06 22:27:22 +02:00
thunder2
5f36500d02 Fixed click in column "Friend nodes" in FriendList. 2015-09-06 14:21:05 +02:00
thunder2
d4226b6815 Fixed Windows compile. Moved "-lsqlcipher" to libretroshare.pro 2015-09-05 21:31:38 +02:00
AsamK
ae43058520 Make wikis compile 
- rsWiki->updated() doesn't exist anymore, so I ported WikiDialog to
  inherit from RsGxsUpdateBroadcastPage
- add -lglib-2.0 to pegmarkdown.pro
 2015-09-05 09:25:08 +02:00
AsamK
2bf81be6a7 Disable compiling of wikis in libretroshare 
It is disabled in the gui anyway
 2015-09-05 09:25:08 +02:00
AsamK
1f134d3431 Remove gxs CONFIG, it's always enabled now anyways 2015-09-05 09:25:08 +02:00
AsamK
4e917ea26c Disable compiling of pegmarkdown by default, only used for wiki 
- Move unfinished CONFIGs to common retroshare.pri file
- Compile and link pegmarkdown only if CONFIG+=wikipoos is set
 2015-09-05 09:25:08 +02:00
defnax
07c5030c36 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2015-09-03 17:41:30 +02:00
thunder2
b1b2de617a Fixed Windows compile. 
- Set name for prl file in libretroshare.pro
- Use "QMAKE_LFLAGS += -Wl,--start-group" to solve link issue
 2015-09-03 13:14:39 +02:00
AsamK
feafb1e291 Add "Paste as plain text" to context menu of RS text edits 
Useful for example when pasting from a website
 2015-09-03 00:28:19 +02:00
defnax
3d6e9783f6 Fixed Status Label on Distant Chat 2015-09-02 13:06:15 +02:00
Cyril Soler
d2dc8deeaf Merge pull request #66 from AsamK/qmake_improvements_next 
More qmake improvements
 2015-09-01 20:49:57 -04: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
AsamK
d116f40d6e Move openpgpsdk to common section of libretroshare.pro 
It is the same for all platforms
 2015-09-01 14:53:17 +02:00
AsamK
30d7aa3be3 Remove dependency on qt script, it's unused 2015-09-01 14:53:17 +02:00
AsamK
829c2f396e Move LIBS from gui/nogui linux section to libretroshare 
remove -lglib-2.0 it's not needed:
was added in d8e327afcc to compile for arch,
but it compiles on arch now also without this
 2015-09-01 14:53:17 +02:00
AsamK
846f7d0204 Make usage of sqlcipher explicit at compile time 
Either the build fails if it is not available, or the user specifies
CONFIG+=NO_SQLCIPHER to build without it, even if it exists in the system.
 2015-09-01 14:53:09 +02:00
Chozabu
da90bfec08 add option to disable updates to systray tooltip 2015-09-01 13:43:29 +01:00
AsamK
b43e0ab2e0 Fix compile with qt < 4.7 
Reenable placeholder text for lobby name, not sure why it was disabled
 2015-08-31 23:38:50 +02:00
AsamK
dca295143a Use CONFIG+=create_prl for libretroshare 
Allows to specify all LIBS in libretroshare.pro so they don't also have
to be specified in gui/nogui.pro
 2015-08-31 22:50:47 +02:00
AsamK
b9c174ba8f Add BIN_DIR variable to allow packagers to override it 2015-08-31 22:50:46 +02:00
AsamK
b66f466c7a Move all INSTALLS to the subproject they belong to 
Allows installation of for example only retroshare-nogui, without
installing files only relevant for gui

$ qmake
$ make retroshare-nogui
$ make retroshare-nogui-install_subtargets
 2015-08-31 22:49:46 +02:00
AsamK
e135e3441c Create retroshare.pri for common configurations in .pro files 
So far it only contains the default values for installation paths
 2015-08-31 21:09:28 +02:00
Cyril Soler
c844d37ada Merge pull request #63 from AsamK/lobby_gui_lag 
Remove lobby gui lag
 2015-08-31 14:11:45 -04:00
Cyril Soler
ef292faa22 Merge pull request #61 from PhenomRetroShare/Improve_ElidedLabel_Alignment_HTML 
Improve ElidedLabel
 2015-08-31 10:43:29 -04:00
AsamK
cfde9d303c Escape name before inserting in name changed message and in anchor info 2015-08-31 16:38:28 +02:00
AsamK
bd6bb8996b Improve performance of eventFilter in chat lobbies 
- Only check the anchors if the visible content has actually changed
  by saving lastUpdateCursorPos and End
- Check notify first, before doing any work
- Simplify regexp as the anchors have a fixed format
- Remove unnecessary conversion to utf8 and back
 2015-08-31 12:10:49 +02:00
AsamK
5f81d8efc8 Remove nick from anchor names, causes problems 
- Nicknames that contain " could break the formatting
- Nicknames containing chars like < or > were converted to html entities
  by the QTextBrowser so the anchor was no longer identical with the
  anchor stored in the _listMsg list
 2015-08-31 12:10:49 +02:00
Thunder
de92c06f0b Merge pull request #62 from hunbernd/qt5-fix 
Qt5 fix
 2015-08-31 12:05:08 +02:00
hunbernd
bd3f7f6d38 Removed limit on opacity setting with recent windows versions on BandwidthGraphDialog 
Conflicts:
	retroshare-gui/src/gui/statistics/BandwidthGraphWindow.cpp
 2015-08-30 22:53:38 +02: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
d9fd60ee75 Moved Id Chooser to Tool Menu 
Added a place holder text.
 2015-08-30 03:48:45 +02:00
Phenom
f73ee2c769 Improve ElidedLabel 
Now respect alignment and html text.
Html is shown as plain text, no html in QTextLine...
Test with:
retroshare://file?name=Test_ElidedLabel.7z&size=7330&hash=bd19f1a486d34d08e434ca4309cf4b8f7a436e9e
 2015-08-29 21:06:36 +02:00
Phenom
88a6931758 Allow Chat Text Format Option working. 2015-08-29 19:27:03 +02:00
defnax
ecb5d93685 changed default color for the system chat bubble 2015-08-29 04:01:01 +02:00
defnax
c07bef37a0 Fixed Create Lobby Dialog's window size 2015-08-28 16:40:40 +02:00
Cyril Soler
a45de1ddb3 Merge pull request #57 from csoler/v0.6-SignedLobbies 
V0.6 signed lobbies
 2015-08-28 00:14:24 -04:00
csoler
40bffc3042 fixed last GUI bugs for authed lobbies 2015-08-27 23:09:31 -04:00
csoler
6d01461c66 fixed a few GUI bits for non anonymous chat lobbies 2015-08-27 22:37:01 -04:00
defnax
627dcc01a0 Merge pull request #50 from chozabu/forum_additions 
enable customisation of columns in forum thread widget
 2015-08-28 02:01:15 +02:00
AsamK
5dad1680e6 Implement history for distant chat 
Uses the same history config as private chat
 2015-08-28 01:29:34 +02:00
AsamK
622e94223c Remove Thumbs.db files and add to .gitignore 2015-08-27 22:35:28 +02:00
AsamK
699213af80 Load chat styles also from DATA_DIR/stylesheets 
Chat styles were only loaded from user config dir
(or application dir on windows portable)

If a style exists in both folders, it's taken from config dir, so users
can customize chat styles by copying them to ~/.retroshare/stylesheets/
 2015-08-27 22:35:28 +02:00
AsamK
66ba687acd Install qss and chat styles 2015-08-27 22:35:28 +02:00
defnax
6e1a8fac10 Merge pull request #21 from AsamK/lobby_history 
Store lobby history on disk
 2015-08-27 18:43:28 +02:00
csoler
040b4fb949 implemented gp-authed lobbies. Still needs some GUI 2015-08-26 23:35:36 -04:00
Cyril Soler
b8459b3161 Merge pull request #44 from AsamK/improve_qmake 
Improve qmake: "make install" support and ability to change install prefix
 2015-08-26 20:38:27 -04:00
Cyril Soler
ef499cd570 Merge pull request #46 from PhenomRetroShare/Fix_ChatWidgetSearchTextThreshold 
Fix chat widget search text threshold
 2015-08-26 19:43:56 -04:00
Cyril Soler
668394d676 Merge pull request #47 from PhenomRetroShare/AddHTML_TextOptimization_0.6 
Add html text optimization 0.6
 2015-08-26 19:42:42 -04:00
Cyril Soler
6ba2f68cb5 Merge pull request #45 from PhenomRetroShare/Fix_ChatWidgetLastCursorFormatting 
Fix chat widget last cursor formatting
 2015-08-26 19:31:50 -04:00
defnax
a39663db01 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2015-08-26 23:51:42 +02:00
defnax
17af892434 set a default minimum column header size for comments. 2015-08-26 23:50:06 +02:00
thunder2
641a433f97 Fixed filter in FriendList. 2015-08-26 19:30:43 +02:00
defnax
217c9b9538 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2015-08-26 19:20:32 +02:00
defnax
9d65b087d8 set default background color for system messages at private chat window 2015-08-26 19:19:24 +02:00
thunder2
da66ac5cff GxsGroupFrameDialog: Fixed restore of active group tree item when subscrube/unsubscribe a group. 2015-08-26 15:06:09 +02:00
Chozabu
185220b08f enable customisation of columns in forum thread widget 2015-08-25 22:59:38 +01:00
Cyril Soler
836b8668fc Merge pull request #37 from sehraf/pr-friendlist_import_export-V2 
friendlist import export
 2015-08-24 20:28:38 -04:00
AsamK
5ae5d76ffc Make file names consistent with packaging 
Rename executables:
RetroShare -> RetroShare06
retroshare-nogui -> RetroShare06-nogui

Add 06 suffix to icons and desktop file

Update README, debian rules and windows installer file
 2015-08-24 00:03:57 +02:00
AsamK
d4a36ed38b Make data and plugin directory configurable at compile time 
e.g.:
$ qmake PREFIX=/usr/local
$ qmake LIB_DIR=/usr/lib64

A full recompile is necessary when changing the PREFIX!
 2015-08-24 00:03:57 +02:00
AsamK
6b7a6e2313 Make RS installable with "make install" 2015-08-24 00:03:57 +02:00
Phenom
531ce34151 Merge branch 'master' into AddRetroShareLinkOpenFileWhenExists 2015-08-23 18:17:09 +02:00
Phenom
860292da12 Merge branch 'master' into AddHTML_TextOptimization_0.6 2015-08-23 18:16:43 +02:00
Phenom
70b9c456d5 Merge branch 'master' into Fix_ChatWidgetSearchTextThreshold 2015-08-23 18:09:30 +02:00
Phenom
79fb8dfe04 Merge branch 'master' into Fix_ChatWidgetLastCursorFormatting 2015-08-23 17:49:19 +02:00
Cyril Soler
e9aa4ff43b Merge pull request #3 from chozabu/copy_version_info_button 
add button to copy version info in first level about box
 2015-08-23 11:15:05 -04:00
sehraf
d1deef0733 fixed new lines in certificate string 2015-08-23 16:43:34 +02:00
Cyril Soler
7bd41e9fcb Merge pull request #4 from chozabu/grouter_stats_basic_names 
minor tweak to list friends in order they are shown on graph
 2015-08-23 10:15:10 -04:00
Phenom
023473443b When the file in the link already exists, RS open it. 2015-08-23 12:03:46 +02:00
sehraf
791fb78ed9 renaming details and details2 for better clarification 2015-08-23 09:58:31 +02:00
sehraf
ad499e6bd6 renamed 'pubkey' to 'certificate' and removed empty location names 2015-08-23 09:55:43 +02:00
Phenom
326a33059d Fix ChatWidget last cursor formatting. 
To test it, search a text that will be colored a end.
New messages lose their format.
 2015-08-22 17:38:35 +02:00
Phenom
c44afc092e Merge branch 'master' into Fix_ChatWidgetSearchTextThreshold 2015-08-22 17:02:43 +02:00
Phenom
b1fd29033b Merge branch 'master' into AddHTML_TextOptimization_0.6 2015-08-22 16:38:20 +02:00
Phenom
5c970100f1 Fix ChatWidget search text label threshold. 2015-08-22 16:31:08 +02:00
thunder2
334ddf8efc Enabled sort by columns other than name combined with sort by state in FriendList. 2015-08-22 00:57:26 +02:00
thunder2
176c3abd8c FriendSelectionWidget: 
- Added sort by state
- Moved buttons "All"/"None" into context menu

MessageComposer:
- Removed double details action
 2015-08-21 19:24:24 +02:00
thunder2
4923c47eb3 RSTreeWidget: 
- Added possibility to add own actions to header context menu
- Added resort of items
 2015-08-21 19:24:23 +02:00
Phenom
02775c6fb4 Add HTML Text Optimization by exporting styles. 2015-08-20 17:55:20 +02:00
sehraf
04a1c10a56 fixed UTF-8 group names 2015-08-19 19:12:38 +02:00
sehraf
941959cc86 conversion from QSettings to XML 2015-08-19 19:08:48 +02:00
thunder2
48c3eedcf5 Removed "CONFIG += console" for Windows release build. 2015-08-19 13:22:31 +02:00
thunder2
3b40f0e0c8 FriendList: 
- Show information of the "best" ssl item on the gpg item only when the gpg item is not expanded.
- Calculate the icon height from the font metrics
- Show the information text with normal font and color
 2015-08-19 11:04:50 +02:00
csoler
42bbf76035 fixed display of software revision in main window (patch from ASmith) 2015-08-18 20:21:45 -04:00
sehraf
80d765e1d6 small fix 2015-08-18 23:17:29 +02:00
sehraf
36349814a6 added import/export friendlist 2015-08-18 23:05:22 +02:00
Cyril Soler
f6b830d5aa Merge pull request #35 from hunbernd/chat-fix 
Chat fix. Thx for this.
 2015-08-15 21:46:22 -04:00
hunbernd
16859a1d3a Fix: chatlobby toaster not working 2015-08-15 23:37:33 +02:00
defnax
4a50a62cc8 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2015-08-14 12:38:36 +02:00
hunbernd
0402e53f15 Fix: empty line duplication bug 
to reproduce:
hit: a<enter><enter>b
the result will be: a<br><br><br>b
the empty line is two lines high
 2015-08-13 22:13:21 +02:00
thunder2
4095d9d5c9 Switched retrieve of posts in GxsMessageFramePostWidget from "requestMsgRelatedInfo" to "requestMsgInfo". 2015-08-13 22:09:46 +02:00
defnax
e66707111b Moved IP Filter Widgets into Tabs 2015-08-13 13:48:57 +02:00
defnax
7472f81940 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2015-08-11 17:01:53 +02:00
defnax
9d291aa6f6 update windows build scripts 
changed gxs id icon for linked with profile.
 2015-08-11 16:44:59 +02:00
thunder2
a765016240 Moved column show/hide from context menu of the tree to the context menu of the header in IdDialog. 2015-08-11 16:01:43 +02:00
thunder2
e73e68d860 Reduced the size of the status icon on the avatar image in FriendList. 2015-08-11 13:40:02 +02:00
defnax
783465bc89 forget to commit this, for the Search Filter DHT IPs 2015-08-10 18:27:29 +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
c9197864c6 Fixed typo. 
Updated english translation.
 2015-08-09 15:52:26 +02:00
thunder2
d5c95c4b28 Fixed layout of the ServicePermissionsPage 2015-08-08 22:46:31 +02:00
thunder2
9265145ca7 Updated english translation 2015-08-08 21:14:02 +02:00
thunder2
87f2e6da37 FriendList: 
- Removed avatar column
- Removed state column
- Added combined avatar and status icon
- Added status icons in 64px
- Renamed "Hide state" to "Show state"
- Added sort by name and state

RSTreeWidget:
- Added version for load/save state
- Added method setColumnCustomizable
 2015-08-08 20:27:19 +02:00
AsamK
ef5fca5e5e Resolve nicks from gxsId in lobby chat history 2015-08-07 19:08:10 +02:00
defnax
c168765bb2 Added tab for the DHT TreeWidgets for better view 
Added a search Filter for DHT IP addresses
 2015-08-07 15:14:47 +02:00
sehraf
48bb8b48c9 sequel to 6b2ed2fb2d 2015-08-05 23:45:45 +02:00
thunder2
789df68582 - Added update of version information for Windows build 
- Added template file version.html.in
- Removed RS_BUILD_NUMBER from Windows executable FileVersion
 2015-08-04 15:15:49 +02:00
csoler
9e978e1442 updated version info to new hexa format 2015-08-02 19:10:59 +02:00
Chozabu
453415fd3e minor tweak to list friends in order they are shown on graph 2015-07-31 16:42:39 -04:00
Chozabu
69d23a4982 add button to copy version info in first level about box 2015-07-31 16:40:45 -04:00
electron128
9897def2cc fix #21 typo "defaut" instead of "default" in switch statement in RSGraphWidget (patch from Chozabu) 2015-07-31 17:27:04 +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
d004056f67 fixed position of scaled/highlighted nodes in node graph (patch from Chozabu) 2015-07-31 17:26:22 +02:00
electron128
a9ef48d133 webui: added chat 2015-07-31 17:26:11 +02:00
csoler
1939ea9f54 added correct image file for finished transfers 2015-07-31 17:25:54 +02:00
csoler
2a47095599 removed unused method for OutQueue statistics; improved BW curve display; fixed a few display bugs 2015-07-31 17:24:19 +02:00
csoler
685ddbbf0a fixed a few bugs in statistics GUI. Still misses names and proper curve display 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8612 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-31 17:23:31 +02:00
thunder2
c76141ed65 Added missing initialization in 
- pqissl
- pqissludp
- PeerConnectStateBox
- RsTlvBanListEntry
- RsServer
- TcpStream
- PGPCertificateInfo
- peerConnectAddress
- AudioInputConfig
- SpeexInputProcessor
- xProgressBar
- TBoard

Removed unused member:
- xProgressBar


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8611 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-13 11:03:18 +00:00
thunder2
2a6e1d0a8c Removed unused member from ProfileManager. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8609 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-13 08:27:49 +00:00
csoler
989f80786e saving current work on new bandwidth display. Still need to add names for services/peers, and use an appropriate curve style 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8608 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-13 03:04:36 +00:00
thunder2
9279cc17b1 Added missing restore of ostream format (std::dec) in CreateLobbyDialog::createLobby. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8606 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-12 22:00:10 +00:00
thunder2
737da1201d Fixed crash in ChatMsgItem::removeItem when "mParent == NULL". 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8605 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-12 21:56:12 +00:00
thunder2
a9094f8faf Fixed crash in ChatLobbyUserNotify::subMenuClicked when using "Remove All" of the chat lobby notifier. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8603 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-12 21:10:03 +00:00
electron128
951a1f9454 fixed wrong include line in ui file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8602 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-12 11:41:40 +00:00
electron128
402e77d532 added missing include 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8601 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-12 08:57:38 +00:00
csoler
9471a91795 added basic functions to collect bandwidth info in pqistreamer both ways; added a sorting method in BWGraphSource to create curves from extracted BW info. Still not yet functional 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8600 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-12 04:04:18 +00:00
thunder2
409db56a59 Removed dead code from ImHistoryBrowser::fillItem. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8597 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-12 01:27:27 +00:00
thunder2
8691a911aa Fixed possible crash in DetailsDialog::setFileHash by checking return value of dynamic_cast. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8596 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-12 01:19:28 +00:00
thunder2
86a5c2e656 Fixed possible crash in ChatLobbyDialog::init by checking return value of dynamic_cast. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8591 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-12 00:54:42 +00:00
csoler
6e4045124c fixed wrong include line in ui file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8588 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-11 23:30:07 +00:00
csoler
2d04a991fb added missing file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8587 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-11 21:07:21 +00:00
csoler
975b2d8783 moved all bw graph files in statistics. Removed outqueue info widget. Created new cpp files to host the bw graph code. Started minimal UI to display bw information. The goal is to create a widget for displaying selective bw info [work in progress] 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8586 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-10 03:24:39 +00:00
thunder2
621abee8da Enabled Messenger Window in system tray icon. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8585 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-09 21:36:32 +00: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
thunder2
c0ad7d3e46 FriendList: 
- Added customize of columns with RSTreeWidget.
- Reduced display menu.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8583 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-09 20:53:28 +00:00
thunder2
e8e02b9c79 Added customize of columns to RSTreeWidget. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8582 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-09 20:23:52 +00:00
csoler
46a4273668 added back functionality to choose DL directory for each channel 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8581 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-07 00:52:52 +00:00
thunder2
f91ca2b47e Removed generate of channel messages. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8580 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-06 23:35:52 +00:00
thunder2
b7bbe3c937 Optimized fill of forums when modifying the read state. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8579 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-06 14:17:02 +00:00
thunder2
00007768f1 Fixed overlay icon (star) for tray icon. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8578 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-06 09:10:57 +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
bdb85a3f54 fixed up FileTransferInfoWidget for high DPI 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8575 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-01 20:04:12 +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
4e08cd2f83 fixed wrong icon path for Transfers tab 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8569 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-29 12:01:28 +00:00
thunder2
3a71b8b662 Added stylesheet to plugins. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8563 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-28 10:11:47 +00:00
thunder2
686fec496f Moved fix font from GenCertDialog to qss (Modified patch from Henry). 
Added defaults to ui without style sheet

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8562 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-27 13:18:57 +00:00
csoler
b8434a649e added a few 128px icons 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8561 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-27 11:47:37 +00:00
csoler
6003b0d0d2 setup new icons directory and qrc file generation script 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8560 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-27 09:42:25 +00:00
csoler
8822d12707 fixed sizes in GxsIdTreeWidgetItem 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8559 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-27 09:14:20 +00:00
csoler
765e2a15ed fixed fnt size problems in global router stats window 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8558 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-26 18:33:03 +00:00
thunder2
a53a7525c0 Fixed typo in string (Patch from Henry). 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8557 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-26 16:42:36 +00:00
thunder2
227e7121cc Added disable/enable of GxsIdDetails process. 
Disabled GxsIdDetails process when filling gxs id's in forums.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8556 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-26 11:44:45 +00:00
thunder2
c3b794afb2 Fixed compile with Qt 5 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8555 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-26 08:14:09 +00:00
csoler
7d541318b3 further improvements to layouts and sizes for high DPI screens 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8554 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-25 20:11:39 +00:00
csoler
7334e4d5de first attempt at fixing statistics layout for high DPI screens, using the font metrics to determine the scaling ratio 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8553 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-24 20:55:09 +00:00
thunder2
da8b6cbae1 Optimized load of forums by moving the avatar handling for the tooltip to the tooltip creation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8552 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-24 19:27:52 +00:00
csoler
d81a1c3900 removed useless debug info 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8548 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-23 19:36:47 +00:00
electron128
23f04b1622 limit width of typing label to 400px, to prevent long names from stretching the chatwidget (patch from Henry) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8545 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-23 16:37:53 +00:00
thunder2
2d26a329c6 Removed fix height of header frame in FriendsDialog. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8544 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-23 14:31:27 +00:00
thunder2
f6865fcce8 Fixed font size of locale and remote file list content. 
The header still need to be fixed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8542 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-23 12:19:33 +00:00
thunder2
1ae0df1ad2 Removed unnecessary settings from MessagesDialog.ui 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8540 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-22 12:54:21 +00:00
electron128
cfdbbc71c2 corrected caps in MessageComposer (patch from Henry) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8539 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-22 10:57:05 +00:00
electron128
99efa00c14 changed strings "Location" to "Node" (patch from Henry) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8538 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-22 10:42:35 +00:00
thunder2
0626255bbb Updated languages from Transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8536 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-21 10:11:45 +00:00
thunder2
00cf152a24 Used QTextBrowser to show the channel description for unsubscribed groups to avoid the horizontal growing of the channel list. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8535 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-21 01:00:01 +00:00
electron128
a1febb2c54 in RSStyle use list.clear instead of list.empty, which was probably a bug 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8529 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-19 11:39:34 +00:00
thunder2
a0c0b9afa5 Fixed memory leak in GuiExprElement. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8527 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-18 16:29:29 +00:00
electron128
6a924cb854 fixed pasting of rslinks with special characters with Qt5 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8519 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-18 12:53:54 +00:00
electron128
99f0868f3f fixed strings in IdDialog (patch from Henry) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8518 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-18 11:26:00 +00:00