Commit Graph

14082 Commits

Author SHA1 Message Date
hunbernd
2b2a9f9a89 Merge upstream 2020-01-13 11:21:59 +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
defnax
d0fcd90ccc Added Picture View Dialog for open the picture in a external View
* Added Picture View Dialog for open the picture in a external View
* Added a clickable Label for Classic Views Thumbnail label to open Picture via one click
* Imroved the Classic & Card views dark stylesheets for better look and feel
2020-01-10 19:27:58 +01:00
defnax
42491f80e6
Merge pull request #45 from hunbernd/New-Posted-Card-View
New posted card view
2020-01-10 18:57:16 +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
defnax
7646421820
Merge pull request #44 from RetroShare/master
update to master
2020-01-07 19:44:34 +01:00
hunbernd
5b9a275e81 Fixes the build problem with the new notification system.
PostedCardView uses the same identifier as PostedItem.
2020-01-07 19:14:57 +01:00
hunbernd
0e8b12ff9f Merge upstream 2020-01-07 15:05:21 +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
c1e23099a0
improved the logic of incoming item handling a little bit: only check service id for items that are for us, and store items with missing keys in waiting queue 2020-01-06 22:23:07 +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
defnax
846767e83b Improved the Image attach Page 2020-01-06 17:02:17 +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
defnax
c210bf4b9e set default picture dimensions to 640*480 like same as embeded html image
* set default picture dimensions to 640*480 like same as embeded html image
2020-01-06 14:35:57 +01:00
defnax
f482e681e3 fixing margins & hide notes field when its empty 2020-01-06 01:28:20 +01:00
defnax
b96fecfcbb Added gif & webp for RichtextEditor
* Added gif & webp for RichtextEditor picture attachments
* Attempt to fix attached picture layout issue on Card View
2020-01-06 00:25:05 +01:00
defnax
99aca410a9
Merge pull request #43 from hunbernd/New-Posted-Card-View
New posted card view
2020-01-05 21:09:10 +01:00
hunbernd
5efd318cb5 Rise post size 2020-01-05 21:00:13 +01:00
hunbernd
a988b1dd8b Handle an edge case in imageutil 2020-01-05 20:59:16 +01:00
hunbernd
2e0063da05 Merge remote-tracking branch 'remotes/defnax/New-Posted-Card-View' 2020-01-05 19:51:57 +01:00
defnax
c6c767a67e forget to commit this 2020-01-05 19:18:08 +01:00
csoler
b067b1402f
added queue for GRouter items that miss a signature key and auto-request of missing keys to friends when needed (simplified changes from PR~1697) 2020-01-04 20:39:43 +01:00
csoler
28ec7f5fb2
improved type definition for GRouter item flags (simplified changed from PR~1697) 2020-01-04 20:35:49 +01:00
csoler
e5d8600f25
Added the possibility to request identities to specific peers (simplified changelog from PR~1697) 2020-01-04 20:34:35 +01:00
defnax
246029736d Added anmos changes & own improvements
Added the changes from anmo
Added to store/load last used identity for posted composer
Added remove button for remove the attached image
Fixed to hide the Notes button when there is not text content (PosteItem)
Fixed the ui margins better look
2020-01-04 17:01:58 +01:00
hunbernd
dae10b06bb Merge defnax's branch 2020-01-02 19:00:42 +01:00
hunbernd
778c5ea47d Do not allow posting too large messages 2020-01-02 18:43:35 +01:00
hunbernd
349f0e0c31 Link the original image 2020-01-02 17:24:51 +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
defnax
8a0eb9705f Fixed Card View display by anmo 2019-12-30 20:48:04 +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
hunbernd
d49443caf3 Fixed bug preventing hashing files from file paths with special characters 2019-12-30 00:04:36 +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