Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-11 04:18:34 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,380 Commits 63 Branches 22 Tags
Commit Graph

9380 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gio
c6ec085519 Merge remote-tracking branch 'manu/android-frontend' into android 2016-09-04 15:25:25 +02:00
Gio
9d83d56811 Merge branch 'master' into android 2016-09-04 15:16:57 +02:00
manu
50fe3dd711 QML activity interacts with backend. 
Test QML activity changed for a simplified version of drbob's rsqml-models.
It requests JSON documents from the libresapilocalserver and shows them raw.
Updated Android documentation.
Moved Android qmake section to the end of libretroshare.pro and openpgpsdk.pro
to avoid static linking errors.
 2016-09-04 15:01:44 +02:00
cyril soler
53e269838c updated ubuntu changelog and version number v0.6.1 2016-08-31 13:24:02 +02:00
defnax
a899c98d88 update version string 2016-08-30 17:21:01 +02:00
defnax
5241a7d4c0 Added last icon changes for transfers page 2016-08-30 17:18:27 +02:00
thunder2
5944f1fea2 Moved MSYS build scripts to folder build_scripts 2016-08-30 16:19:45 +02:00
thunder2
7ffe59cb2d Added build scripts for external libraries with MSYS 2016-08-30 16:19:26 +02:00
cyril soler
3b37fcc4a8 updated help text for circles 2016-08-30 14:18:36 +02:00
csoler
a82f3149d3 removed (unfinished) GettingStarted tab 2016-08-29 20:52:02 +02:00
Thunder
85a525a299 Merge pull request #477 from PhenomRetroShare/Fix_MSys2Compilation 
Fix Msys2 build when MINGW_PREFIX is not defined.
 2016-08-28 14:35:09 +02:00
defnax
19443dabf9 added missed icon 2016-08-27 20:16:04 +02:00
defnax
57c9bef993 updated settings icons and some missed one 2016-08-27 18:15:13 +02:00
Phenom
04162f90d2 Fix Msys2 build when MINGW_PREFIX is not defined. 
Please look at AppVeyor success before merging.
 2016-08-27 11:28:51 +02:00
defnax
cc8f2c6e39 changed to one plus button for Create ID/Circle with menu. 2016-08-26 02:48:46 +02:00
defnax
45198121f7 updating replacements icons 2016-08-25 17:09:33 +02:00
Cyril Soler
8d0541b699 Merge pull request #482 from G10h4ck/master 
Remove some clutter from libretroshare
 2016-08-25 12:57:27 +02:00
Gio
7a2ae6e979 Remove some clutter from libretroshare 
Removed SearchInterface that was an historical remain that make no sense anymore
Fixed some clang warning
Fix includes on some files
 2016-08-25 11:39:15 +02:00
defnax
8d2588fec4 added missed icons 2016-08-24 16:57:33 +02:00
defnax
7706f5f7c6 update notify icons now orange color 2016-08-24 16:55:44 +02:00
defnax
0c36a18aa9 update icon 2016-08-24 16:48:30 +02:00
defnax
f58494f9e4 fixed icon 2016-08-24 13:46:31 +02:00
csoler
5e5a8dcd9a put back opinion combobox in the place where other reputation information already is. Removed absolute size on invite button which causes incorrect display on high DPI screens 2016-08-24 12:50:41 +02:00
defnax
5e22ddc93e updating icons more flat replacement 
improving people page layout
 2016-08-24 03:28:57 +02:00
Gio
47944b30e6 libretroshare android move openssl static linking in more appropriated place 2016-08-23 12:29:31 +02:00
Gio
85461825ce Ignore all .pro.user files 2016-08-23 12:15:28 +02:00
Gio
279551fe8d Retroshare android service now run and start at boot on android, the qml app is still disfunctional 2016-08-23 12:15:28 +02:00
Gio
68a00138d2 Avoid usage of deprecated function RSA_generate_key that make android 
compiler mad
 2016-08-23 12:15:28 +02:00
Gio
9a980def2c libretroshare now compiles for Android, instruction on how to do it included 2016-08-23 12:15:28 +02:00
Cyril Soler
b7416ba207 Merge pull request #481 from PhenomRetroShare/Fix_LobbyLoadEmbeddedImageOption 
Fix Lobby Load embedded image option.
 2016-08-22 23:17:33 +02:00
Phenom
7dd78f28d8 Fix Lobby Load embedded image option. 2016-08-22 23:08:11 +02:00
csoler
5d69ae886a reduced period for slow saving of GRouter config data, and removed useless saving of BanList config when received data fro friends does not modify the existing data 2016-08-22 22:25:05 +02:00
csoler
a6acff491f improved ppa upload script 2016-08-22 22:04:31 +02:00
Cyril Soler
c356bc5a89 Merge pull request #479 from dimqua/patch-1 
Change I2P proxy default port to 4447
 2016-08-19 09:02:57 +02:00
dimqua
613ce25209 Change I2P proxy default port to 4447 2016-08-19 09:47:52 +04:00
csoler
b9ac4f87d7 updated ubuntu changelog 2016-08-18 17:38:22 +02:00
Cyril Soler
6bb1543839 Merge pull request #471 from PhenomRetroShare/Add_AutoHideToRSImageBlockWidget 
Add AutoHide to RSImageBlockWidget
 2016-08-18 17:18:25 +02:00
Cyril Soler
fea4159b86 Merge pull request #455 from PhenomRetroShare/Add_CopyRSTreeWidgetHeaderContextMenuToItemContextMenu 
Copy RsTreeWidget Header ContextMenu to Item ContextMenu.
 2016-08-18 17:11:07 +02:00
Phenom
9780f1ff78 Add AutoHide to RSImageBlockWidget 2016-08-17 23:33:41 +02:00
csoler
368a429846 fixed read_125Size and write_125Size according to RFC4880 2016-08-17 09:40:16 +02:00
defnax
4b11fb1729 update FeedReader icons 2016-08-16 22:26:48 +02:00
defnax
6682a7a491 added new mainwindow icons for RetroShare. 2016-08-16 22:02:30 +02:00
Cyril Soler
4d5be7fbce Merge pull request #476 from PhenomRetroShare/Add_FilterBannedInIdDialog 
Add Banned Filter in IdDialog.
 2016-08-16 10:29:21 +02:00
Cyril Soler
4572dc650c Merge pull request #475 from PhenomRetroShare/Fix_RSTextBrowser_loadRessource_OnWindows 
Fix RsTextBrowser::loadRessource on Windows.
 2016-08-16 10:22:00 +02:00
Cyril Soler
26cbb27e90 Merge pull request #472 from PhenomRetroShare/Fix_ChangeImageBlockedIconOnRSTextBrowser 
Change Image Blocked Icon On RSTextBrowser
 2016-08-16 10:20:30 +02:00
Cyril Soler
bb9f158871 Merge pull request #473 from PhenomRetroShare/Fix_RsCertificate_toStdString 
Fix RsCertificate::toStdString by fixing PGPKeyParser::read_125Size.
 2016-08-16 10:05:38 +02:00
thunder2
81cd2e9158 Fixed MSYS2 compile (use correct bracket in pro file) 2016-08-16 09:09:19 +02:00
Phenom
accd3ca734 Fix RsTextBrowser::loadRessource on Windows. 
When current style use images (like bubble).
 2016-08-15 20:02:01 +02:00
Phenom
dd2e4c32d5 Change Image Blocked Icon On RSTextBrowser 2016-08-15 20:01:14 +02:00
Phenom
38a9e10096 Fix RsCertificate::toStdString by fixing PGPKeyParser::read_125Size. 
And added some comments, plus values in hexadecimal for better view.
 2016-08-15 20:00:49 +02:00