Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,573 Commits 63 Branches 22 Tags 194 MiB
d21b41f871
Commit Graph

11573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
3b7809a408 Merge pull request #1028 from csoler/v0.6-FT 
added default ignore list on linux
 2017-09-11 20:49:11 +02:00
csoler
551ef63c6e added default ignore list on linux 2017-09-11 19:36:06 +02:00
csoler
c5f91e3b6b Merge pull request #1026 from csoler/v0.6-FT 
V0.6 ft
 2017-09-11 19:05:19 +02:00
csoler
0ca0b72a5a moved file ignore test to a more appropriate place 2017-09-11 19:02:07 +02:00
Angela Mazzurco
3530353678 Merge branch 'qml_app_ui_improvements' into qml_app_development 2017-09-11 17:03:19 +02:00
Angela Mazzurco
44ffdb97c5 Refactor and delete repeated code 2017-09-11 17:01:34 +02:00
Angela Mazzurco
be7c6a966f Refactor function name 2017-09-11 16:43:38 +02:00
Angela Mazzurco
4642f2ab2a Clean code 2017-09-11 16:42:29 +02:00
Angela Mazzurco
cd2e18f27b Use correct image size 2017-09-11 16:36:59 +02:00
Angela Mazzurco
1fdd190fb0 Set correct qrc path 2017-09-11 16:27:16 +02:00
csoler
eff5c5d6ee added pause to file hashing 2017-09-10 22:07:36 +02:00
csoler
ea25d4b5a4 improved update of ignore list 2017-09-10 20:22:17 +02:00
csoler
884b3a6220 added infrastructure to add a ignore list in shared files 2017-09-10 19:58:57 +02:00
csoler
b3e1597d6b Merge pull request #1025 from Ppjet6/master 
Typo in GenCertDialog
 2017-09-09 18:34:25 +02:00
Maxime Buquet
c85664e6e4 Typo in GenCertDialog 2017-09-09 13:54:30 +01:00
csoler
1e2a2275f4 Merge pull request #1023 from Ppjet6/master 
Typo in GenCertDialog
 2017-09-09 14:48:35 +02:00
csoler
1bc9ef6f62 Merge pull request #1022 from PhenomRetroShare/Fix_MoveSharedFilesDialog 
Move SharedFilesDialog to /gui/FileTransfer/
 2017-09-09 14:48:02 +02:00
Maxime Buquet
64d0290e44 Typo in GenCertDialog 2017-09-09 03:48:18 +01:00
Angela Mazzurco
75180f2a01 Encode base64 via c++ code 2017-09-07 20:38:43 +02:00
Phenom
4336a4ad46 Move SharedFilesDialog to /gui/FileTransfer/ 
And remove old DEFINE because very olds files are deleted.
 2017-09-07 19:53:51 +02:00
csoler
54ee6509d1 Merge pull request #1021 from PhenomRetroShare/Fix_ProgressSorting 
Fix File Transfert Progress Sorting.
 2017-09-07 18:54:04 +02:00
Angela Mazzurco
335c1463e6 Open own contact details page when click your identity 2017-09-07 18:47:08 +02:00
Angela Mazzurco
404469b0a7 Set android mode on android os platforms 2017-09-07 18:34:23 +02:00
Angela Mazzurco
bbd139ae0e Disable keyboard close when emojimenu button is pushed 2017-09-07 18:33:57 +02:00
Phenom
d81f9a351e Fix File Transfert Progress Sorting. 2017-09-07 18:16:07 +02:00
Angela Mazzurco
d9804928dc Set emoji menu under inferior panel on android mode 2017-09-07 18:13:57 +02:00
csoler
1dc6bef985 Merge pull request #1019 from PhenomRetroShare/Add_GroupedUpLoadItem 
Regroup Upload Items by file in TransfersDialog.
 2017-09-07 18:08:34 +02:00
Angela Mazzurco
f435fcda28 Implement android layout 2017-09-07 17:59:53 +02:00
Phenom
3b4e84c6d4 Regroup Upload Items by file in TransfersDialog. 2017-09-07 17:08:05 +02:00
Angela Mazzurco
cfe44be128 Fix close android keyboard when emoji menu is shown 2017-09-06 20:23:33 +02:00
Angela Mazzurco
9386657955 Fix horizontal scroll on category selection 2017-09-06 18:50:20 +02:00
Angela Mazzurco
efd14e4465 Fix correct indent style 2017-09-06 18:48:51 +02:00
csoler
f9102e5964 Merge pull request #1001 from PhenomRetroShare/Add_OnlyHiddenNodeCF 
Add Only Hidden Node configure flag
 2017-09-05 20:59:16 +02:00
csoler
9ceba80fcb Merge pull request #1015 from PhenomRetroShare/Fix_TravisCI_MacOS 
Fix Travis CI build for MacOS
 2017-09-05 20:46:33 +02:00
csoler
671b418c81 Merge pull request #1008 from PhenomRetroShare/Add_FilterInDownloadList 
Add a filter to DownLoad list
 2017-09-05 20:46:05 +02:00
Phenom
32888f0819 Fix Travis CI build for MacOS 
OpenCV move from homebrew/science/ to trunk.
 2017-09-05 16:19:10 +02:00
csoler
bc6ea65d75 Merge pull request #1000 from PhenomRetroShare/Fix_RemovePngPng 
Remove *.png.png duplicated Files
 2017-09-04 16:52:59 +02:00
csoler
c6ffe07cd1 Merge pull request #1009 from csoler/v0.6-FT 
V0.6 ft
 2017-09-04 16:48:17 +02:00
csoler
160ab7b4f3 added missing code for remote search by hash, fixing the bug of direct sources not added 2017-09-03 23:32:48 +02:00
csoler
8d146038c2 fixed bug preventing search by hash to be called on own files 2017-09-03 22:52:31 +02:00
csoler
063783a859 Merge pull request #1004 from digitigrafo/master 
Orange skin webUI proposed
 2017-09-03 14:59:14 +02:00
Phenom
a73ea437ed Add a filter to DownLoad list 2017-09-02 17:57:04 +02:00
cri
e1e1fb4189 revert build orange skin 2017-08-24 15:31:17 +02:00
cri
4fc91be217 rwd style 2017-08-24 15:08:29 +02:00
cri
d845a3e55a orange css skin >48em 2017-08-24 14:32:22 +02:00
Your Name
ea4495fcbe added new orange skin 2017-08-23 11:16:26 +02:00
csoler
7f8386f91d Merge pull request #998 from myfingerhurt/master 
add new keys to WebUI api peers handling
 2017-08-20 21:17:19 +02:00
Phenom
5d59d56ba2 Add Only Hidden Node configure flag 
To have only hidden node generation append the following assignation to
qmake command line "CONFIG+=rs_onlyhiddennode"
 2017-08-20 13:17:28 +02:00
Phenom
cb7cfb440a Remove *.png.png duplicated Files 2017-08-19 23:55:39 +02:00
ben
130099f43e add new keys for WebUI api peers handling, distinguishable hidden node and clear node when examining certificate 2017-08-18 16:27:30 +09:00