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

12103 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
cyril soler
84a02cb7fa added missing targets in rules file 2018-05-11 16:39:49 +02:00
cyril soler
4b6304e341 few fixes according to lintian complaints 2018-05-11 16:33:19 +02:00
cyril soler
c2492fe166 fixed a few lintian errors in debian/control 2018-05-10 23:10:16 +02:00
csoler
9f5409b4f7
fixed email to match mentors login 2018-05-10 22:04:11 +02:00
csoler
45fdbb4466
fixed email to match mentors login 2018-05-10 22:03:39 +02:00
csoler
b4ada807c8
removed > 3.4.1 in debian/control, because pbuilder would not build 2018-05-09 13:54:40 +02:00
csoler
e81c82efb8
added notes file for debian release 2018-05-09 13:37:25 +02:00
csoler
4d287d68bc
fixed weird mistake in grouter which causes an issue only in gcc > 8 2018-05-09 13:27:16 +02:00
csoler
889c27726e
fixed packaging script for debian release 2018-05-09 10:15:32 +02:00
csoler
f406d9af16
updated debian/control to be the control file for stretch. Updated copyright notice 2018-05-09 10:15:02 +02:00
csoler
186ff0f21a
created proper debian changelog using dch and updated project url 2018-05-09 10:12:34 +02:00
csoler
6d67936026
Merge pull request #1253 from PhenomRetroShare/Add_LastPostColInGroupTreeWidget 
Add Last Post Column in GroupTreeWidget.
 2018-05-08 15:34:44 +02:00
Phenom
2ebacf36ed Add Last Post Column in GroupTreeWidget. 
Hidden by default.
A context menu is added.
 2018-05-08 12:10:31 +02:00
thunder2
1352631807 Updated Windows build environment 2018-05-07 16:49:53 +02:00
thunder2
38ac234862 Fixed Windows compile with pre-compiled libraries 
Added new variable EXTERNAL_LIB_DIR to specify path of external libraries
 2018-05-07 09:42:36 +02:00
thunder2
d9a75a9362 Added RapidJSON to Windows build environment 2018-05-07 09:24:23 +02:00
csoler
5b607ada26
Merge pull request #1245 from PhenomRetroShare/AddContextMenuForGxsIdInTextChatBrowser 
Add Context Menu for GxsId in lobby textBrowser.
 2018-05-06 23:53:45 +02:00
csoler
a6821f4ded
Merge pull request #1249 from sehraf/pr_libsecret 
Add support for libsecret (including KDE keyring) and fix retroshare-nogui autologin
 2018-05-06 23:02:18 +02:00
csoler
c20436e215
Merge pull request #1250 from PhenomRetroShare/Fix_CppCheckerWarningInFtController 
Fix CppCheck in ftcontroller.cc
 2018-05-06 22:59:20 +02:00
csoler
d8dc2a898c
Merge pull request #1246 from PhenomRetroShare/Add_GxsIdInRestoredChatMsg 
Add GxsId in Restored Chat Message.
 2018-05-06 22:57:57 +02:00
Phenom
dca33daae8 Fix CppCheck in ftcontroller.cc 
/libretroshare/src/ft/ftcontroller.cc:91: warning:
Cppcheck(passedByValue): Function parameter 'fname' should be passed by
reference.
/libretroshare/src/ft/ftcontroller.cc:92: warning:
Cppcheck(passedByValue): Function parameter 'tmppath' should be passed
by reference.
/libretroshare/src/ft/ftcontroller.cc:92: warning:
Cppcheck(passedByValue): Function parameter 'dest' should be passed by
reference.
/libretroshare/src/ft/ftcontroller.cc:1482: warning:
Cppcheck(stlIfStrFind): Inefficient usage of string::find() in
condition; string::compare() would be faster.
/libretroshare/src/ft/ftcontroller.cc:1491: warning:
Cppcheck(stlIfStrFind): Inefficient usage of string::find() in
condition; string::compare() would be faster.
 2018-05-06 18:54:25 +02:00
sehraf
c89e36a665
add auto selection of libsecret with fallback to libgnome-keyring 2018-05-04 20:52:31 +02:00
sehraf
1129bcb0c0
Add support for libsecret 2018-05-04 20:47:41 +02:00
sehraf
10badf5cbb
fix retroshare-nogui.pro autologin 2018-05-04 20:43:40 +02:00
csoler
676c070152
extended the rapid_json trick to plugins 2018-05-03 15:55:21 +02:00
csoler
5f12b6076d
added -lgnome-keyring to unix LIBS when rs_autologin is set 2018-05-03 15:22:39 +02:00
csoler
bfe8e40a8a
updated ubuntu changelog 2018-05-03 15:22:03 +02:00
Phenom
98f00520cd Add GxsId in Restored Chat Message. 2018-05-03 15:04:28 +02:00
Phenom
ecba4c2dab Add Context Menu for GxsId in lobby textBrowser. 2018-05-03 14:29:15 +02:00
csoler
91ed367c55
added packaging for ubuntu bionic 2018-05-03 13:47:42 +02:00
cyril soler
56e8134d45 removed sqlite3 lib from ld when using sqlcipher. 2018-05-03 11:32:24 +02:00
csoler
1366f6131b
Merge pull request #1241 from RetroPooh/chatimgattprev1 
embed preview for images on file attach in chat
 2018-05-02 23:51:46 +02:00
csoler
8e111c2ee2
added rapidjson-1.1.0 code hard-coded in the source directory to allow everyone to compile without the need to tweak too much. When v1.1.0 is mainstream (espcially on ubuntu) we can revert back to an external dependency 2018-05-02 22:46:27 +02:00
G10h4ck
48c4b4c4f8
Merge pull request #1242 from beardog108/master 
Add rapidjson to package requirements for the Linux distros compliation instructions
 2018-04-28 09:34:14 +02:00
G10h4ck
ccede9ddd9
Merge pull request #1243 from sehraf/pr_fix-make-install 
Fix 'make install'
 2018-04-28 09:33:14 +02:00
sehraf
10daf3b9c6
Fix 'make install' 
Since DATA_DIR (and the others) are not set 'make install' will move the files to /{qss, sounds, stylesheets, usr, webui} (instead of '/usr/...')
Fixes 4876a0ea3b
 2018-04-28 09:06:10 +02:00
Kevin Froman
82a00c2496
added rapidjson to package installation command on Debian/OpenSUSE/Arch 2018-04-27 15:34:43 -05:00
Gioacchino Mazzurco
be75e89ad2
Fix compialtion after merge 2018-04-27 20:55:38 +02:00
Gioacchino Mazzurco
f3ae61b462
Merge branch 'json_experiments' 2018-04-27 18:17:09 +02:00