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
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
