Commit Graph

14069 Commits

Author SHA1 Message Date
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
csoler
ae77420990
Merge pull request #1791 from comradekingu/patch-1
README reworked
2020-02-15 13:41:32 +01:00
drbob
095b5224d9 fixup licence formatting 2020-02-15 11:54:29 +11:00
drbob
1baa92f60c fixup serialisation and indentation 2020-02-15 11:39:29 +11:00
Gioacchino Mazzurco
5604f7082b
Initial work on posted API 2020-02-14 23:30:52 +01:00
Gioacchino Mazzurco
c9728cead0
Fix typo in channels deprecated method notice 2020-02-14 23:30:10 +01:00
defnax
f9e972daf9 revert back some changes 2020-02-14 16:00:14 +01:00
drbob
d04518fd55 Update RsPhotoItems and switch to GxsGroupDialog.
WIP improvements to PhotoService:
 - Switch from custom image to use RsGxsImage
 - Update classes for new Image class
 - fix serialiser for photos
 - switch group creation to use GxGroupDialog
 - tweak GxsGroupDialog to display extra Widgets
 - add AlbumExtra widget
2020-02-15 01:01:19 +11:00
Allan Nordhøy
0e4d036773
README reworked 2020-02-13 01:46:51 +01:00
defnax
34067223e7 rename on details 2020-02-13 00:12:55 +01:00
csoler
01c4534a20
load/save prefered identity for voting in posted 2020-02-12 21:10:35 +01:00
defnax
bedd2d36d4 Added to store last used page for post creation
Added to store last used page for post creation
2020-02-12 18:23:58 +01:00
defnax
2bd3e32d4a update the mainwindow icons for wiki/photo share
* update the mainwindow icons  for wiki/photo share
* get work the id combobox for album creation
2020-02-12 18:05:00 +01:00
csoler
a498d4e370
merged upstream/master 2020-02-11 22:16:31 +01:00
csoler
dc0b8c491c
using GxsIdRSTreeWidgetItem to display circle members 2020-02-11 22:14:55 +01:00
csoler
4c54d9d633
added missing case for IDs events 2020-02-11 22:14:29 +01:00
csoler
f75d0add47
added notification for circle cache updates to avoid the need for an additional UI timer 2020-02-11 16:37:53 +01:00
defnax
ef0979aafd rename settings posted page to boards too 2020-02-11 15:43:27 +01:00
defnax
920463a4ae update few more strings to the new naming 2020-02-11 14:51:52 +01:00
defnax
48e8dc5c8c
Merge pull request #63 from RetroShare/master
update to master
2020-02-11 14:24:10 +01:00
csoler
d88788f411
Merge pull request #1784 from drbob/update_unfinished_services
Update code to get Wiki / Wire and PhotoShare compiling again
2020-02-11 11:29:35 +01:00
csoler
e4f243694b
finished removing token queue from IdDialog.cpp 2020-02-11 08:36:35 +01:00
csoler
1a250f5138
half-removed token queue system from IdDialog.cpp 2020-02-10 22:33:21 +01:00
csoler
07527cfead
fixed notifications in identity 2020-02-10 20:39:52 +01:00
defnax
01068acb18 update the help page 2020-02-10 20:35:49 +01:00