Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-26 16:09:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
8,499 Commits 63 Branches 22 Tags 196 MiB
3cfd976c0e
Commit Graph

4815 Commits

Author SHA1 Message Date
csoler
0c1e6301b3 merged with latest upstream trunk 2015-12-05 16:49:00 -05:00
electron128
7cd880e1e4 removed member gxs_id from ChatId class, because ChatId now uses tunnel ids stored in distant_chat_id for distant chat. 
reverted naming confusion in in libresapi ChatHandler and fixed author of distant chat messages (distant chat is still unfinished)
 2015-12-05 17:00:57 +01:00
Cyril Soler
0ac76d621e Merge pull request #188 from csoler/v0.6-SecuredTunnelService 
V0.6 secured tunnel service. Please reports bugs to me (I have tested with valgrind and as many configurations as possible, but the multi-service gathering into GXS tunnels shared for each GXS id pair is not a totally simple thing, so I expect to have missed a few issues).
 2015-12-05 10:28:16 -05:00
csoler
325956e8ed renamed flag for messaging permissions to a more appropriate name 2015-12-04 23:15:52 -05:00
csoler
be17a563d1 fixed compilation and added flag function for permissions in messaging 2015-12-04 23:08:49 -05:00
csoler
39f4878244 incorporated changed from defnax 2015-12-04 22:42:56 -05:00
Cyril Soler
2a82ef543c Merge pull request #186 from realityfabric/minor_edits 
fixed spelling errors in several files
 2015-12-04 21:43:35 -05:00
csoler
9193d3579b merged with latest master before creating PR 2015-12-04 21:24:51 -05:00
defnax
d2a99786ac Fixed Qt5 Fusion stylesheet on MessageComposer 2015-12-04 19:56:56 +01:00
csoler
318be3a2ad fixed a few bugs in distant chat: disabled history (for now), improved tunnel handling 2015-12-04 00:06:14 -05:00
csoler
b198f1a007 fixed some cleaning of remotely closed tunnels in GxsTunnelService 2015-12-03 00:34:13 -05:00
realityfabric
9f561993ee fixed spelling errors in several files 2015-12-02 06:18:17 -08:00
csoler
81b196d38d added GUI to display authenticated tunnel info. Added counting of data sent/recvd. 2015-12-01 23:40:35 -05:00
csoler
60d948b509 added void GUI for authenticated tunnels 2015-11-30 21:52:15 -05:00
csoler
81ab43beb9 fixed GUI update of avatars and status for distant chat. Updated backend for new model. Fixed a few bugs in serialisation 2015-11-30 00:02:44 -05:00
csoler
a29f15ae32 fixed compilation, added missing methods for new distant chat 2015-11-28 14:55:56 -05:00
csoler
a2e0f4196b updated GUI for new distant chat 2015-11-26 20:40:06 -05:00
csoler
bca89c63c6 fixed serialisation bug and added new GUI bits 2015-11-25 18:08:53 -05:00
Ivan Lucas
e8173bdaec Improve some of the wording of labels and information 2015-11-25 10:33:28 +00:00
defnax
397729bd93 Added to count downloads/uploads items 
Enabled to get copy the DHT label values via mouse
Added counting on DHT Window & added context menu for DHT Tree, to copy IP addresses to clipboard
 2015-11-24 19:41:13 +01:00
Cyril Soler
b2470565c3 Merge pull request #179 from sirjenster/osx 
latest OSX patches.
 2015-11-21 15:08:43 -05:00
defnax
c89ff9f059 Added nickname column to pending packets & context menu action to view details 
Fixed ui layout.
 2015-11-21 13:47:50 +01:00
defnax
2e76cc6267 Fixed DHT icon 2015-11-21 12:32:55 +01:00
electron128
4b84767250 hide network mode selection in quick start wizard if node is a hidden node 2015-11-21 11:57:50 +01:00
Jenster
699299ae8a latest OSX patches 2015-11-20 08:10:59 -08:00
csoler
1de55d8fc5 replaced the few bools in RsIdentityDetail by a set of flags 2015-11-19 21:14:32 -05:00
defnax
4dacd9a54d Added Ban/Unban Context menu actions for People list. 2015-11-19 19:08:47 +01:00
defnax
5404cda302 Added Forum reply with plaintext quote (by anmo) 2015-11-19 12:05:52 +01:00
defnax
e3d12b8194 Disabled Fontmetrics on RemoteDirModel Columns, it causes unusable very small column height. 2015-11-18 21:24:38 +01:00
defnax
701f1ceb4a Fixed counting thx to sehraf 2015-11-17 17:33:25 +01:00
defnax
01f3db70d3 Added to count identity items on People 2015-11-17 15:58:22 +01:00
Cyril Soler
17dc7c7dfc Merge pull request #68 from chozabu/systray_tweaks 
add option to disable updates to systray tooltip
 2015-11-16 23:56:37 -05:00
defnax
c6ad0d4b5c Merge pull request #122 from PhenomRetroShare/Fix_PrioritySpeedMenuForDownloadFiles 
Fix priority Speed Menu for download file.
 2015-11-08 01:07:59 +01:00
defnax
c41f98cb4c Merge pull request #86 from PhenomRetroShare/Fix_Win7_32bCompilationFromScratch 
Fix Windows 7 32b Compilation from scratch.
 2015-11-06 01:58:30 +01:00
Cyril Soler
75d462e818 Merge pull request #173 from mr-alice/master 
show or hide ID chooser in message box depending on destination of msg
 2015-11-05 03:22:47 -05:00
mr-alice
93368aae61 show or hide ID chooser in message box depending on destination of message 2015-11-04 21:08:31 -05:00
defnax
3a2b5f1f07 calculate correct icon size for the status icon 2015-11-04 23:47:12 +01:00
defnax
2a998c1e71 Added new higher resolution bullet icons with better quality 2015-11-04 17:05:39 +01:00
csoler
2a5fe4debd merge before push 2015-10-30 21:12:47 -04:00
csoler
1bc2892753 removed some debug info 2015-10-30 21:11:44 -04:00
defnax
6554362035 Fixed Layout 2015-10-30 15:51:13 +01:00
csoler
12acf6de35 fixed update of reputations display and used proper global score in id list 2015-10-29 23:31:23 -04:00
csoler
512c15c054 fixed edit/show checkbox state in GxsGroupDialog. 2015-10-29 22:58:21 -04:00
defnax
958956a112 Fixing layout & display on Details View anti spam fields 2015-10-29 17:20:32 +01:00
csoler
22fd4e4092 fixed bug causing signed lobby to refuse login on double click 2015-10-28 18:11:27 -04:00
csoler
459cbc6c8e fixed bug causing forum posts to require PGP-signed ID on PGP-favored forums 2015-10-28 18:07:43 -04:00
Cyril Soler
04ead356e5 Merge pull request #163 from PhenomRetroShare/AddGxsIdInTextAnchor 
Add GXS Id in anchor in Chat.
 2015-10-28 16:00:27 -04:00
Cyril Soler
5beb85215c Merge pull request #164 from csoler/v0.6-SignedForums2 
V0.6 signed forums2
 2015-10-28 10:01:26 -04:00
Phenom
6df42a0b7d Add GXS Id in anchor in Chat. 2015-10-28 07:20:17 +01:00
csoler
1471dbc8af fixed tooltips for anti-spam forum features 2015-10-27 23:53:31 -04:00
csoler
a526a29a2b added missing flag check for anti-spam feature display 2015-10-27 23:40:18 -04:00
csoler
79c80c968a fixed a few bugs in display of tracking info 2015-10-27 22:41:29 -04:00
defnax
eefc8d3393 Fixed Tooltip on Outbox #121 
Store Max Results spinbox #130
 2015-10-28 01:59:19 +01:00
csoler
206b27a262 minor bugfix in msg tracking 2015-10-26 23:55:34 -04:00
csoler
c7d0e4cb35 enabled ID tracking forums. Fixed thresholds for anti-spam forums. Changed computation of reputation scored 2015-10-26 23:38:10 -04:00
csoler
f24bddf6f1 merged with upstream head 2015-10-25 20:42:41 -04:00
csoler
fee449bca4 added proper UI for setting anti-spam flags in GroupCreationDialog 2015-10-25 19:28:13 -04:00
csoler
47dd70fbe8 added non selective tracking for GXS messages 2015-10-25 17:26:34 -04:00
electron128
b340d8a37e Hide about button and add better description for unloaded plugins 2015-10-25 11:49:44 +01:00
defnax
b717d601f4 Added default Email Client Button to Web Mail Page 2015-10-25 00:54:22 +02:00
csoler
8ea97711e8 added new flag to GxsIdChooser to force non anonymous ids. Disabled by default 2015-10-24 12:48:17 -04:00
defnax
b501d91f21 Added Invite page for Web Mail Providers (Connect Friend Wizard) 
Added select page style for Quick Start Wizard.
 2015-10-24 17:05:12 +02:00
csoler
febd348d24 added GUI support for non anon forums. Changed serialisation of GxsGroupMetaData so that mSignFlags is serialised in place of mAuthenFlag, which is not used anyway 2015-10-24 00:22:55 -04:00
csoler
a6851b63dc renamed old flags into indices in rsgenexchange.cc. Fixed up duplicate constants between GxsGroupDialog and rsgxsflags.h 2015-10-23 22:53:00 -04:00
Cyril Soler
463ebe7a7c Merge pull request #154 from sehraf/pr-lobby-time 
mark chat participants as inactive as long as no activity was seen an…
 2015-10-21 18:47:22 -04:00
sehraf
164c7265aa suggestion from cyril 2015-10-21 22:40:49 +02:00
defnax
bcfb3be460 Hide some Labels on Hidden Mode 2015-10-21 22:39:48 +02:00
sehraf
c06118904e mark chat participants as inactive as long as no activity was seen and reduce time to inactivity from 30 min to 10 min (patches #67) 2015-10-21 22:18:43 +02:00
defnax
aec42a8e1f Improved Network Settings Layout, better look and order 2015-10-21 04:16:20 +02:00
csoler
6f3ba57314 fixed up default sizes for list icons and main page icons for high DPI screens 2015-10-20 22:00:15 -04:00
Sergei Reznikov
34758be52a Add Haiku support 2015-10-20 20:32:44 +03:00
Phenom
79d761ae2e Add Win32 section in retroshare.pri 
And add MSys2 directories.
 2015-10-17 12:15:36 +02:00
Phenom
625461bf69 Fix Windows 7 32b Compilation from scratch. 
Add scripts to build Libs on branch.
 2015-10-17 12:15:35 +02:00
defnax
febea809b1 Fixed Reputation display, and set text Alignment. 2015-10-17 02:23:46 +02:00
Phenom
0cadfef3d3 Fix priority Speed Menu for download file. 
Not only downloading file can be setted.
 2015-10-15 18:34:56 +02:00
defnax
66670315dc Moved to display pending packets on a QTreeWidget. 
Fixed People layout/spacing & display votes column.
 2015-10-15 02:14:52 +02:00
csoler
441b164c73 fixed small bugs in average friend reputation display 2015-10-13 21:54:52 -04:00
Phenom
245a2826c6 Fix centered Typing Label on ChatWidget. 2015-10-13 20:11:30 +02:00
defnax
791f5fe886 Fixed ID Details Dialog with Reputation 2015-10-13 02:18:41 +02:00
csoler
71c8dfdc58 manual merge before creating a conflict-free PR 2015-10-12 14:45:11 -04:00
csoler
e6bb3073bd added update for forum messages list when an author gets banned 2015-10-12 14:04:23 -04:00
csoler
7dc59845e9 added update for forum messages list when an author gets banned 2015-10-12 14:03:53 -04:00
csoler
86b47d818b reduced icon size a little bit in GxsTreeWidgetItem 2015-10-12 10:58:24 -04:00
csoler
5a3756f058 fixed bug on reputation cutoff. Updated tooltips 2015-10-12 10:41:48 -04:00
csoler
82c16c6a27 fixed GUI tooltips over banned items. Added dropping of messages from banned identities in chat lobbies 2015-10-11 22:08:19 -04:00
csoler
1a76bea6ff enabled bannign button in forums, and disable message passing for banned users 2015-10-11 21:41:35 -04:00
csoler
e309dd6fed fixed banning users from forum threads 2015-10-11 10:00:11 -04:00
csoler
f750818402 added proper icons and names for banned users 2015-10-10 21:25:06 -04:00
csoler
68ca57ce75 added removal of messages frm banned users 2015-10-10 18:27:15 -04:00
defnax
1a229ef817 Fixed to display GXS ID item with a better icon size 2015-10-10 14:16:12 +02:00
csoler
338fcee865 added button in forums to flag poster identity as bad 2015-10-09 18:51:16 -04:00
defnax
e97f23d91a Improved icon size display on GroupTree. 2015-10-09 12:06:16 +02:00
csoler
8c6c9344fe fixed a few bugs in reputation items serialisation code and GUI display 2015-10-08 23:02:34 -04:00
defnax
3cbf0f6657 Fixed Cert Display on Email Invite Page 2015-10-07 20:13:18 +02:00
defnax
95bdd7f0a7 Fixed ChatWidget Margin's 
Set Alignment for frame off's Video icon
 2015-10-07 01:35:31 +02:00
Phenom
2b1d39cea1 Add HideChat Button. 
Change layout of video when text is hidden.
Add toolbar in fullscreen.
 2015-10-05 21:04:26 +02:00
Phenom
8a7e359557 Add a button on VOIP to hide text when video is on. 2015-10-05 21:04:26 +02:00
sehraf
6a570afb84 disable sorting while editing network view 2015-10-05 09:26:36 +02:00
csoler
317e7ea5ab added some backend for reputation system 2015-10-04 23:14:49 -04:00
csoler
c17dddb79c updated GUI for reputation 2015-10-04 17:47:30 -04:00
Phenom
64389e35d8 Fiw Delete key event in ChatWidget. 2015-10-03 11:00:16 +02:00
Cyril Soler
bd94fcd08e Merge pull request #98 from PhenomRetroShare/AddMinimumFontSizeInChat 
Add minimum font size in chat.
 2015-10-02 10:53:00 -04:00
sirjenster
68fd1b206e First Mac/OSX compile fixes 2015-09-22 18:33:16 -07:00
thunder2
1d54630007 Fixed Windows compile. 2015-09-17 10:05:31 +02:00
Cyril Soler
66691d4f37 Merge pull request #108 from sehraf/i2p 
Adding I2P support to RS
 2015-09-16 20:01:39 -04:00
sehraf
04abfad894 manually reverted changes by Qt Creator 2015-09-16 17:01:20 +02:00
sehraf
7c7e4f86dc added ip addr. field to the add certificate dialog 2015-09-16 12:13:54 +02:00
sehraf
6202e83c32 add default case to gui instead of falling back to tor labeling 2015-09-16 11:48:32 +02:00
sehraf
d3d184f2eb added simple step-by-step guide to add a I2P server tunnel 2015-09-16 11:09:04 +02:00
sehraf
e54358ac11 added simple step-by-step guide to add a I2P client tunnel 2015-09-16 10:55:33 +02:00
sehraf
8725aab180 gui fixes 2015-09-14 15:14:39 +02:00
sehraf
6b87c38951 small fixes 2015-09-14 14:56:14 +02:00
sehraf
6ec191944d gui changes 2015-09-14 12:39:46 +02:00
sehraf
b0251e3806 generalized tooltips 2015-09-14 12:12:28 +02:00
Phenom
48e6618c8d Send Mouse event to FriendList's item, since ElidedLabel was fixed. 2015-09-13 19:00:31 +02:00
Phenom
3f155b9b75 Add minimum font size in chat. 2015-09-13 17:35:19 +02:00
Ivan Lucas
4880fc489b Fixed grammar on add friend wizard by rewording slightly 2015-09-10 11:21:01 +01:00
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
Chozabu
1630577e04 dont set tooltip if enabling updates, set tooltip on save incase of update between click and save 2015-09-02 01:09:39 +01: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