Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,901 Commits 63 Branches 22 Tags 194 MiB
b1527b608f
Commit Graph

3922 Commits

Author SHA1 Message Date
defnax
b1527b608f Improved layout better look & feel for Circles View 
Added activity column
 2015-09-10 17:37:42 +02:00
csoler
0769dabb2e incorporated defnax changes 2015-09-08 22:40:35 -04: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
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
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
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
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
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
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
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
Phenom
531ce34151 Merge branch 'master' into AddRetroShareLinkOpenFileWhenExists 2015-08-23 18:17:09 +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