csoler
beab0521c4
Merge pull request #1762 from csoler/v0.6-BugFixing
...
V0.6 bug fixing
2020-01-17 22:28:12 +01:00
csoler
c75d372f24
merged upstream/master
2020-01-17 22:16:24 +01:00
csoler
26df59971f
Merge pull request #1748 from csoler/v0.6-ImprovedGUI_2
...
V0.6 improved gui 2
2020-01-17 22:14:49 +01:00
csoler
8941a19db9
fixed mistake that causes missing FeedItems for messages and posted
2020-01-17 21:22:39 +01:00
csoler
5df7f7667f
fixed crash in NewFeed when attempting to find a widget using its identifier
2020-01-16 20:33:34 +01:00
csoler
c552890459
attempt to sort out the mess in item deletion in FeedHolder widgets
2020-01-14 21:43:29 +01:00
csoler
a0b6f50b60
Merge pull request #1760 from csoler/v0.6-BugFixing
...
fixed bug where notification was missing on creation of new post in f…
2020-01-11 20:38:27 +01:00
csoler
f0921886db
fixed glitch in previous commit
2020-01-11 19:08:11 +01:00
csoler
6a4c98b2ed
allowed some clients to Event handler to register with type NONE, which means that all event types will be sent to the client
2020-01-11 19:01:43 +01:00
csoler
45e579c98f
fixed bug where notification was missing on creation of new post in forums, channels and posted
2020-01-11 17:00:01 +01:00
csoler
f76b81ba49
fixed compilation in jsonapi to cope with new event type field in registerEventHandler()
2020-01-11 16:10:28 +01:00
csoler
2bd5bb5a3e
fixed merge with master
2020-01-11 00:08:36 +01:00
Gioacchino Mazzurco
33c2f56a8e
Fixup jsonapi server stopping
2020-01-08 23:16:05 +01:00
Gioacchino Mazzurco
f12ec2b535
JSON API service and RsThread fixups
2020-01-08 14:24:46 +01:00
Gioacchino Mazzurco
f4d7fe4dde
TravisCI MacOS disable xapian which depends on broken brew python
2020-01-07 11:37:06 +01:00
Gioacchino Mazzurco
531bdcccf1
Fixup .travis.yml indentation
2020-01-07 11:23:20 +01:00
Gioacchino Mazzurco
014b5255ed
Fixup windows build
2020-01-07 02:00:57 +01:00
Gioacchino Mazzurco
8718a442d1
Merge branch 'master' of github.com:RetroShare/RetroShare
2020-01-07 01:50:44 +01:00
Gioacchino Mazzurco
880a328c91
Fixup nested include in rsinit.cc
2020-01-07 01:50:17 +01:00
Gioacchino Mazzurco
b17738f668
Merge branch 'csoler-v0.6-SecNotification'
2020-01-07 01:19:08 +01:00
Gioacchino Mazzurco
babd2938c2
Print libretroshare version on init
2020-01-07 01:18:29 +01:00
Gioacchino Mazzurco
37b5d8f307
Fix few glitches in Cyril PR
2020-01-07 00:54:49 +01:00
csoler
1c6965399e
Merge pull request #1747 from csoler/v0.6-Crypto
...
enabled v0.7_non_backward_compatible_changes 01,02 and 03
2020-01-06 20:18:02 +01:00
Gioacchino Mazzurco
c96223a2a8
Merge "Switched security items to new notification system #1735 " csoler-v0.6-SecNotification
2020-01-06 15:09:06 +01:00
Gioacchino Mazzurco
f4f7b8a1ea
Few fixes after rebase
2020-01-06 14:46:36 +01:00
csoler
92c904cf02
Merge pull request #1750 from csoler/v0.6-MacOS-Fix
...
trying to fix MacOS compilation on travis by remving unused dependenc…
2020-01-01 18:05:44 +01:00
csoler
5a25f18e9c
Merge pull request #1749 from defnax/Forum-Composer-small-ui-changes
...
Forum composer small ui changes
2020-01-01 18:04:13 +01:00
csoler
b824bfc166
removed debug output in p3gossipdiscovery.cc
2020-01-01 18:01:53 +01:00
csoler
a60cf61df5
trying to fix MacOS compilation on travis by remving unused dependency that causes python2 to collide with python3
2019-12-30 11:57:22 +01:00
Gioacchino Mazzurco
df87fe53b1
Cleanup RsThread and related classes
...
Removed antipattern abstraction RsSingleJobThread
Rename runloop() method to run() in RsThread
Ported few classes ineriting from RsSingleJobThread to RsThread
RsThread use std::atomic instead of self implemented strange binary semaphores
Removed RsTickingThread::shutdown() use RsThread::askForStop() instead
Removed RsTickingThread::fullstop() use RsThread::fullstop() instead
Stop properly JSON API server in retroshare-gui
Centralize errno traslation to literal in util/rserrno.*
2019-12-30 10:38:54 +01:00
defnax
ef5aebd2ea
forum composer changes for better look & feel
...
* Added PlaceHolder text for title & message text.
* Set default font family to "MS Sans Serif"
* Fixed to get work Place Holder text on QTextEdit, seems there was a second unwanted line
2019-12-29 22:28:17 +01:00
csoler
c544b1da7c
changed RsEvents so that it takes event types when registering handlers, which limits the number of handlers called for each event
2019-12-29 13:50:54 +01:00
csoler
dc2f2f5eb4
fixed ambiguous variable
2019-12-29 13:49:56 +01:00
csoler
d9f1a08a77
enabled v0.7_non_backward_compatible_changes 01,02 and 03
2019-12-28 20:36:31 +01:00
defnax
eb247e009b
Merge pull request #42 from RetroShare/master
...
update to master
2019-12-27 16:36:47 +01:00
csoler
9fda64e815
fixed geometry of buttons PostedFeedItem like other feed items
2019-12-26 21:30:00 +01:00
csoler
358aa1e0ab
Merge pull request #1669 from hunbernd/feature/stickers-upgrade
...
Sticker improvements
2019-12-26 17:30:14 +01:00
hunbernd
2b05991713
Merge branch 'upstream' into feature/stickers-upgrade
2019-12-26 01:13:21 +01:00
hunbernd
cb68cb73d0
Optimized image embedding algorithm
2019-12-26 00:04:19 +01:00
hunbernd
15ac7eecc8
Cache sticker icons
2019-12-26 00:01:14 +01:00
csoler
57102b109b
Merge pull request #1742 from csoler/v0.6-BugFixing
...
fixed uninitialized memory read and inconsistent initialization of mR…
2019-12-25 22:26:40 +01:00
csoler
a469647386
replaced RsErr() by RsInfo() in pqissl when applicable
2019-12-25 19:24:52 +01:00
defnax
ec65341105
Merge pull request #41 from RetroShare/master
...
update to master
2019-12-24 15:47:23 +01:00
csoler
5afa2a1e07
Merge pull request #1740 from defnax/Added-new-rich-text-editor
...
Added new rich text editor & redesigned Posted Composer
2019-12-24 12:07:54 +01:00
csoler
f45a04b3d5
fixed key list not properly updating when importing new key in GenCertDialog, and improved tooltips
2019-12-24 11:48:50 +01:00
hunbernd
e8bdce6e23
Fix sticker button disabled on distant chat
2019-12-24 00:14:38 +01:00
hunbernd
33236aeca3
Merge branch 'upstream' into feature/stickers-upgrade
2019-12-23 23:54:55 +01:00
defnax
c4a71d21f9
Merge pull request #40 from RetroShare/master
...
update to master
2019-12-23 23:32:32 +01:00
defnax
824fc5049b
update the licence & added the changes for Channel message composer
2019-12-23 21:26:54 +01:00
csoler
dc3624945f
fixed uninitialized memory read and inconsistent initialization of mReputationScore in GxsReputation
2019-12-23 11:52:32 +01:00