Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-30 09:56:14 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
11,149 Commits 63 Branches 22 Tags 196 MiB
4e4c991034
Commit Graph

11149 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Angela Mazzurco
6fc2cf6b87 Merge remote-tracking branch 'g1o/qml_app_ui_aesthetic' into qml_app_ui_aesthetic 2017-07-08 18:09:15 +02:00
Angela Mazzurco
5205301e10 Solve bug that push view when android keyboard is shown 2017-07-08 17:39:56 +02:00
csoler
decbd3514d improved the login in the interaction between terminal api client and main 2017-07-08 17:38:09 +02:00
csoler
7ee527ecbd removed comments 2017-07-08 17:35:34 +02:00
csoler
b5976e195e fixed message when passphrase is empty 2017-07-08 16:48:24 +02:00
csoler
4f887ff528 commented out unused line 2017-07-08 16:47:50 +02:00
NeverExist
36a20534c2 add new functions to chat 
add search among chat.
add textarea tag, support multi-line text messages.
add a bottom jump button
 2017-07-08 00:20:09 +09:00
NeverExist
75c8b71ac9 add new functions for chat 
add search among chat.
add textarea tag, support multi-line text messages.
add a bottom jump button
 2017-07-08 00:18:51 +09:00
Gioacchino Mazzurco
163f6b14af Qml-app update all available icons to SVG 2017-07-07 14:28:41 +02:00
Gioacchino
fcec555cd0 Merge pull request #927 from Emotyco/libresapi_lobbies_invitation 
Added to libresapi: Handling lobbies invitations
 2017-07-07 11:57:17 +02:00
Gioacchino
fc396dd9bb Merge pull request #929 from Emotyco/libresapi_empty_cert 
Fixed: Libresapi was throwing exception when requested to add new cer…
 2017-07-07 11:56:12 +02:00
Gioacchino Mazzurco
e46d91e9a4 Merge branch 'android_share_intent' 2017-07-07 11:35:16 +02:00
csoler
f5912a35ef Merge pull request #928 from PhenomRetroShare/Fix_MultiDownload 
Fix multi download of same file.
 2017-07-06 22:52:30 +02:00
Konrad
f0ad68789b Fixed: Libresapi was throwing exception when requested to add new cert which was empty 2017-07-06 22:44:45 +02:00
Phenom
54047cd7a7 Fix multi download of same file. 2017-07-06 22:38:08 +02:00
csoler
42bf6b2b6a improved display of password request 2017-07-06 20:57:38 +02:00
csoler
a778128147 fixed multi-digit numbers in terminal account selection 2017-07-06 20:50:59 +02:00
Gioacchino Mazzurco
c630f1fa89 Fix unused warning in gxstokenqueue 2017-07-06 16:28:59 +02:00
Gioacchino Mazzurco
b935bacd99 Add missing break in p3IdService::handleResponse 2017-07-06 16:28:00 +02:00
Konrad
11d02f4612 Added: Handling requests to answer invitation to lobby 2017-07-06 14:08:50 +02:00
Konrad
c9bfe4b526 Added: Handling requests to get lobbies invitations 2017-07-06 14:07:33 +02:00
Konrad
aca6233dbf Added: Handling requests to invite peers to lobby 2017-07-06 14:05:48 +02:00
Phenom
dad6abdba3 Fix channel comments line wrap 2017-07-06 12:19:26 +02:00
csoler
8e62a8b1b2 updated tooltip for opinion in People 2017-07-05 22:32:54 +02:00
csoler
141277b131 removed debug info 2017-07-05 22:16:14 +02:00
csoler
c1e18c7fe6 fixed bug causing an infinite subscribe/unsubscribe loop in GxsTrans 2017-07-05 22:12:56 +02:00
csoler
370d50b41a cleaned a bit the code in rsinit.cc 2017-07-05 21:36:00 +02:00
csoler
7ee0b4575e Merge pull request #922 from csoler/v0.6-ImprovedGUI 
V0.6 improved gui
 2017-07-04 23:27:43 +02:00
csoler
5f7df7cb73 update call to notifySettingsChanged() when changing the thread loading of channels 2017-07-04 23:26:57 +02:00
csoler
2aac675f11 merged upstream/master into v0.6-ImprovedGUI 2017-07-04 23:15:09 +02:00
csoler
931ddaef79 set load thread to false for channels on default. Fixed missing () in connect 2017-07-04 23:13:03 +02:00
Angela Mazzurco
ddaa03514c Solve contacts view onhover bug on android platforms 2017-07-04 18:46:11 +02:00
Angela Mazzurco
8ebd0f770f Solve crash bug with toolbar loader when pop push a chat view, loading AvatarOrColorHash from toolbar 2017-07-04 17:20:42 +02:00
Gioacchino Mazzurco
dafaa568b8 Qml App: better Android interaction on URL export 
Clipboard usage is uncommon in Android so export the URL via Intent too
that is the common pattern on Android
 2017-07-04 16:44:15 +02:00
Gioacchino Mazzurco
a97ba803d8 Fix missing include 
The missing include was causing compilation error
since d876bb721b
 2017-07-04 16:41:14 +02:00
Angela Mazzurco
80cc1b4520 Call toolbar change state when pop stackview 2017-07-04 15:51:03 +02:00
Angela Mazzurco
d19950f0df Add support for back key on desktop keyboard 2017-07-04 15:35:45 +02:00
csoler
5b1def1405 Merge pull request #912 from Emotyco/libresapi_avatar_handlers 
Changed: Request handler for avatar return failure if an error occurred while obtaining data
 2017-07-04 10:25:40 +02:00
csoler
3274852647 Merge pull request #913 from Emotyco/libresapi_participants_refresh 
Fixed: Room's participants list is correctly refreshed. Previously it did not react to new participants in room
 2017-07-04 10:24:43 +02:00
csoler
ee257223d3 Merge pull request #915 from PhenomRetroShare/Add_AlwaysAllowFriendTimeOffsetFeed 
Always allow Friend Time Offset Feed item.
 2017-07-04 10:24:05 +02:00
csoler
d7f0141b3b Merge pull request #916 from PhenomRetroShare/Add_WarningToDirectDonwloadCheckBox 
Add a warning to Direct download checkbox depends general setting.
 2017-07-04 10:23:30 +02:00
csoler
d876bb721b fixing async loading of channels. To be tested. 2017-07-03 23:21:31 +02:00
csoler
1dea00d2cb attempt to fix channel post auto-size by limiting the number of lines from message to display in summary depending on available size 2017-07-03 23:09:17 +02:00
csoler
719b414a82 fixed merging of comments in channel post with async-ed loading system 2017-07-03 22:32:08 +02:00
csoler
f0ed0dd471 Merge pull request #918 from RetroShare/revert-917-v0.6-ImprovedGUI 
Revert "attempt to delay channel post loading on demand when displayed"
 2017-07-03 22:07:23 +02:00
csoler
9a5e46dd49 Revert "attempt to delay channel post loading on demand when displayed" 2017-07-03 22:07:06 +02:00
csoler
f5abf54aaf Merge pull request #917 from csoler/v0.6-ImprovedGUI 
attempt to delay channel post loading on demand when displayed
 2017-07-03 21:54:22 +02:00
csoler
b6d5c55516 attempt to delay channel post loading on demand when displayed 2017-07-03 21:48:17 +02:00
Phenom
3987f751db Always allow Friend Time Offset Feed item. 
Even if "Friend Connected" is uncheck in Notify setting page.
 2017-07-03 18:39:32 +02:00
Phenom
2192a439ff Add a warning to Direct download checkbox depends general setting. 2017-07-03 18:36:47 +02:00