Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-14 10:24:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
14,343 Commits 63 Branches 22 Tags 195 MiB
5091977979
Commit Graph

6295 Commits

Author SHA1 Message Date
csoler
737b846e23
Merge branch 'master' into v0.6-FT4 2020-02-22 21:11:00 +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
3e7f670203
Merge branch 'Video-Player-page-for-MainWindow' into master 2020-02-22 17:59:20 +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
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
csoler
7e08d24b64
removed most of the token queue system from GxsFeedItems 2020-02-18 20:15:23 +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
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
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
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
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
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
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
defnax
01068acb18 update the help page 2020-02-10 20:35:49 +01:00
csoler
101bc32679 fixed missing return in GxsChannelPostItem::uniqueIdentifier() 2020-02-10 13:06:10 +01:00
drbob
d748278637 update code to get Wiki / Wire and PhotoShare compiling again 2020-02-10 22:24:47 +11:00
csoler
372b87148c
fixed text in share publish perms 2020-02-09 22:29:36 +01:00
csoler
41a81fa5d1
fixed notifications in posted 2020-02-09 20:54:11 +01:00
defnax
9301a1b8d2 added missed spacer to channel post item 2020-02-08 20:51:37 +01:00
csoler
62c5cda7f0
merged upstream/master 2020-02-08 20:04:27 +01:00
defnax
f12a36fcfb Rename Posted to Boards & cleanup remove old icons 
Rename Posted to Boards & cleanup remove old icons
 2020-02-08 17:29:50 +01:00
defnax
9774b33ef2 Merge pull request #59 from RetroShare/master 
update to master
 2020-02-08 12:33:37 +01:00
csoler
a9f24c85a0
Merge pull request #1774 from G10h4ck/json_api_improvements 
JSON API improvements
 2020-02-07 23:16:04 +01:00
csoler
f72b385ccf
Merge pull request #1776 from csoler/v0.6-FT 
More switch to new notification system
 2020-02-07 23:15:41 +01:00
defnax
8cce8cbbe5 Added own button for play with Qt media player 
Added own button for play with Qt media player
 2020-02-07 16:33:26 +01:00
defnax
8dd85f2391
Merge pull request #52 from RetroShare/master 
update to master
 2020-02-06 22:27:37 +01:00
csoler
8e153b4acc
started removal of GxsBroadcastBase class 2020-02-06 19:57:23 +01:00
Gioacchino Mazzurco
039e8f653d
Solve race condition in JSON API restart 
Improve atomic access to restbed service
Protect JSON API restart against bursts
Fix JSON API error condition enum registration
Provide ostream helper for error_condition
Provide optional forced thread cancel for debugging purpose, disabled by
  default at compile time define RS_THREAD_FORCE_STOP to enable it
Avoid double fullstop in retroshare-gui json api apply button
 2020-02-05 18:56:47 +01:00
csoler
595df99310
fixed notifications for distant search results in channels 2020-02-03 21:39:05 +01:00
csoler
caf0bfc4e9
improved usage statistics in IdDialog 2020-02-01 23:07:19 +01:00
csoler
c6643613b6
Merge pull request #1753 from hunbernd/New-Posted-Card-View 
New posted card view enhancements
 2020-02-01 18:50:27 +01:00
csoler
0cdce37af4
added proper unregister calls in destructors of classes that register a event handler 2020-01-31 22:37:21 +01:00
csoler
e6d16f6f39
marked old hashing notification as removed 2020-01-30 23:12:21 +01:00
csoler
81c1eb227c
moved file hashing and download count to new notification system 2020-01-30 23:02:23 +01:00
csoler
06be689bef
fixed missing cache update in GxsCircles 2020-01-28 22:53:43 +01:00
csoler
b6366ac5bd
fixed misplaced notification event in GxsCircles 2020-01-28 22:47:30 +01:00
csoler
841ba9e579
added some missing notifications in circles dialog 2020-01-28 22:22:04 +01:00
csoler
424e7be52f
added notifications for identities 2020-01-27 23:02:04 +01:00
csoler
90bb6c0011
fixed notifications in forums, posted and channels 2020-01-27 21:38:57 +01:00
defnax
558e80fa2f Added Video Player page for MainWindow 2020-01-27 19:45:43 +01:00
csoler
fb9282f588
moved UserNotify to MainPage level, and added RsEvent handling code in Posted 2020-01-26 23:19:20 +01:00
defnax
3758e37c7b fixed include 2020-01-25 15:17:21 +01:00
defnax
54d0758bf2 Enabled Min & Max feature for Photo View Dialog 2020-01-24 17:08:40 +01:00
defnax
bd18f572c9 adding back spacer for PhotoView & fixed issue with centering 2020-01-24 16:35:44 +01:00
hunbernd
b3ac3d58a9 Merge upstream 2020-01-22 00:16:41 +01:00
hunbernd
91b03064b9 Removed size limit inside image viewer, because QT already limits the window size to the 2/3 of screen size 2020-01-21 22:11:13 +01:00
hunbernd
83b18509e2 Resize photoview to the size of embedded image 2020-01-21 21:23:42 +01:00
hunbernd
69a2933590 Make pixmap resizing label work 2020-01-21 20:02:35 +01:00
defnax
f8f77f122e attempt to improve 2020-01-21 01:50:33 +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
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
c75d372f24
merged upstream/master 2020-01-17 22:16:24 +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
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
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
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
8718a442d1
Merge branch 'master' of github.com:RetroShare/RetroShare 2020-01-07 01:50:44 +01:00
Gioacchino Mazzurco
37b5d8f307
Fix few glitches in Cyril PR 2020-01-07 00:54:49 +01:00
defnax
846767e83b Improved the Image attach Page 2020-01-06 17:02:17 +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
defnax
c210bf4b9e set default picture dimensions to 640*480 like same as embeded html image 
* set default picture dimensions to 640*480 like same as embeded html image
 2020-01-06 14:35:57 +01:00
defnax
f482e681e3 fixing margins & hide notes field when its empty 2020-01-06 01:28:20 +01:00
defnax
b96fecfcbb Added gif & webp for RichtextEditor 
* Added gif & webp for RichtextEditor picture attachments
* Attempt to fix attached picture layout issue on Card View
 2020-01-06 00:25:05 +01:00
hunbernd
5efd318cb5 Rise post size 2020-01-05 21:00:13 +01:00
hunbernd
2e0063da05 Merge remote-tracking branch 'remotes/defnax/New-Posted-Card-View' 2020-01-05 19:51:57 +01:00
defnax
246029736d Added anmos changes & own improvements 
Added the changes from anmo
Added to store/load last used identity for posted composer
Added remove button for remove the attached image
Fixed to hide the Notes button when there is not text content (PosteItem)
Fixed the ui margins better look
 2020-01-04 17:01:58 +01:00
hunbernd
dae10b06bb Merge defnax's branch 2020-01-02 19:00:42 +01:00
hunbernd
778c5ea47d Do not allow posting too large messages 2020-01-02 18:43:35 +01:00
hunbernd
349f0e0c31 Link the original image 2020-01-02 17:24:51 +01:00
defnax
8a0eb9705f Fixed Card View display by anmo 2019-12-30 20:48:04 +01:00
defnax
ef5aebd2ea forum composer changes for better look & feel 
* Added PlaceHolder text for title & message text.
* Set default font family to "MS Sans Serif"
* Fixed to get work Place Holder text on QTextEdit, seems there was a second unwanted line
 2019-12-29 22:28:17 +01:00
hunbernd
9381b744aa Auto resize image to fit into 34kB 2019-12-29 16:14:31 +01:00
hunbernd
419a9a520c Removed redundant title inputbox 2019-12-29 14:19:19 +01:00
csoler
c544b1da7c
changed RsEvents so that it takes event types when registering handlers, which limits the number of handlers called for each event 2019-12-29 13:50:54 +01:00
hunbernd
0dcaa90820 Merge branch 'upstream' into foreign/New-Posted-Card-View 2019-12-28 23:03:56 +01:00
hunbernd
76f803316e Really fixed loading issue for card view 2019-12-28 18:51:22 +01:00
defnax
f99224e1c0 fixed loading issue for card view 2019-12-27 19:53:06 +01:00
csoler
9fda64e815
fixed geometry of buttons PostedFeedItem like other feed items 2019-12-26 21:30:00 +01:00
hunbernd
2b05991713 Merge branch 'upstream' into feature/stickers-upgrade 2019-12-26 01:13:21 +01:00
hunbernd
15ac7eecc8 Cache sticker icons 2019-12-26 00:01:14 +01:00
csoler
57102b109b
Merge pull request #1742 from csoler/v0.6-BugFixing 
fixed uninitialized memory read and inconsistent initialization of mR…
 2019-12-25 22:26:40 +01:00
defnax
54d0d8ab8b Added new Card View for Posted 2019-12-25 17:16:58 +01:00
csoler
5afa2a1e07
Merge pull request #1740 from defnax/Added-new-rich-text-editor 
Added new rich text editor & redesigned Posted Composer
 2019-12-24 12:07:54 +01:00
csoler
f45a04b3d5
fixed key list not properly updating when importing new key in GenCertDialog, and improved tooltips 2019-12-24 11:48:50 +01:00
hunbernd
e8bdce6e23 Fix sticker button disabled on distant chat 2019-12-24 00:14:38 +01:00
hunbernd
33236aeca3 Merge branch 'upstream' into feature/stickers-upgrade 2019-12-23 23:54:55 +01:00
defnax
824fc5049b update the licence & added the changes for Channel message composer 2019-12-23 21:26:54 +01:00
csoler
1d9dc657fd
removed some debug info 2019-12-22 22:29:14 +01:00
csoler
71149935f9
fixed path issue in calling webui from rs-gui 2019-12-21 18:11:43 +01:00
csoler
8f80db07c5
removed debug output 2019-12-21 14:44:16 +01:00
csoler
137cb5271d
fixed feed bug by moving away from std::string as a return type to uniqueIdentifier(). Now uint64_ hash is used and cached 2019-12-21 14:33:53 +01:00
csoler
11bc7a886a
fixed cmpilation error, where impossible case is not handled 2019-12-21 11:14:37 +01:00
csoler
ff86d3cd20
removed dangerous mItems map from RSFeedWidget, replacing the search by data-based search 2019-12-19 23:34:10 +01:00
csoler
856d1b62a7
moved to QueuedConnection to update the feed count 2019-12-19 21:04:18 +01:00
defnax
47678b33a4 Added new rich text editor & improved design for Create Post 
* Added new Rich Text Editor
* Redesigned the Create Post Composer for Posted Links
* When only link is added display different thumbnail
 2019-12-19 19:05:13 +01:00
csoler
3d7ae59df7
changed enum to enum class and made names globally more consistent for RsEvents 2019-12-17 21:41:21 +01:00
csoler
639db4519b
added notification to count feed items 2019-12-17 15:11:37 +01:00
csoler
c348366eef
added notifications for channel posts 2019-12-16 23:52:09 +01:00
csoler
a54cf981a6
fixed forum/channel subscribe notifications 2019-12-16 22:44:37 +01:00
csoler
301874e756
fixed output of IP in PeerItem 2019-12-16 21:09:53 +01:00
csoler
459ddc8883
fixed bug caused by comparing temporary object output of uniqueIdentifier() method to another string 2019-12-15 18:40:42 +01:00
csoler
11c520d280
replaced QString output of uniqueIdentifier() in feedItem classes by a std::string because QString caused random crashes 2019-12-15 16:46:22 +01:00
csoler
da6e7f9e9b
fixed conflicts with master 2019-12-14 18:27:41 +01:00
csoler
8d121a1038
fixed accepting connection attempts from unknown peers using short invite system 2019-12-14 18:24:46 +01:00
csoler
536c0852d4
fixed compilation 2019-12-13 23:58:17 +01:00
csoler
3a3fc25205
finished removing last AddFeedItem from msg, posted, forums and channels 2019-12-13 23:40:21 +01:00
csoler
4fe6e46410
added handling of channel, forum and posted events in GUI 2019-12-12 21:23:42 +01:00
csoler
eef5a5a8ef
added new events for circles 2019-12-12 00:00:51 +01:00
defnax
f088b8e2af improved Topics details view 2019-12-11 13:54:26 +01:00
csoler
27793627e3
moved GxsChanges to rsEvents 2019-12-09 22:19:03 +01:00
defnax
d6b67bc41b updated authors & website links & on channel files view to move Download/Status button to the middle 2019-12-09 21:13:51 +01:00
csoler
e402630095
attempt to fix thread race between rsEvents and TokenQueue 2019-12-08 21:34:52 +01:00
csoler
b6ca07aaa3
fixed bug caused by accessing Settings from non Qt thread 2019-12-07 22:26:26 +01:00
csoler
f118b4656e
moved more peer connection notifications to rsEvents 2019-12-07 21:43:28 +01:00
defnax
6692b2be49 improved Node page look & feel 2019-12-07 16:39:00 +01:00
csoler
9790b98605
fixed "connexion refused by peer" message 2019-12-06 22:45:33 +01:00
csoler
d152d9f50c
fixed proper async call of forceUpdateDisplay() 2019-12-06 22:19:49 +01:00
csoler
bb10b82c8e
moved refused connect attempt event to RsAuthSslConnectionAuthentication 2019-12-05 23:43:38 +01:00
csoler
c48aff44b2
removed set/get CurrentConnectionAttemptInfo because it was both prone to error and useless 2019-12-05 22:12:36 +01:00
csoler
324e7e802e
fixed not display of remove button 2019-12-04 23:40:33 +01:00
defnax
d2ae01ab50 update some icons 2019-12-04 21:49:59 +01:00
defnax
fd04d386ce Added to display the created time to display & feed ui fixes 2019-12-03 23:59:40 +01:00
csoler
b85be7cc8e
simplified the addIfUnique mechanism in NewsFeed by using a data-based identifier for items 2019-12-03 22:30:13 +01:00
csoler
fcbecbaa16
fixed errors reported by review of PR1735 2019-12-03 21:28:44 +01:00
csoler
31968f82f2
fixed a few typos 2019-12-02 22:34:14 +01:00
csoler
65fa54c206
using new notification system for connection attempts 2019-12-02 20:53:51 +01:00
csoler
d8569d813c
switched security items to new notification system 2019-12-01 22:35:16 +01:00
csoler
f5d32a8a9c
fixed compilation due to get_version not found in restbed 2019-12-01 16:59:40 +01:00
csoler
6df71ef5f6
fixed compilation 2019-11-27 23:45:18 +01:00
Gioacchino Mazzurco
c73bdb83cd
Drop libresapi and modules that depends on it 
A copy of the repository freezed before this deletion to ease old code
  viewing is available at
  https://github.com/RetroShare/zz_archive_RetroShare_libresapi
Removed some more cruft
Temporarly disabled JSON API generation of RsWebUi methods due to
  compilation breakage when rs_webui is disabled, RsWebUi keeps working
  but cannot be restarted from JSON API
 2019-11-27 23:32:38 +01:00
csoler
9a24af87a4
Moved #ifdef RS_WEBUI inside RS_JSONAPI ifdefs so that the webui files cannot be requested unless jsonapi files are compiled 2019-11-27 21:14:20 +01:00
Gioacchino Mazzurco
5fae53d65c
Merge branch 'v0.6-WebUI' 2019-11-27 19:19:29 +01:00
Gioacchino Mazzurco
1d4ca64dee
Prepare for merging 2019-11-27 18:44:10 +01:00
csoler
b3dddd117b
Merge pull request #1718 from defnax/Update-the-news-Feed-items-&-removed-the-default-old-stylesheets 
Update the news feed items & removed the default old stylesheets
 2019-11-26 22:07:30 +01:00
csoler
3834939eae
fixed size problem in channel feed items 2019-11-26 21:00:17 +01:00
defnax
01c5c270a7 Removed the old stylsheets from the news feeds & update the icons 2019-11-26 15:32:49 +01:00
csoler
7aa51423a4
fixes required by review of pr1700 2019-11-25 22:16:32 +01:00
csoler
4a257614f1
merged with upstream/master 2019-11-24 18:38:50 +01:00
defnax
13b8fe77f9 Improved Circle Feed Item 2019-11-24 17:32:51 +01:00
defnax
9381cab3b1 fixing the icon file & changed broadcast tab icon 2019-11-24 06:17:55 +01:00
defnax
ca047d1bee changed to some new icons 2019-11-24 06:04:10 +01:00
defnax
826027bc04 fixed the default stylesheet for the chat widget title bar frame 2019-11-23 23:59:50 +01:00
defnax
ad02c4c91e fixed text of the tabwidget for retroshare id 2019-11-23 23:09:39 +01:00
csoler
d1a9f839a4
fixed restart of webui 2019-11-23 18:40:31 +01:00
csoler
b8b7d103e1
fixed compilation by modifying wrappers to account for the shared_ptr mService 2019-11-23 15:11:22 +01:00
csoler
583f9db3b5
Merge pull request #1707 from defnax/added-message-length-check-for-Channels 
Added message length check for channels
 2019-11-23 09:56:22 +01:00
defnax
cdc12c03a4 Remove fixed size issues with the invite/leave buttons on dark stylesheets 
Removed fixed size issues with  the invite/leave buttons on dark stylesheets
Added new context menu icons for Enter & join Chat rooms
 2019-11-23 00:25:52 +01:00
defnax
c22524d5d1 updated tray menu icons 2019-11-22 13:58:25 +01:00
defnax
bbee5690a8 Fixed Settings Button on the Chat Widget for the darkstyles 2019-11-20 22:07:44 +01:00
csoler
09ba897c60
Merge pull request #1686 from defnax/changes-for-connect-friend-wizard 
Changes for connect friend wizard
 2019-11-18 20:39:42 +01:00
defnax
836a872fd6 Added for Channel Messages to checkt the length 2019-11-18 18:52:27 +01:00