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,820 Commits 63 Branches 22 Tags 194 MiB
d51b4b2b67
Commit Graph

7820 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AsamK
d51b4b2b67 Adapt debian/ubuntu package files to use "make install" 2015-08-28 22:48:20 +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
defnax
7270ba908a Merge pull request #56 from AsamK/distant_chat_history 
Implement history for distant chat
 2015-08-28 01:58:37 +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
Cyril Soler
d7531b3dea Merge pull request #54 from cavebeat/coverity 
travis/coverity tokens updated
 2015-08-27 19:28:09 -04:00
Cyril Soler
92405128e6 Merge pull request #55 from AsamK/install_stylesheets 
Install qss and chat stylesheets on Linux
 2015-08-27 19:27:24 -04: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
thunder2
4d7f92ecbe Removed unnecessary select of groups in RsGxsNetService::locked_genReqGrpTransaction. 2015-08-27 22:27:19 +02:00
thunder2
753846beaf Added count of requests and results to debug output in RsDataService::retrieveGxsGrpMetaData 2015-08-27 22:25:24 +02:00
thunder2
d118a13d5a Fixed adding of empty group id to notify when removing a group. 2015-08-27 22:23:04 +02:00
thunder2
4cc1df3c12 Ignore updates of not existing groups in RsGenExchange::processGrpMask. 
Solves:
"Error code: no such column: subscribeFlagGXS_MASK_HACK"
 2015-08-27 22:23:03 +02:00
cave beat
d8aa7121c5 travis/coverity tokens updated 2015-08-27 19:08:25 +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
AsamK
c622ca035b Issue compile error if DATA_DIR is not set 2015-08-27 01:44:45 +02: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
Cyril Soler
1736ad894f Merge pull request #11 from cavebeat/coverity_scan 
coverity integration to travis
 2015-08-26 19:30:54 -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
Thunder
c29ae55784 Merge pull request #38 from cavebeat/rm_linkscloud 
removed LinksCloud
 2015-08-26 22:27:36 +02:00
thunder2
1a1a2aa11d Lowered update of server sync TS from 10 seconds to 60 seconds. 2015-08-26 20:23:10 +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
thunder2
389f2f0528 Removed delete of message files in RsDataService::resetDataStore. 2015-08-25 18:02:40 +02: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
5aaf3e66f7 Move data dir from build_scripts/ to root and adapt RedHat build files 
The icons and desktop file in the data directory are shared between
linux distributions so they shouldn't be in the build_scripts directory.

The redhat build now makes use of "make install" and relocatable plugins dir.
 2015-08-25 00:56:50 +02:00
Cyril Soler
4dbffe0db0 Merge pull request #48 from PhenomRetroShare/AddRetroShareLinkOpenFileWhenExists 
Add retro share link open file when exists
 2015-08-24 08:39:12 -04:00
AsamK
5c67941e53 Update README.md 2015-08-24 00:15:36 +02: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
91e19fc61e Disable installing of headers and libretroshare.a 
The list of interface header files is outdated and probably of no use
to anyone.
 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
Cyril Soler
fa54fcefdd Merge pull request #49 from heini/redhat_build 
Provide RedHat family packaging script.
 2015-08-23 17:22:40 -04:00
thunder2
1fcae6155d Removed static defines for column numbers in RsDataService and replaced it with members. Initialized members when adding attributes to the select list. 2015-08-23 19:05:37 +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