Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-27 08:29:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
12,144 Commits 63 Branches 22 Tags 196 MiB
6139632378
Commit Graph

12144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
6139632378
changed back RsGxsUpdateBroadCast.cpp to dos line ending 2018-06-18 22:37:31 +02:00
csoler
2e7398ac9b
removed debug info 2018-06-18 22:35:22 +02:00
csoler
79e676edbe
fixed re-load of GXS groups (forums/channels) when the read flag is changed 2018-06-18 22:27:05 +02:00
Gioacchino Mazzurco
6805875333
Finally get rid of the annoying MASQUARADING typo 2018-06-10 15:10:13 +02:00
Gioacchino Mazzurco
6010104127
Merge commit '9886840b79d617a32764ad52ef4747f5fd999250' 2018-06-09 18:10:22 +02:00
Gioacchino Mazzurco
9886840b79
Provide proper constructor for SerializeContext 
Deprecate constructor that depends on deprecated declarations.
 2018-06-09 17:59:11 +02:00
Gioacchino Mazzurco
1825b263f0
ChunkMap::reAskPendingChunk fix unused parameter warning 2018-06-09 17:21:59 +02:00
Gioacchino Mazzurco
5d237c8753
Improve libresapi qmake files 2018-06-09 17:08:13 +02:00
thunder2
5953e7bbe8 Windows build environment 
- Added "-spec win32-g++" to build.bat
- Added "--no-check-certificate" to download-file.bat
- Fixed build installer
 2018-06-08 17:01:28 +02:00
thunder2
4eda277922 Added missing declare of metatype 2018-06-08 17:00:37 +02:00
cyril soler
8edb1f7535 fixed problem causing infinite loop of net reset in p3NetMgr 2018-06-08 14:32:56 +02:00
G10h4ck
f3b0f7af1f
Merge pull request #1280 from G10h4ck/channels_apiv2_improvements 
Channels apiv2 improvements
 2018-06-07 17:53:42 +02:00
G10h4ck
e5c72481ad
Merge pull request #1281 from G10h4ck/filesharing_apiv2_improvements 
Extend a bit filesharing JSON API v2
 2018-06-07 17:53:26 +02:00
Gioacchino Mazzurco
508951d26f
Improve channels JSON API v2 
list_channels return only with metadata (including the data produced
  very big JSON saturating some client buffer implementation)
add get_channel_info to get full channel data with optional thumbnail
  thumbnail is sent by default but can be avoided adding
  "want_thumbnail":false to the JSON query
rename get_channel to get_channel_content
 2018-06-07 15:00:11 +02:00
Gioacchino Mazzurco
e81b81dff1
libresapi improve qmake optional builds 2018-06-07 14:59:00 +02:00
Gioacchino Mazzurco
3eff851cdb
Improve deprecation of RS_TOKREQ_ANSTYPE_* 2018-06-07 14:57:31 +02:00
Gioacchino Mazzurco
d7b366de23
RS-gui Solve unused parameter warning 2018-06-07 14:54:58 +02:00
csoler
6bb1d3c509
updated ubuntu changelog 2018-06-01 22:35:06 +02:00
csoler
f663600be5
fixed makeSourcePackage.sh 2018-06-01 22:27:59 +02:00
csoler
9b16e3338f
removed conflicts to retroshare06 in debian control file 2018-06-01 18:21:18 +02:00
csoler
57dde55f56
Merge pull request #1269 from PhenomRetroShare/Add_NeverAskMeForExternalLinkActivated 
Add Never Ask Me For External Link Activated
 2018-05-26 11:23:33 +02:00
csoler
33fe823127
Merge pull request #1271 from sehraf/pr_compile-fix-unused-services 
make wiki and photo services compile again
 2018-05-26 11:22:47 +02:00
csoler
65beb2cf2b
Merge pull request #1275 from sehraf/pr_fix-IDdialog-chat-link 
fix Qt 5.11 and id dialog chat link
 2018-05-26 11:09:41 +02:00
csoler
d8b3fc0a6d
Merge pull request #1274 from PhenomRetroShare/Fix_AppVeyorCompil 
Fix AppVeyor Compilation
 2018-05-26 11:08:46 +02:00
sehraf
f53e5e8468
Fix displayed chat link name in id dialog 
before (decimal):  Message in chat room 5327517029776505601
after (proper id): Message in chat room LFD6E08C33A98C658
 2018-05-25 23:59:02 +02:00
sehraf
428b331d8e
fix for Qt 5.11 
Quote from Arch mailing list:
- there's been a huge header cleanup in Qt modules. Expect build failures for applications that rely on transitive includes instead of declaring all required headers. Those need to be fixed upstream by explicitely adding the missing includes.
 2018-05-25 23:57:11 +02:00
Phenom
7c77e93ff4 Fix AppVeyor Compilation 2018-05-25 17:32:36 +02:00
csoler
de65cb6dc0
Merge pull request #1272 from G10h4ck/net_little_fixes 
Net little fixes
 2018-05-22 23:59:26 +02:00
Gioacchino Mazzurco
1ad1fdc7be
p3NetMgrIMPL::checkNetAddress() notify if port change 
Plus cleanups and proper sockaddr_storage copy
 2018-05-22 19:17:37 +02:00
Gioacchino Mazzurco
0bf02e2bc3
pqissludp::Initiate_Connection() check remote_addr to be IPv4 before use 2018-05-22 19:14:25 +02:00
sehraf
0c19a5640e
compile fix gxsphoto 2018-05-21 14:55:10 +02:00
sehraf
92b21d7332
compile fix wikipoos 2018-05-21 14:26:46 +02:00
Phenom
8f107cca31 Add Never Ask Me For External Link Activated 
Need to remove [General] NeverAskMeForExternalLinkActivated key in
RetroShare.conf to revert.
 2018-05-19 16:37:29 +02:00
Gioacchino Mazzurco
5a301734a9
Extend a bit filesharing JSON API v2 2018-05-17 16:46:34 +02:00
Gioacchino Mazzurco
186617fc2b
Fix missing include 2018-05-17 16:43:14 +02:00
csoler
28981b6c86
Merge pull request #1251 from PhenomRetroShare/Fix_Cppcheck(duplInheritedMember)InRsItem 
Fix CppCheck duplInheritedMember warning in RsItem
 2018-05-16 13:37:02 +02:00
csoler
d11f88cbc6
Merge pull request #1252 from PhenomRetroShare/Fix_Cppcheck(duplInheritedMember)InbdNode 
Fix CppCheck duplInheritedMember warning in bdNode
 2018-05-16 13:33:25 +02:00
csoler
2145911ac4
Merge pull request #1262 from PhenomRetroShare/Fix_PartialDirCheck 
Fix Partial Dir Check
 2018-05-16 13:30:56 +02:00
csoler
e2320007fa
Merge pull request #1266 from csoler/v0.6-FT 
V0.6 ft
 2018-05-16 13:28:23 +02:00
csoler
3f88e3e901
added check to avoid hashing files that are currently being modified 2018-05-16 13:24:52 +02:00
csoler
8451550561
added missing licence to file_tree.h 2018-05-16 11:40:39 +02:00
csoler
291c86e2d0
Merge pull request #1265 from csoler/v0.6-GxsFix 
fixed bug causing new forums and identities to not show up immediately
 2018-05-16 11:17:22 +02:00
csoler
4661329bee
fixed bug causing new forums and identities to not show up immediately 2018-05-16 11:15:18 +02:00
G10h4ck
9f37b63e4d
Merge pull request #1264 from G10h4ck/channel_json_api_v2 
Channel json api v2
 2018-05-16 10:49:28 +02:00
Gioacchino Mazzurco
181d99e882
Give proper error message if Qt version is too old 2018-05-16 10:38:47 +02:00
Phenom
f12cd5774d Fix Partial Dir Check 
Add WrongValue StyleSheet property, when bad directory selected.
Update QLineEdit with current setting so it's possible to see if
something is modified. No need to restart.
 2018-05-12 14:31:28 +02:00
csoler
57cff61873
fixed merge 2018-05-11 20:28:53 +02:00
csoler
ecbd115873
added missing include path for libretroshare/src in libresapi 2018-05-11 20:27:03 +02:00
cyril soler
fe5ea9e07c additional fixes to debian packaging files 2018-05-11 17:37:15 +02:00
cyril soler
2173aab483 fixed rules file again 2018-05-11 17:02:58 +02:00