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
8,089 Commits 63 Branches 22 Tags 194 MiB
4b402a48a5
Commit Graph

4646 Commits

Author SHA1 Message Date
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
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
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
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
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