csoler
737b846e23
Merge branch 'master' into v0.6-FT4
2020-02-22 21:11:00 +01:00
csoler
d120d08af8
Merge pull request #1805 from RetroShare/revert-1773-Video-Player-page-for-MainWindow
...
Revert "[Experimental] Video player page for main window"
2020-02-22 21:09:14 +01:00
defnax
bd1047aa67
Revert "[Experimental] Video player page for main window"
2020-02-22 19:01:09 +01:00
sehraf
3ad5ec9dea
insert wiki/etc and plugins before the log tab
2020-02-22 18:54:58 +01:00
defnax
5170e157a5
Merge pull request #75 from RetroShare/master
...
update to master
2020-02-22 18:34:39 +01:00
defnax
3e7f670203
Merge branch 'Video-Player-page-for-MainWindow' into master
2020-02-22 17:59:20 +01:00
defnax
78e6ed3e43
Merge pull request #73 from RetroShare/master
...
update to master
2020-02-22 17:58:13 +01:00
csoler
bb498c3dc0
Merge pull request #1803 from defnax/removed-old-unused-icons
...
Removed old unused icons
2020-02-22 17:47:32 +01:00
csoler
0f045b4f6b
Merge pull request #1800 from cyisfor/master
...
Increase maximum avatar size to 96 to avoid blurriness in chats
2020-02-22 17:26:06 +01:00
defnax
6feffc0bf5
Merge pull request #72 from RetroShare/master
...
update to master
2020-02-22 17:23:31 +01:00
csoler
a89f572edf
Merge pull request #1796 from drbob/photos_switch_to_gxscomments
...
Switch PhotoService to use GxsComments
2020-02-22 17:09:09 +01:00
csoler
941b55c9a5
Merge pull request #1797 from defnax/removed-checkbox
...
Removed unfinished checkbox
2020-02-22 17:03:52 +01:00
csoler
b73a84b768
Merge pull request #1802 from defnax/fixing-layout-issues-on-People-dialog-
...
Fixing layout issues on people dialog
2020-02-22 17:02:29 +01:00
csoler
5faee5ebe2
Merge pull request #1799 from defnax/update-and-cleanup-the-wiki-icons
...
Update and cleanup the wiki icons & small improvements
2020-02-22 17:01:02 +01:00
defnax
bb22b03b62
removed old icons & restored few back
2020-02-22 15:41:34 +01:00
defnax
e19f97f820
more cleanup
2020-02-22 13:24:30 +01:00
defnax
089aedfc3b
more cleanup
2020-02-22 02:05:51 +01:00
defnax
87f64a1e2b
removed old unused icons
2020-02-22 01:26:20 +01:00
defnax
12c8e59b58
Added a Label open the Board of the post via rs link
...
Added a Label for open the Board of the post via rs link, to show on news feed the link.
2020-02-21 16:14:56 +01:00
csoler
1c84c6123b
removed deadcode from IdDialog and moved CircleItem to new async API
2020-02-20 20:53:40 +01:00
defnax
a9f528ff33
changed color for the enterevent
2020-02-20 00:37:44 +01:00
defnax
e8caa56dc8
Maked Group Logo label click to set the icon & removed the add icon button
...
* Maked group logo label click able to set the icon & removed the add icon button
2020-02-19 23:14:19 +01:00
csoler
5645d71699
fixed connexion between posted items and async API, and removed dead code and debug info
2020-02-19 21:52:55 +01:00
defnax
27e735878c
fixing opinion combobox & invite button layout problems
2020-02-19 00:23:29 +01:00
defnax
d402257090
Merge pull request #71 from RetroShare/master
...
update to master
2020-02-18 23:49:26 +01:00
csoler
d3bd237cde
merged upstream/master
2020-02-18 22:23:55 +01:00
csoler
c2344b1265
fixed compilation for wiki which still used GxsUpdateBroadcastPage.cpp
2020-02-18 22:19:47 +01:00
csoler
4d0baf2cee
merged upstream/master
2020-02-18 22:07:42 +01:00
csoler
7e08d24b64
removed most of the token queue system from GxsFeedItems
2020-02-18 20:15:23 +01:00
csoler
471efa430c
Merge pull request #1783 from csoler/v0.6-FT2
...
[WIP - Wait for posted async API] Fixing all notifications
2020-02-18 19:52:55 +01:00
csoler
d1b26c9d36
removed dead code form GxsForumThreadWidget.cpp
2020-02-18 11:19:10 +01:00
csoler
61083ff77a
fixed elided label when size is too small to draw anything
2020-02-18 11:07:41 +01:00
csoler
09c5d93631
moved elided label paint method to static so that it can be used by other item delegates
2020-02-18 10:50:55 +01:00
csoler
e4dc72169c
switched from GxsIdRSTreeWidgetItem to GxsIdItemDelegate, so as to avoid the whole timer system to load ids in Circles list
2020-02-17 23:13:41 +01:00
Cy
718ad1c531
Increase maximum avatar size to 96 to avoid blurriness in chats
2020-02-17 22:13:38 +00:00
defnax
cc4acc0c50
update & clean up the wiki icons
2020-02-17 20:01:08 +01:00
csoler
167380127b
merged upstream/master
2020-02-17 19:54:16 +01:00
defnax
6a8135469e
Merge pull request #70 from RetroShare/master
...
update to master
2020-02-17 19:34:38 +01:00
G10h4ck
dff0138376
Merge pull request #1795 from G10h4ck/posted_api
...
Initial work on posted API
2020-02-17 14:24:45 +01:00
defnax
e796fa2658
removed unfinished checkbox
2020-02-16 20:44:04 +01:00
drbob
fe62dc1345
Switch PhotoService to use GxsComments
...
WIP improvements to PhotoService:
- switch p3photoservice to use gxcommentservice
- clean out old RsPhotoComment classes
- redesign PhotoDialog to use standard GxsCommentService classes
- remove unneeded old Comment classes from GUI
- fix indenting for PhotoDialog and p3photoservice.h
- fix layout issue in Extra Widgets for GxsGroupDialog
2020-02-16 15:21:20 +11:00
csoler
01b39bfe63
Merge pull request #1782 from sehraf/pr_improve_udpStunner
...
Reenable UDP stunner and add documentation
2020-02-15 22:15:36 +01:00
sehraf
f019a71472
only use external up from DHT stunner as fallback when no other source provides a valid IP
2020-02-15 17:51:22 +01:00
defnax
6231beb9e4
Merge pull request #65 from RetroShare/master
...
update to master
2020-02-15 15:04:29 +01:00
defnax
3eec7922f6
Merge pull request #66 from RetroShare/master
...
update to master
2020-02-15 15:04:17 +01:00
csoler
93ee9bdd18
Merge pull request #1793 from drbob/fix_photo_group_creation
...
Update RsPhotoItems and switch Photos to use GxsGroupDialog
2020-02-15 14:39:55 +01:00
csoler
659955752d
Merge pull request #1780 from defnax/rename-posted-to-boards-and-cleanup-icons
...
Rename posted to boards and cleanup icons
2020-02-15 14:37:25 +01:00
csoler
b5aa66f81b
Merge pull request #1781 from defnax/added-spacer-to-channel-post-item
...
Added spacer to channel post item
2020-02-15 14:33:20 +01:00
csoler
39fc465a0c
Merge pull request #1788 from defnax/little-changes-for-wiki-and-photo
...
Little changes for wiki and photo share
2020-02-15 14:27:22 +01:00
csoler
2be69b89d7
Merge pull request #1789 from defnax/added-to-store-last-used-page-for-post-creation
...
Added to store last used page for post creation
2020-02-15 14:24:25 +01:00
