Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-15 02:44:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
9,042 Commits 63 Branches 22 Tags 195 MiB
ccd72cb827
Commit Graph

4971 Commits

Author SHA1 Message Date
csoler
a065dba8f8 cleaned code a little bit 2016-03-12 11:05:03 -05:00
csoler
61c7da7e2d unselect all IDs when no circle is selected 2016-03-12 11:02:32 -05:00
csoler
456a882343 added highlighting of currently selected circle members 2016-03-12 10:41:35 -05:00
csoler
670fb3d1eb merged 2016-03-12 09:25:00 -05:00
Phenom
16c59af9f4 Correct Colored Name Contrast in chat, same way than text. 2016-03-12 13:25:10 +01:00
csoler
b97c5df581 fixed culumn name in GR stats 2016-03-11 17:47:12 -05:00
Cyril Soler
ecebaced23 Merge pull request #301 from PhenomRetroShare/Add_NewColumnInRsCollForPath 
Add a new column in RsColl Editor to get only name in first one.
 2016-03-11 14:26:27 -05:00
Phenom
d62a20547d Fix Paste RetroShare Link action when copy File link. 2016-03-11 20:08:28 +01:00
Phenom
7e76e28af7 Add a new column in RsColl Editor to get only name in first one. 2016-03-11 17:26:18 +01:00
csoler
4e4980ba0e fixed display of info for non admin circles, and added readonly system to not allow editing them 2016-03-10 22:57:04 -05:00
csoler
0282c2aeb3 added ban menu entry to chat lobby participant list 2016-03-09 21:49:24 -05:00
csoler
3fc6f6b2db updated TODO(circles), removed useless context menu, added tooltips for circle distribution options 2016-03-09 20:53:49 -05:00
csoler
7e31bdafcf fixed removal of peers from circles 2016-03-08 23:00:24 -05:00
csoler
cba4795911 improved circles GUI logic 2016-03-08 00:02:16 -05:00
csoler
9b92f66c61 added edit of existing circles 2016-03-07 22:51:23 -05:00
csoler
9ddef9e45b merged with upstream/master 2016-02-25 17:48:59 -05:00
defnax
7b1460c4c9 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2016-02-24 21:45:43 +01:00
Phenom
e639dc57ce Fix connect for avatar updateAvatar in ChatMsgItem and MessengerWindow. 
As it is already connected in AvatarWidget's constructor.
 2016-02-18 11:48:58 +01:00
Phenom
dc2578b528 Fix "(EE) cannot update avatar. mId has unhandled type." error. 
Error was raised because event pass trought all widgets.
 2016-02-17 18:18:56 +01:00
Phenom
3276790bf8 Add minimal Size for stackPages in MainWindow for first start. 2016-02-16 23:15:33 +01:00
Cyril Soler
efadc7d2c6 Merge pull request #270 from PhenomRetroShare/Fix_GxsChannelFilterWhenLoading 
Fix Channel filter when loading big post.
 2016-02-14 13:38:08 -05:00
electron128
821c14426c remove dead code from RsNotify (old forum and channel read status changed notify) 2016-02-14 12:48:52 +01:00
electron128
63a8260cb9 change RsNotify to use RsGxsId for chat lobby events 2016-02-14 11:53:27 +01:00
defnax
abf7a72ce8 increase default font size for the ListWidget. 2016-02-13 17:38:01 +01:00
defnax
8637d3cb31 Fixed issue #263 2016-02-13 16:15:41 +01:00
Phenom
3ebb8c6ce8 Fix GenCertDialog on Mac stay on. 
Only call processEvent() if hasPendingEvents().
If no events are available, this function will wait until more are
available and return after processing newly available events.
 2016-02-12 17:54:35 +01:00
csoler
71071595c8 called re-loading of circles after creation. Added debug info in msg vetting 2016-02-11 21:59:45 -05:00
csoler
de66a2343c fixed ui file for IdDialog 2016-02-10 18:37:17 -05:00
csoler
3db3ccf636 merged with upstream 2016-02-10 00:00:21 -05:00
Phenom
5f0afb3d6e Fix Channel filter when loading big post. 
And fix "Not a GxsChannelPostItem, deleting!" error message

Don't search empty text in very long string.
 2016-02-08 19:42:56 +01:00
csoler
4a8edee615 reverted commits 1843a5460d and 48d7c57662 for the release, since they dont fit the GUI style and cause problems, until they are made right 2016-02-06 12:01:39 -05:00
thunder2
ccf96a35c3 Updated languages from Transifex 2016-02-05 20:04:46 +01:00
defnax
80ac88994f Merge pull request #265 from PhenomRetroShare/Add_SaveOpMode 
Save last state of OpMode status bar droplist and restore it at start.
 2016-02-04 20:11:47 +01:00
thunder2
b46e2a9aa2 Updated english translation 2016-02-04 12:07:43 +01:00
csoler
c6bb23aff7 updated french text, and improved message in IdDialog 2016-02-03 21:20:16 -05:00
Phenom
1843a5460d Add colored style sheet to OpModeStatus ComboBox. 2016-02-03 18:00:01 +01:00
Phenom
48d7c57662 Save last state of OpMode status bar droplist and restore it at start. 2016-02-03 18:00:01 +01:00
csoler
464e89b766 updated french translation (unfinished) 2016-02-02 23:13:07 -05:00
csoler
26744d552a worked a bit on the french translation 2016-02-02 22:50:59 -05:00
thunder2
ca8eee50d6 Updated english translation 2016-02-02 19:36:35 +01:00
csoler
aa194caea3 fixed bug preventing save of routage info in distant messaging 2016-01-31 20:27:53 -05:00
csoler
f0a49a427e changed global router routing strategy. Should be more effective now. 2016-01-30 20:27:56 -05:00
csoler
58e59d1181 added sounds to chat lobbies (patch fromManuel Davis) 2016-01-28 20:19:44 -05:00
thunder2
8dde723e90 Added security hardening flags for ASLR and DEP protection for Windows compile. 2016-01-28 19:02:42 +01:00
Cyril Soler
b1f165fec8 added sound event to lobbies (patch from Manuel Davis) 2016-01-28 10:22:32 -05:00
csoler
3bc444b087 removed some debug info 2016-01-26 23:00:10 -05:00
csoler
af770fda9c fixed messagebox to remember which from ID was used last time 2016-01-26 22:46:07 -05:00
csoler
749ca08f9f slightly improved message shown over lobby names 2016-01-26 22:30:04 -05:00
csoler
f063e5ba6f Allow main window to resize to much smaller size when needed. Should help people with small screens to resize RS window appropriately (patch from Manuel Davis) 2016-01-26 22:16:45 -05:00
Phenom
1d2be232f0 Fix Quote Lines With Image 
When get text with image from toPlainText(), a (-4) char is inserted.
 2016-01-23 18:38:30 +01:00
defnax
70bf938654 reduced the default width & height 
reorder in MessagePage, move Distant Message box to the top.
 2016-01-23 13:37:08 +01:00
csoler
fc0067f980 fixed bug in network graph search sizes 2016-01-22 22:06:31 -05:00
csoler
c428739abd cleaned the network graph a little bit. Removed text, updated bounding boxes, removed background 2016-01-22 21:32:35 -05:00
Cyril Soler
b3625448e9 fixed compilation 2016-01-22 09:31:40 -05:00
csoler
b3df4c19dc made the Global router stats widget more efficient/compact/explicit 2016-01-21 23:55:22 -05:00
csoler
449aba928a fixed compilation of SearchDialog.cpp 2016-01-21 22:44:48 -05:00
csoler
94b586846e moved SearchDialog into FileTransfer/ 2016-01-21 21:49:52 -05:00
csoler
6a32da2420 removed explicit size constraint on listview for config page (screws up the view in HDPI screens) to let the list take its preferred size 2016-01-21 21:40:48 -05:00
Cyril Soler
9347b86e63 new simple solution for sound on linux based on using system sound player. To be tested. 2016-01-21 11:48:41 -05:00
Cyril Soler
9999742ec7 reverted commit for phonon since phonon is deprecated. Will be replaced by qtmultimedia in the next commit 2016-01-21 11:32:17 -05:00
csoler
e25787bcd5 fixed sound on linux using phonon. This should be extensible to all unix systems 2016-01-20 23:25:08 -05:00
Cyril Soler
fc3606c18e fixed DHT icon size problem 2016-01-20 14:02:13 -05:00
Cyril Soler
9063612c33 fixed utf8 issue in ChatWidget. To be tested. 2016-01-20 11:19:36 -05:00
csoler
c597c8cb6f removed explicit spacing sizes in plugins page 2016-01-19 23:19:46 -05:00
csoler
3203249bd2 fixed size of help icons in MainPage class 2016-01-19 22:59:11 -05:00
csoler
597f541c50 added 2 icons 2016-01-19 22:44:27 -05:00
csoler
3d58f9b2b1 added correct icons in ToasterStatus 2016-01-19 22:35:58 -05:00
csoler
b382c3e846 fixed icon sizes in peerstatus/statusbar 2016-01-19 22:16:25 -05:00
csoler
a2d8cc84fd fixed DHT status icon sizes and added tooltip 2016-01-19 22:01:26 -05:00
csoler
37204d768e fixed icon in NewsFeed, added missing spacer in IdDialog 2016-01-19 21:46:22 -05:00
csoler
1471979e0e added a few tooltips in Tor configuration panel 2016-01-19 18:08:47 -05:00
csoler
39e6a9b61a fixed up People context menu so as to handle actions for multiple persons at once 2016-01-16 20:44:52 -05:00
csoler
8296fa9f22 added checkbox to toggle logscale in statistics 2016-01-16 11:30:15 -05:00
defnax
63b88ecf68 correct sorting for "Reputation" in People, patch by Eugene Tooms 2016-01-16 14:50:12 +01:00
csoler
36241eed8c fixed merge 2016-01-13 23:08:14 -05:00
csoler
fd04f0b3bb updated to upstream/master 2016-01-13 20:27:08 -05:00
csoler
2c019d984f added load image option in forum posts when images are to be displayed 2016-01-13 00:39:22 -05:00
csoler
2a8fc7fe01 hardened the restriction to image loading to avoid external resources in RSTextBrowser 2016-01-13 00:08:27 -05:00
csoler
d55993d1e4 removed two instances of malloc(0) captured by new rs_malloc funtion 2016-01-12 21:43:04 -05:00
csoler
d13526facd added a new method rs_malloc that checks its arguments and prints a stacktrace on error/weird call. Changed the code everywhere to use this instead of malloc. Removed some mallocs and replaced with RsTemporaryMemory 2016-01-12 21:10:11 -05:00
electron128
09ed1ea22c removed getVirtualPeerId method from rsmsgs lobby interface. 
It is not neccesary anymore to have the virtual peer id exposed to the GUI layer.
 2016-01-10 14:22:06 +01:00
electron128
67e1495d9a use ChatId instead of virtual peer id for chat lobby popup. Removed a now unused method from rsmsgs interface and DistributedChatService. 2016-01-10 13:29:40 +01:00
csoler
c3d422ac86 added some tooltips on keys and certificate details 2016-01-09 15:05:02 -05:00
electron128
b125cb1f1e fix the bug where a filter is applied in friends file list even if view mode is tree and search box is hidden. Problem was: SharedFilesDialog::FilterItems() is called from multiple places. The check if we should filter or not is now in the filter function itself. 2016-01-09 12:09:43 +01:00
electron128
a118870db9 if file in friends file list is available locally or is being downloaded, then show it in red like in search. 
The color is hardcoded, because it is not possible to style arbitrary QObjects with stylesheets.
closes #195
 2016-01-09 12:01:32 +01:00
Cyril Soler
56a844b58d Merge pull request #243 from csoler/v0.6-Messaging 
V0.6 messaging
 2016-01-08 23:08:14 -05:00
csoler
a540ffd9a2 removed two debug outputs from MessageDialog 2016-01-08 22:52:01 -05:00
csoler
75edb46c99 added auto-resend of unsent messages. Fixed display of From field in outbox 2016-01-08 20:48:47 -05:00
defnax
81e2a597e9 Fixing People Margins 
Update emotes file
 2016-01-07 19:25:52 +01:00
csoler
61f8e73c36 improved text of warning against pasting pgp keys in connect wizard 2016-01-06 18:12:15 -05:00
csoler
984ce2d3ad removed circles tab from IdDialog. Came from a difficult manual merging between dos and unix encoded files 2016-01-06 18:07:20 -05:00
Cyril Soler
141f0927e3 added tooltip and fixed text in connect friend dialog 2016-01-05 14:22:38 -05:00
defnax
19011ba002 clean up emotes, removed some unused. 
changed icons for emotes button.
reduze the size of the emoticons
 2016-01-05 18:23:43 +01:00
sehraf
54f9912c32 Add whitespaces around smileys. 
Only replace smileys with an image when they are surrounded by whitespaces.
This fixes smileys in links and other text that happen to include the sequence for a smiley.
 2016-01-05 15:01:22 +01:00
Phenom
c5e6f62382 Make Plugin working in Mac OSX. 2016-01-02 14:19:53 +01:00
csoler
b6b5f9cd17 fixed some of the issues reported by coverity scan (mainly uninitialised class members) 2016-01-01 22:36:07 -05:00
csoler
8ec0e10019 updated v0.6-Circles with latest trunk 2016-01-01 22:18:43 -05:00
csoler
9da8a8abc3 fixed compilation of RsNxsTransaction encryption code 2016-01-01 21:37:27 -05:00
csoler
6ecd2991e7 merged with latest trunk 2016-01-01 15:15:19 -05:00
electron128
3b2eae4f49 fixed memory leak by using stack memory instead of heap memory 2016-01-01 12:17:08 +01:00
electron128
72812be7be added missing initialisation of integers in GxsForumThreadWidget 2016-01-01 11:54:59 +01:00
csoler
6392d657aa fixed [dos] LF in IdDialog.h 2015-12-31 16:50:52 -05:00
defnax
37a3c46173 Fixing Margins 2015-12-31 16:40:06 +01:00
electron128
69f6bd0ea9 insert the newest channel posts first and the oldest last (modified patch from Eugene Tooms) 2015-12-31 14:02:51 +01:00
Cyril Soler
eab4253437 Merge pull request #224 from PhenomRetroShare/Fix_GenCertDialogMaskingPGPKeyPassword 
Fix GenCertDialog masking PGP Key password dialog at end.
 2015-12-28 18:15:51 -05:00
defnax
312cea7481 Fixed double selection bug on Windows Vista style 2015-12-28 16:42:42 +01:00
Phenom
c1b88500e0 Fix GenCertDialog masking PGP Key password dialog at end. 
Sometimes, at end, when creating new key, the dialog stay behind.
 2015-12-28 13:45:58 +01:00
Cyril Soler
00517fe68d Merge pull request #223 from csoler/v0.6-ContactList 
V0.6 contact list
 2015-12-27 22:22:51 -05:00
csoler
9dfac71822 connected GUI to distant chat permission flags system 2015-12-27 21:10:20 -05:00
csoler
b32eb6e0c8 added temporal filtering to RSGraphWidget to clear up the display. Auto-changes with scale. Can be changed manually with shift+wheel 2015-12-27 17:00:54 -05:00
defnax
a63482d642 Expand All/Contacts items by default & store/load expand settings. 2015-12-27 19:14:20 +01:00
Phenom
162b5fa2eb Fix colored font in chat. 
Colored styles were replaced by emoticons.
 2015-12-26 15:57:46 +01:00
csoler
140205108a added backend for distant message and distant chat filtering based on contact list 2015-12-25 22:37:06 -05:00
defnax
f5c2aa31e3 update emotes 2015-12-25 17:23:15 +01:00
defnax
7afcc2a91e Enabled back counting People 
Enabled "Sort by Posts" for Channels/Forums/Posted
Fixed Width/Height of Message Composer
Moved Chat Settings Page order.
 2015-12-24 17:46:02 +01:00
defnax
12c919491c Added Send Invite Button to People Dialog. 2015-12-24 14:31:52 +01:00
Cyril Soler
f30f71db8e Merge pull request #218 from csoler/v0.6-ContactList 
V0.6 contact list
 2015-12-23 18:07:10 -05:00
csoler
73f58c79f4 improved layout and namign in MessageComposer 2015-12-23 13:48:56 -05:00
csoler
4c50641700 cosmetic change in IdDialog 2015-12-23 12:12:34 -05:00
csoler
52da8cd0e6 fixed display of contactlist when changing status, and improved computaitonal efficiency 2015-12-23 12:08:20 -05:00
defnax
15a7487c27 Save sorting on Chat lobby 2015-12-23 16:55:23 +01:00
defnax
b1ce2faa28 Merge pull request #214 from PhenomRetroShare/Fix_MacOSX.X_Compilation 
Fix MacOSX 10.10 Yosemite Compilation
 2015-12-23 14:08:01 +01:00
csoler
5d9272055f merged with upstream/master 2015-12-22 18:33:01 -05:00
csoler
ab763c7a8a converted file to unix mode 2015-12-22 18:29:27 -05:00
defnax
95d8647a7e Optimized the emoticon selector box size based on how many emoticons are loaded (by anmo), update emotes.acs 2015-12-22 19:57:26 +01:00
Phenom
86b559191e Fix MacOSX 10.10 Yosemite Compilation 
by using retroshare.pri file like linux or windows,
 fixing namespace for unordered_set,
 fixing c++11 for ostream& operator<<,
 checking if ntohll and htonll already defined.
 2015-12-22 17:27:51 +01:00
defnax
334b414335 cleaning up resource file for emojione, removed old smileys 2015-12-22 17:24:12 +01:00
defnax
8e9fe6d800 Merge pull request #189 from hunbernd/feature/chat-enhancements 
Chat enhancements
 2015-12-22 01:07:02 +01:00
defnax
4ccab411c0 Added new Emojione Emoticons 2015-12-21 22:27:10 +01:00
hunbernd
33b3eb7284 /me style is defined in chat styles 2015-12-21 01:21:04 +01:00
hunbernd
77804bbf16 Remove location from user name when using /me 2015-12-20 21:31:45 +01:00
defnax
03896d7f8c Added Sorting Menu entry. 2015-12-18 01:40:39 +01:00
defnax
42bf9962a2 Sort lobby Parcipants by activity 
Set spacing between items
 2015-12-15 20:20:11 +01:00
defnax
e824a2faea update file extensions, patch by Agurer 2015-12-14 16:32:00 +01:00
hunbernd
e2c40d6693 Greentext color is defined in stylesheet, and can be overridden with qss files 2015-12-13 02:01:06 +01:00
hunbernd
bc4691ceb4 Show save image option only when it is needed 2015-12-12 22:41:15 +01:00
csoler
fc94cf2c2d added latest update to IdDialog from defnax 2015-12-11 23:49:35 -05:00
defnax
4724007c65 Changed Context Menu order issue: #187 2015-12-07 17:11:25 +01:00
hunbernd
bbebd6a5d7 Fix compilation bug with Qt4 caused by Q_DECL_OVERRIDE 2015-12-07 02:49:56 +01:00
hunbernd
5a8f74ce99 Spoiler feature 
Select text to hide, then right click --> Spoiler
 2015-12-07 02:28:27 +01:00
hunbernd
cdda411c79 /me 
TODO: allow customizing the style
 2015-12-07 01:21:16 +01:00
hunbernd
1da28aff90 Added custom context menu and save image option into forums 2015-12-06 23:01:23 +01:00
hunbernd
ff44965e2c Added save image function into chat 2015-12-06 23:00:29 +01:00
hunbernd
0b92c79eb0 Quote function on chat 
select text --> right click --> Quote
 2015-12-06 21:44:53 +01:00
hunbernd
0aa82c852b Fixed line duplication bug again 2015-12-06 21:22:03 +01:00
hunbernd
1dd0a2acd1 >greentext 2015-12-06 21:11:47 +01:00
csoler
11fb0bacc8 fixed missing code in previous merge 2015-12-05 17:25:55 -05:00
csoler
0c1e6301b3 merged with latest upstream trunk 2015-12-05 16:49:00 -05:00
electron128
7cd880e1e4 removed member gxs_id from ChatId class, because ChatId now uses tunnel ids stored in distant_chat_id for distant chat. 
reverted naming confusion in in libresapi ChatHandler and fixed author of distant chat messages (distant chat is still unfinished)
 2015-12-05 17:00:57 +01:00
Cyril Soler
0ac76d621e Merge pull request #188 from csoler/v0.6-SecuredTunnelService 
V0.6 secured tunnel service. Please reports bugs to me (I have tested with valgrind and as many configurations as possible, but the multi-service gathering into GXS tunnels shared for each GXS id pair is not a totally simple thing, so I expect to have missed a few issues).
 2015-12-05 10:28:16 -05:00