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
12,450 Commits 63 Branches 22 Tags 194 MiB
31b0f67e94
Commit Graph

6201 Commits

Author SHA1 Message Date
csoler
80f4907d66
Merge pull request #1227 from RetroPooh/openlocal 
bring back open local file on link click
 2018-07-10 11:20:43 +02:00
G10h4ck
4b6fd5d944
Merge pull request #1296 from chelovechishko/namespaces 
fix ODR violations caused by same names for different things
 2018-07-09 10:55:07 +02:00
csoler
93aa5442a5
Merge pull request #1293 from chelovechishko/chalod 
several fixes to chat gui
 2018-07-08 16:58:56 +02:00
chelovechishko
b3dddeafdf add missing namespaces 2018-07-06 23:55:12 +09:00
csoler
0c45217fc0
merged upstream/master 2018-07-05 17:41:30 +02:00
csoler
4a64ea5f1f
added optional use of dist sync in GroupFrameDialog 2018-07-05 14:00:04 +02:00
csoler
0e37de3e11
made retrieval of group data manual instead of automatic 2018-07-05 11:43:55 +02:00
csoler
47e760a2c5
added a few missing mutexes in prevent searches to be shown when already known 2018-07-05 10:11:12 +02:00
csoler
2067b106e4
fixed missing code in passing turtle group data result to client service 2018-07-04 23:54:26 +02:00
csoler
8ad454723a
added group data request when search items are selected 2018-07-04 21:42:09 +02:00
chelovechishko
74075fdded gui: do not show the quote section of context menu in chat if 
no text selected
 2018-07-04 23:18:21 +09:00
chelovechishko
b3fb7abf99 gui: reduce size of icons in chat for font.height lesser than 26 2018-07-04 22:46:01 +09:00
chelovechishko
77c3eae976 gui: check for show "is typing" before time call 2018-07-04 00:34:45 +09:00
chelovechishko
b950e12bcf gui: disable quote option if no text is selected in chat 2018-07-04 00:19:36 +09:00
chelovechishko
5925aa06fe gui: anchor not only first word of nickname, if any 2018-07-03 23:33:29 +09:00
chelovechishko
4eb060e154 gui: do not attempt to create context menu if idlist is empty 
...and other side effects
 2018-07-02 21:19:57 +09:00
Gioacchino Mazzurco
1dd707710b
Merge branch 'master' into extra_locators_merge 2018-07-02 12:22:23 +02:00
cyril soler
1b2b3113ca fixed previous commit caused by an apparent bug in qtcreator when updating code 2018-07-02 10:21:38 +02:00
cyril soler
e6db04e2b5 cancelled previous commit, because it sort of breaks the update of forum lists. 2018-07-02 09:45:17 +02:00
cyril soler
abc5b840d2 added queuedConnection type in fillDisplay() between RsGxsBroadcastWidget and RsGxsBroadCastBase. 2018-07-02 09:36:28 +02:00
csoler
a6edf47e00
removed debug/experimental channel search from files tab 2018-06-26 22:25:06 +02:00
csoler
00dfa0f3c2
added fallback for GXS GroupMessage UI to look into cached distant group data 2018-06-26 22:20:02 +02:00
Gioacchino Mazzurco
cb11ad92ea
Merge branch 'master' into jsonapi 2018-06-26 15:19:25 +02:00
Gioacchino Mazzurco
502459a25a
Cleanup rapidjson inclusion 
Fix compilation error of android service
 2018-06-26 15:12:16 +02:00
Gioacchino Mazzurco
15f39129f1
Complete GxsChannels JSON API with blocking methods 
RsGxsIfaceHelper::requestStatus expose it to JSON API
Implemented RsGxsIfaceHelper::waitToken to wait for GXS operations
RsItem::serial_process fix doxygen warning as it's a comment not documentation
RsTypeSerializer add JSON conversion methods for double [de]serialization not
	implemented yet
RsTypeSerializer_PRIVATE_{FROM,TO}_JSON_ARRAY fix doxygen warning as it's a
	comment not documentation
make GxsChannels::ExtraFileHash a bit more reasonable
jsonapi-generator fix unused variable warning if there is no input or output
	paramethers
jsonapi-generator fix generation for inerithed jsonapi methods
Convert to RsSerializable some Gxs structs for the JSON API
 2018-06-26 13:20:24 +02:00
csoler
a5d1a154a4
remove channel/posted/forum info when no group is selected 2018-06-25 23:08:10 +02:00
csoler
08b436e5f4
added display of searched groups 2018-06-24 23:15:22 +02:00
Gioacchino Mazzurco
b4d2ce82c1
RsTokenService use enum for request status 2018-06-24 18:56:48 +02:00
csoler
e351d7257e
added retrieval of search results in UI 2018-06-24 16:55:38 +02:00
Gioacchino Mazzurco
7ad337c8d2
Implement automatic JSON API generation 
qmake file add jsonapi-generator target to compile JSON API generator
qmake files add rs_jsonapi CONFIG option to enable/disable JSON API at compile
  time
RsTypeSerializer pass down same serialization flags when creating new context
  for nested objects serial job
RsGxsChannels expose a few methods through JSON API as example
Derive a few GXS types (RsGxsChannelGroup, RsGxsChannelPost, RsGxsFile,
  RsMsgMetaData) from RsSerializables so they can be used for the JSON API
Create RsGenericSerializer::SERIALIZATION_FLAG_YIELDING so JSON objects that
  miss some fields can be still deserialized, this improve API usability
SerializeContext offer friendly constructor with default paramethers
Add restbed 4.6 library as git submodule as most systems doesn't have it yet
Add a bit of documentation about JSON API into jsonapi-generator/README.adoc
Add JsonApiServer class to expose the JSON API via HTTP protocol
 2018-06-24 16:28:33 +02:00
csoler
6ccc7654d6
added code to notify GxsBroadcast system with new distant search results 2018-06-23 22:25:36 +02:00
csoler
5b9666855d
fixed merge with upstream 2018-06-22 23:38:31 +02:00
csoler
2f159efb10
Merge pull request #1288 from csoler/v0.6-GxsFix 
changed std::vector into std::set in notification system, hence remov…
 2018-06-22 22:06:59 +02:00
csoler
a7f1adc49a
added comment 2018-06-21 18:55:29 +02:00
csoler
cadc697882
removed reload of currently selected identity during full reload of Id list in People as it caused some blinking 2018-06-21 17:27:15 +02:00
csoler
84699db744
changed std::vector into std::set in notification system, hence removing lots of std::find(std::vector::begin(),std::vector::end(),T), causing quadratic costs in multiple places. 2018-06-21 15:46:59 +02:00
csoler
3981bc8e3b
extended notification system to add distant search result notification 2018-06-21 13:48:57 +02:00
csoler
5cb48c27de
renamed a few constants of GXS notify system into more consistent values 2018-06-21 09:26:03 +02:00
csoler
c79ceba4ee
added remove buttons for ongoing search entries 2018-06-20 23:26:37 +02:00
csoler
91fd38d46f
started GUI part for distant network search of groups 2018-06-20 22:30:44 +02:00
G10h4ck
9090205747
Merge pull request #1284 from G10h4ck/improve_build 
Improve build and Windows Continuos Integration
 2018-06-19 11:53:07 +02:00
csoler
6139632378
changed back RsGxsUpdateBroadCast.cpp to dos line ending 2018-06-18 22:37:31 +02:00
csoler
2e7398ac9b
removed debug info 2018-06-18 22:35:22 +02:00
csoler
79e676edbe
fixed re-load of GXS groups (forums/channels) when the read flag is changed 2018-06-18 22:27:05 +02:00
csoler
7a135c5c43
added quick and dirty turtle search for channels in Files search tab 2018-06-13 22:46:27 +02:00
Gioacchino Mazzurco
1f76108a9e
Remove some cruft from build files 2018-06-11 14:21:28 +02:00
thunder2
4eda277922 Added missing declare of metatype 2018-06-08 17:00:37 +02:00
Gioacchino Mazzurco
d7b366de23
RS-gui Solve unused parameter warning 2018-06-07 14:54:58 +02:00
csoler
7caf06b57d
added structures for generic turtle search and access functions in Gxs objects 2018-06-06 23:15:29 +02:00
csoler
90d7f55c40
finished implementing GXS search items 2018-05-31 15:41:54 +02:00
csoler
57dde55f56
Merge pull request #1269 from PhenomRetroShare/Add_NeverAskMeForExternalLinkActivated 
Add Never Ask Me For External Link Activated
 2018-05-26 11:23:33 +02:00
csoler
33fe823127
Merge pull request #1271 from sehraf/pr_compile-fix-unused-services 
make wiki and photo services compile again
 2018-05-26 11:22:47 +02:00
sehraf
f53e5e8468
Fix displayed chat link name in id dialog 
before (decimal):  Message in chat room 5327517029776505601
after (proper id): Message in chat room LFD6E08C33A98C658
 2018-05-25 23:59:02 +02:00
sehraf
428b331d8e
fix for Qt 5.11 
Quote from Arch mailing list:
- there's been a huge header cleanup in Qt modules. Expect build failures for applications that rely on transitive includes instead of declaring all required headers. Those need to be fixed upstream by explicitely adding the missing includes.
 2018-05-25 23:57:11 +02:00
Gioacchino Mazzurco
1ad1fdc7be
p3NetMgrIMPL::checkNetAddress() notify if port change 
Plus cleanups and proper sockaddr_storage copy
 2018-05-22 19:17:37 +02:00
sehraf
92b21d7332
compile fix wikipoos 2018-05-21 14:26:46 +02:00
Phenom
8f107cca31 Add Never Ask Me For External Link Activated 
Need to remove [General] NeverAskMeForExternalLinkActivated key in
RetroShare.conf to revert.
 2018-05-19 16:37:29 +02:00
csoler
2145911ac4
Merge pull request #1262 from PhenomRetroShare/Fix_PartialDirCheck 
Fix Partial Dir Check
 2018-05-16 13:30:56 +02:00
csoler
4661329bee
fixed bug causing new forums and identities to not show up immediately 2018-05-16 11:15:18 +02:00
Phenom
f12cd5774d Fix Partial Dir Check 
Add WrongValue StyleSheet property, when bad directory selected.
Update QLineEdit with current setting so it's possible to see if
something is modified. No need to restart.
 2018-05-12 14:31:28 +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
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
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
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
RetroPooh
2dc69cb000 embed preview for images on file attach in chat 2018-04-27 16:50:00 +03:00
RetroPooh
606537a092 reorder cases for nicer diff 2018-04-26 23:28:14 +03:00
csoler
680346c155
Merge pull request #1239 from RetroPooh/discosw2 
fix discovery switch
 2018-04-26 22:06:01 +02:00
RetroPooh
1d5e029a25 fix discovery switch 2018-04-26 23:01:58 +03:00
Gioacchino Mazzurco
0562850758
Fix retroshare-gui compilation with GCC 6 
same as 678ee31a14 for retroshare-gui
 2018-04-23 21:11:41 +02:00
G10h4ck
82eb42ad8a
Merge pull request #1235 from G10h4ck/build_improvements 
Build improvements
 2018-04-23 12:04:35 +02:00
csoler
2294f73539
fixed search button missing due to previous commit 2018-04-22 21:38:12 +02:00
csoler
e5d2f88fab
removed "search while typing" because it is really too painful 2018-04-22 18:31:05 +02:00
csoler
236b0ce2b4
re-enabled search while typing, now that it is fast enough 2018-04-22 17:57:14 +02:00
csoler
849ed79cf2
fixed missing update after filtering 2018-04-22 17:38:14 +02:00
csoler
1e6e9dfd12
fixed crazy cost of search in file list tree/flat mode using filterProxyModel instrinsic filter system 2018-04-22 17:15:40 +02:00
Gioacchino Mazzurco
4876a0ea3b
Multiple improvements to build process 
Restructure and document retroshare.pri variables and helper functions
Link sqlite statically like other libraries on Android
qmake has multiple win32-* specs match them correctly
Move a buch of generic thing to retroshare.pri instead of having them replocated
  accross project specific .pro
Fix retroshare-gui too many symbols exported on windows liking error by adding
  QMAKE_LFLAGS+=-Wl,--exclude-libs,ALL
Rename retroshare-gui/src/util/win32.h because the name is too prone to
  confusion and build conflicts
libreasapi avoid usage of cretar_prl link_prl that seems unreliable on some
  platforms
libreasapi rename LIBRESAPI_QT to more understendable LIBRESAPI_SETTINGS
Use use_*.pri instead of copy pasting error prone qmake snippets around
Expose bitdht option to retroshare.pri
Add RS_THREAD_LIB qmake variable for better crossplatform support
Move debug and profiling generic options to retroshare.pri (avoid copy/pasting)
Remove Qt script module in qmake as it is not available anymore
 2018-04-18 07:56:43 +02:00
csoler
d5d445a7b8
Merge pull request #1207 from PhenomRetroShare/Add_TimerFilterInSharedFilesDialog 
Add a timer in SharedFilesDialog filter to not so often triggs search in
 2018-04-15 22:26:35 +02:00
csoler
c84e5e863b
Merge pull request #1221 from hunbernd/fix/private-chat-icon-not-updating 
Fix private chat icon not changing back to idle icon from new message…
 2018-04-15 22:18:59 +02:00
csoler
8ab87f6bdf
Merge pull request #1222 from RetroPooh/serverpage 
ServerPage fixes
 2018-04-15 22:13:04 +02:00
Gioacchino Mazzurco
b36cb1ef17
Fix retroshare GUI building with no_libresapihttpserver 2018-04-15 12:41:54 +02:00
Phenom
d91964acb3 Disable Search in SharedFilesDialog while typping. 2018-04-14 12:30:55 +02:00
Phenom
eccff5358a Add a timer in SharedFilesDialog filter to not so often triggs search in 
files.
 2018-04-14 12:24:48 +02:00
RetroPooh
a14b1f60a2 tooltips improv 2018-04-06 14:01:52 +03:00
RetroPooh
dceeab0e4d cleanup 2018-04-06 13:02:30 +03:00
RetroPooh
154f089dd4 fixes 2018-04-06 12:50:10 +03:00
RetroPooh
5775203b69 bring back open local file on link click 2018-04-05 22:22:54 +03:00
RetroPooh
234b576f38 change distant chat status indicator color to differ closed and pending 2018-04-02 19:43:21 +03:00
RetroPooh
fdb8dc568c fix unicode display for chat status 2018-04-02 19:38:56 +03:00
RetroPooh
e17edbfa1f fix default tab on serverpage 2018-04-01 14:13:42 +03:00
RetroPooh
6964ba4165 fix tab index on serverpage 2018-04-01 14:13:21 +03:00
hunbernd
c821c179ef Fix private chat icon not changing back to idle icon from new message icon when window activated 
Broken in add9c1e72c
 2018-03-31 22:39:58 +02:00
csoler
24d1f5d9eb
Merge pull request #1190 from PhenomRetroShare/Add_ShowEmptySubMenuRemoteTree 
Add ShowEmpty sub menu in Tree Remote SharedFilesDialog.
 2018-03-17 18:40:32 +01:00
csoler
09de680e93
Merge pull request #1210 from PhenomRetroShare/Add_BackgroundInProgressBarText 
Add Background to xprogressbar text for more readability.
 2018-03-17 18:30:21 +01:00
Phenom
e1482dd5e4 Add Rounded and Gradient Background to xprogressbar text. 2018-03-17 00:00:05 +01:00
Phenom
7da73b35a9 Add differents views depends ProgressBar width 
Less than text width: only show progress bar.
Text width to 1.5 times: only show text.
More than 1.5 times: show chunk and text.
 2018-03-16 22:02:59 +01:00
Phenom
311b190f67 Add Background to xprogressbar text for more readability. 2018-03-16 22:02:59 +01:00
csoler
e1ad21c357
fixed wrong file count in RsCollectionDialog when downloading files 2018-03-15 13:11:19 +01:00
csoler
6e8305abda
Merge pull request #1211 from PhenomRetroShare/Fix_AvatarStatusOverlay 
Fix Friend Avatar status overlay no depends size scale.
 2018-03-14 20:56:30 +01:00