Commit Graph

14069 Commits

Author SHA1 Message Date
defnax
411104f0d0
Merge pull request #86 from RetroShare/master
update to master
2020-03-01 17:52:59 +01:00
csoler
97e7df82c5
Merge pull request #1816 from csoler/v0.6-FT4
TokenQueue cleanup
2020-03-01 17:29:44 +01:00
csoler
76596e678e
Merge pull request #1815 from drbob/thewire-get-basics-working
Get the basics of TheWire service working
2020-03-01 16:40:35 +01:00
csoler
f8d07a3e92
switched to more reasonnable timeout values in waitToken 2020-03-01 13:45:07 +01:00
csoler
d96ce490d4
improved Circle editor ID selection list 2020-03-01 11:35:24 +01:00
csoler
8be92f24b6
removed TokenQueue from CircleCreationDialog 2020-02-29 23:48:37 +01:00
drbob
a089bc6e06 add missing files to retroshare-gui.pro 2020-03-01 09:37:42 +11:00
csoler
5ccc59e2ea
removed TokenQueue from FriendSelectionWidget 2020-02-29 23:07:01 +01:00
csoler
c09e9c407b
removed warning about filtered packet 2020-02-29 23:06:43 +01:00
csoler
4124585b55
removed unused print methods in some RsItems since now print is handled by serializer 2020-02-29 12:14:37 +01:00
csoler
34fc132003
removed misleading warning about null circle id in newsfeed 2020-02-29 12:13:51 +01:00
Gioacchino Mazzurco
6bb0950dd6
Fix typo in documentation 2020-02-29 11:05:22 +01:00
drbob
24fd4ae3e7 Get the basics of TheWire service working
Added REF fields to Wire Msgs to allow replys to work well.
Added description of how the Message fields should be used.
Added WireGroupDialog for creation of WireGroups.
Updated PulseAddDialog to support publishing Pulses and Replies.
Added classes to display Pulses / Groups.
Added single selection point of WireGroup for publishing.
Added basic "refresh" to reload new GXS data.
2020-02-29 11:47:00 +11:00
defnax
a3797e4bee
Merge pull request #82 from RetroShare/master
update to master
2020-02-26 01:35:39 +01:00
csoler
b1680bd591
Merge pull request #1806 from sehraf/pr_move-log-tab
Insert wiki/etc and plugins before the log tab
2020-02-25 22:23:45 +01:00
csoler
9b452774ac
Merge pull request #1811 from defnax/small-fixes-for-wiki-&-photos
Small fixes for wiki
2020-02-25 22:23:20 +01:00
csoler
8bfc960137
Merge pull request #1813 from csoler/v0.6-FT4
remved tokenQueue from IdDetailsDialog and attempt to fix crash in Ci…
2020-02-25 22:22:35 +01:00
defnax
d1bb88685b
Merge pull request #81 from RetroShare/master
update to master
2020-02-25 11:39:56 +01:00
csoler
a050669a93
remved tokenQueue from IdDetailsDialog and attempt to fix crash in Circles due to deleting an item that is still in the tree 2020-02-24 22:21:38 +01:00
csoler
35ebc03904
Merge pull request #1812 from drbob/photos_add_editing
Add Album Editing (add / remove photos)
2020-02-24 20:50:56 +01:00
defnax
44ecda293c restore changes 2020-02-24 16:26:29 +01:00
drbob
5d0e2bb71e Add Album Editing (add / remove photos)
Significant improvements to AlbumDialog
 - load Existing Photos to the Album
 - drag and drop add new Photos
 - mark photos for deletion
 - publish these changes
 - color photoitems depending on state

Fixed up Top-Level Photo display.
 - only show latest version of photo (hide deleted)
 - fixup grouping by "Own / Subscribed / Other" Albums
 - added Album detail editing using GxsGroupDialog
2020-02-25 00:11:51 +11:00
defnax
5cea8c4335 Added to store the splitter position for the wiki dialog
* Added to store the splitter position for the wiki dialog
* Fixing the missed icon for Photoshare
* Correcting Indentation
2020-02-23 21:12:32 +01:00
defnax
566399440c
Merge pull request #79 from RetroShare/master
update to master
2020-02-23 13:27:23 +01:00
csoler
be4d812df2
Merge pull request #1801 from csoler/v0.6-FT4
Removed most of Token system from FeedItems [rebase of PR 1798]
2020-02-22 22:14:36 +01:00
defnax
ef753d5252
Merge pull request #77 from RetroShare/master
update
2020-02-22 21:47:16 +01:00
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