hunbernd
d393896c9e
Merge remote-tracking branch 'remotes/origin/pr/2' into feature/New-Posted-Card-View
2020-01-20 23:45:12 +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
21cf49a009
added to check pixmap width & height before scale, only scale when needed
2020-01-20 20:12:26 +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
dcddda81f3
set stylesheet for the new label & removed old stylesheets from the channel item
2020-01-19 22:29:47 +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
defnax
5dffe2e3d8
fixing stylesheets for clickable label
2020-01-15 22:27:05 +01:00
defnax
c1efdac7f6
get the share button usable for copy the rs link
2020-01-14 23:22:01 +01:00
csoler
c552890459
attempt to sort out the mess in item deletion in FeedHolder widgets
2020-01-14 21:43:29 +01:00
defnax
ca60e1d094
corrected to use the right value
2020-01-13 23:36:09 +01:00
defnax
b333a96da2
attempt to fix issues with pictures which width are bigger to fit on Label
2020-01-13 16:23:54 +01:00
defnax
b1f45536a2
added temporary solution to not stretch the pixmap out of the window
2020-01-13 15:36:55 +01:00
defnax
737980bf12
added delete on close
2020-01-13 13:19:26 +01:00
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
