Commit Graph

9702 Commits

Author SHA1 Message Date
mr-alice
384d001f3b progress in hash-based sync. Not there yet. 2016-09-10 13:57:05 +02:00
mr-alice
0ea695beb3 fixed a few bugs in hash-based sync. Not there yet. 2016-09-08 23:43:14 +02:00
mr-alice
fafe684cc4 finished implementing hash-based transactions. To be tested. 2016-09-08 21:34:53 +02:00
Cyril Soler
e3d12c4faf Merge pull request #491 from G10h4ck/warnings_cleanup
fix compiler warnings, fix typos and remove unuseful code
2016-09-08 17:08:34 +02:00
MrAlice
eaa8ad883a half implemented the hash-based communication for dirs between friends 2016-09-07 22:31:12 +02:00
Cyril Soler
ea380b2578 Merge pull request #487 from AsamK/fix_wayland
Fix crash when running natively on Wayland
2016-09-07 21:29:48 +02:00
Cyril Soler
798ffd85ab Merge pull request #488 from sehraf/pr-stats-api
Add a small statistic to libresapi
2016-09-07 21:28:28 +02:00
mr-alice
ad1ba7a77d fixed loading/saving of remote directories 2016-09-06 23:05:46 +02:00
defnax
e9540d7b05 Improved look and feel layout of Profile Generation Dialog 2016-09-06 17:45:42 +02:00
mr-alice
679c53b0b0 added load/save of directory hierarchies. Fixed bug in loading of hash cache (caused y non initialisation of dest string in GetRawString()) 2016-09-05 21:22:11 +02:00
thunder2
5f5ce4ab63 Fixed version_detail_bash_script with shadow build 2016-09-05 16:27:04 +02:00
thunder2
ea6431e276 Fixed Windows shadow build with Qt 5.6 or higher 2016-09-05 16:24:49 +02:00
Gio
ad21d7202a Start RetroShare Android Service when needed
RetroShareQmlActivity checks if the service is running, and start it if
not
The service is restarted on package update
Remove non existents qml files from qrc
2016-09-05 02:12:00 +02:00
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
mr-alice
5b221c56db moved encrypted data output/input to FileListIO 2016-09-03 18:46:03 +02:00
mr-alice
371171fcbb moved InternalFileHierarchyStorage to separate file. Fixed loading/saving infrastructure (not working yet) 2016-09-03 13:29:23 +02:00
mr-alice
153783acb5 fixed bug in saving hash cache 2016-09-02 22:08:27 +02:00
mr-alice
7b566f2c55 added load/save for hash cache in the proper place 2016-09-02 21:49:43 +02:00
mr-alice
52ef7adfae fixed saving of config when diretory list is changed 2016-09-01 21:41:12 +02:00
mr-alice
6fc02e03b1 added load/save of configuration and shared dirs list 2016-09-01 21:04:48 +02:00
mr-alice
f191fe675d fixed compilation with new RsNodeGroupId 2016-09-01 20:02:47 +02:00
mr-alice
ade6017f74 merged with upstream/master 2016-09-01 19:52:31 +02:00
mr-alice
1f3ea6fa0f added selection of subdirs to be seen for friends depending on permissions. Enabled dynamic update at friends 2016-08-31 22:47:05 +02:00
cyril soler
53e269838c updated ubuntu changelog and version number 2016-08-31 13:24:02 +02:00
Gio
3ec50837d0 Fix typos in qmake files 2016-08-31 07:41:22 +02:00
mr-alice
6a30e44756 fixed bug in removal of directory 2016-08-30 22:30:58 +02:00
sehraf
e4bd7f66a0 add dht/nat to librespai stats 2016-08-30 21:58:07 +02:00
sehraf
51c98fdf50 add stats to libresapi 2016-08-30 21:50:20 +02:00
mr-alice
4b00d47d3a added permission check for friends to see shared files or not 2016-08-30 21:28:32 +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
mr-alice
1290aa8403 fixed proper display of file sharing flags 2016-08-29 21:30:56 +02:00
csoler
a82f3149d3 removed (unfinished) GettingStarted tab 2016-08-29 20:52:02 +02:00
Gio
3c6ac48ff9 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2016-08-29 18:32:31 +02:00
mr-alice
7c2ed3fca0 save/restore expanded state in file list tree view so that view gets updated seamlessly 2016-08-28 23:14:39 +02:00
mr-alice
494d2071c9 fixed update of directory TS, also fixing update of empty dirs at friends 2016-08-28 18:42:52 +02:00
AsamK
b36d0fad4a Fix crash when running natively on Wayland 2016-08-28 17:52:01 +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
mr-alice
fc5176a652 fixed serialisation/deserialisation of dir content. Fixed exchange of dir data. First working prototype of file list exchange. 2016-08-27 23:56:23 +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
mr-alice
eca9ca0e4d fixed a few bugs in serialisation of shared dir content 2016-08-27 16:38:15 +02:00
mr-alice
07c7d192a9 added deserialisation and update of remote directories 2016-08-27 14:09:26 +02:00
mr-alice
5194287645 fixed SEGV due to calling layout change in the wrong place 2016-08-27 13:22:29 +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