Commit Graph

7899 Commits

Author SHA1 Message Date
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
csoler
b11baa7a65 updated ubuntu changelog 2015-08-29 14:44:16 -04:00
Cyril Soler
a276986eba Merge pull request #60 from PhenomRetroShare/Fix_AllowChatTextFormatOption
Allow Chat Text Format Option working.
2015-08-29 14:22:31 -04:00
Phenom
88a6931758 Allow Chat Text Format Option working. 2015-08-29 19:27:03 +02:00
Cyril Soler
0b5b20d5ea Merge pull request #59 from AsamK/qmake_improvements
Qmake improvements
2015-08-29 09:37:47 -04:00
Cyril Soler
0409dd8030 Merge pull request #58 from AsamK/debian_make_install
Adapt debian/ubuntu package files to use "make install"
2015-08-29 09:34:21 -04:00
AsamK
21e99cf8d4 Use explicit dependencies instead of CONFIG += ordered
Makes inter-dependencies clearer and allows parallel build of
independent libs on multi-core systems, e.g. with:
$ make -j4
2015-08-29 13:12:57 +02:00
AsamK
f002310cf2 Remove libpegmarkdown from win32 retroshare-nogui build
It is only needed for gui
2015-08-29 13:12:57 +02:00
AsamK
2337b468e0 Specify plugins as plugins to qmake
This way only libPLUGIN.so is generated and not the versioned files
libPLUGIN.so.1.0.0
2015-08-29 13:12:57 +02:00
defnax
ecb5d93685 changed default color for the system chat bubble 2015-08-29 04:01:01 +02:00
AsamK
d51b4b2b67 Adapt debian/ubuntu package files to use "make install" 2015-08-28 22:48:20 +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
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
csoler
da69db39d6 added mutex to video processor 2015-08-24 21:42:01 -04:00
csoler
3f1ebca803 added max bandwidth test preview and in/out bw estimate. Still missing the logic inside the codec 2015-08-24 21:15:33 -04: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