Commit Graph

13880 Commits

Author SHA1 Message Date
defnax
558e80fa2f Added Video Player page for MainWindow 2020-01-27 19:45:43 +01:00
defnax
d35c244bcb
Merge pull request #50 from RetroShare/master
update to master
2020-01-25 18:08:59 +01:00
csoler
9c65836503
Merge pull request #1768 from csoler/v0.6-SSL111Fix
fixed OpenSSL 1.1.1 bug on debian due to security level being set to …
2020-01-24 23:08:06 +01:00
csoler
afdf917188
fixed OpenSSL 1.1.1 bug on debian due to security level being set to 2 on default 2020-01-23 23:31:24 +01:00
defnax
1da4b330b0
Merge pull request #49 from RetroShare/master
upate to master
2020-01-22 21:51:05 +01:00
Gioacchino Mazzurco
92990c55e7
JSON API spit out CORS headers also on error
Browsers won't let JavaScript properly handle the error if the corsa
  headers are missing thanks Saud for report see:
  retroshare://forum?name=Shouldn%27t%20CORS%20headers%20be%20present%20for%20all%20API%20responses%3F&id=8fd22bd8f99754461e7ba1ca8a727995&msgid=e3232ae3a1b76698576a9159ba962fa5091e710c
2020-01-21 12:56:52 +01:00
csoler
1666ce290a
Merge pull request #1765 from defnax/Fix-wizard-ui
Fix connect wizard ui
2020-01-20 20:54:51 +01:00
defnax
ddaede4cc0 Fixing back the height & width of the ui it was to big 2020-01-20 13:26:22 +01:00
defnax
6f27f622b8
Merge pull request #47 from RetroShare/master
update to master
2020-01-19 20:53:57 +01:00
csoler
3632478b55
Merge pull request #1763 from csoler/v0.6-BugFixing
tried to sorted out the layout of channel item
2020-01-19 20:35:25 +01:00
csoler
912f5de90b
Fixed UDP bug (Congrats to Sehraf for finding this!) 2020-01-19 20:08:58 +01:00
csoler
6136ac08f5
removed grouter debug output 2020-01-19 17:43:57 +01:00
csoler
3e62ce2e0a
fixing -u flag not being accounted for 2020-01-18 21:26:34 +01:00
csoler
ab2e116fd2
properly hide the msgFrame when msg is empty in channel post item 2020-01-18 18:20:29 +01:00
csoler
99a106d277
moved the "new" button on top right position and file label to the right 2020-01-18 17:42:28 +01:00
csoler
765664b4f8
tried to sorted out the layout of channel item 2020-01-18 15:42:04 +01:00
csoler
6001517718
Merge pull request #1630 from PhenomRetroShare/Fix_ChatWidgetHistoryUserName
Fix ChatWidget History UserName
2020-01-18 13:57:23 +01:00
csoler
1370d1417e
Merge pull request #1756 from csoler/v0.6-GRouter
[WIP] V0.6 GRouter
2020-01-18 13:55:29 +01:00
defnax
efebf20366
Merge pull request #46 from RetroShare/master
update to master
2020-01-17 23:27:38 +01:00
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
defnax
7646421820
Merge pull request #44 from RetroShare/master
update to master
2020-01-07 19:44:34 +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
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
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
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