5021 Commits

Author	SHA1	Message	Date
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
pztrn	8fe9e9e791	Make sure that version_detail.sh script always: ... * Uses proper directory name for source files. This approach should be portable, I think. * Always uses LANG=C for obtaining data, because in non-US environments it will not capture branch name, for example.	2015-12-14 22:10:04 +05: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
csoler	325956e8ed	renamed flag for messaging permissions to a more appropriate name	2015-12-04 23:15:52 -05:00
csoler	be17a563d1	fixed compilation and added flag function for permissions in messaging	2015-12-04 23:08:49 -05:00
csoler	39f4878244	incorporated changed from defnax	2015-12-04 22:42:56 -05:00
Cyril Soler	2a82ef543c	Merge pull request #186 from realityfabric/minor_edits ... fixed spelling errors in several files	2015-12-04 21:43:35 -05:00
csoler	9193d3579b	merged with latest master before creating PR	2015-12-04 21:24:51 -05:00
defnax	d2a99786ac	Fixed Qt5 Fusion stylesheet on MessageComposer	2015-12-04 19:56:56 +01:00
csoler	318be3a2ad	fixed a few bugs in distant chat: disabled history (for now), improved tunnel handling	2015-12-04 00:06:14 -05:00
csoler	b198f1a007	fixed some cleaning of remotely closed tunnels in GxsTunnelService	2015-12-03 00:34:13 -05:00
realityfabric	9f561993ee	fixed spelling errors in several files	2015-12-02 06:18:17 -08:00
csoler	81b196d38d	added GUI to display authenticated tunnel info. Added counting of data sent/recvd.	2015-12-01 23:40:35 -05:00
csoler	60d948b509	added void GUI for authenticated tunnels	2015-11-30 21:52:15 -05:00
csoler	81ab43beb9	fixed GUI update of avatars and status for distant chat. Updated backend for new model. Fixed a few bugs in serialisation	2015-11-30 00:02:44 -05:00
csoler	a29f15ae32	fixed compilation, added missing methods for new distant chat	2015-11-28 14:55:56 -05:00
csoler	a2e0f4196b	updated GUI for new distant chat	2015-11-26 20:40:06 -05:00
csoler	bca89c63c6	fixed serialisation bug and added new GUI bits	2015-11-25 18:08:53 -05:00
Ivan Lucas	e8173bdaec	Improve some of the wording of labels and information	2015-11-25 10:33:28 +00:00
defnax	397729bd93	Added to count downloads/uploads items ... Enabled to get copy the DHT label values via mouse Added counting on DHT Window & added context menu for DHT Tree, to copy IP addresses to clipboard	2015-11-24 19:41:13 +01:00
Cyril Soler	b2470565c3	Merge pull request #179 from sirjenster/osx ... latest OSX patches.	2015-11-21 15:08:43 -05:00
defnax	c89ff9f059	Added nickname column to pending packets & context menu action to view details ... Fixed ui layout.	2015-11-21 13:47:50 +01:00
defnax	2e76cc6267	Fixed DHT icon	2015-11-21 12:32:55 +01:00
electron128	4b84767250	hide network mode selection in quick start wizard if node is a hidden node	2015-11-21 11:57:50 +01:00
Jenster	699299ae8a	latest OSX patches	2015-11-20 08:10:59 -08:00
csoler	1de55d8fc5	replaced the few bools in RsIdentityDetail by a set of flags	2015-11-19 21:14:32 -05:00
defnax	4dacd9a54d	Added Ban/Unban Context menu actions for People list.	2015-11-19 19:08:47 +01:00
defnax	5404cda302	Added Forum reply with plaintext quote (by anmo)	2015-11-19 12:05:52 +01:00
defnax	e3d12b8194	Disabled Fontmetrics on RemoteDirModel Columns, it causes unusable very small column height.	2015-11-18 21:24:38 +01:00
defnax	701f1ceb4a	Fixed counting thx to sehraf	2015-11-17 17:33:25 +01:00
defnax	01f3db70d3	Added to count identity items on People	2015-11-17 15:58:22 +01:00
Cyril Soler	17dc7c7dfc	Merge pull request #68 from chozabu/systray_tweaks ... add option to disable updates to systray tooltip	2015-11-16 23:56:37 -05:00
defnax	c6ad0d4b5c	Merge pull request #122 from PhenomRetroShare/Fix_PrioritySpeedMenuForDownloadFiles ... Fix priority Speed Menu for download file.	2015-11-08 01:07:59 +01:00
defnax	c41f98cb4c	Merge pull request #86 from PhenomRetroShare/Fix_Win7_32bCompilationFromScratch ... Fix Windows 7 32b Compilation from scratch.	2015-11-06 01:58:30 +01:00
Cyril Soler	75d462e818	Merge pull request #173 from mr-alice/master ... show or hide ID chooser in message box depending on destination of msg	2015-11-05 03:22:47 -05:00
mr-alice	93368aae61	show or hide ID chooser in message box depending on destination of message	2015-11-04 21:08:31 -05:00
defnax	3a2b5f1f07	calculate correct icon size for the status icon	2015-11-04 23:47:12 +01:00
defnax	2a998c1e71	Added new higher resolution bullet icons with better quality	2015-11-04 17:05:39 +01:00
csoler	2a5fe4debd	merge before push	2015-10-30 21:12:47 -04:00
csoler	1bc2892753	removed some debug info	2015-10-30 21:11:44 -04:00
defnax	6554362035	Fixed Layout	2015-10-30 15:51:13 +01:00
csoler	12acf6de35	fixed update of reputations display and used proper global score in id list	2015-10-29 23:31:23 -04:00
csoler	512c15c054	fixed edit/show checkbox state in GxsGroupDialog.	2015-10-29 22:58:21 -04:00
defnax	958956a112	Fixing layout & display on Details View anti spam fields	2015-10-29 17:20:32 +01:00
csoler	22fd4e4092	fixed bug causing signed lobby to refuse login on double click	2015-10-28 18:11:27 -04:00
csoler	459cbc6c8e	fixed bug causing forum posts to require PGP-signed ID on PGP-favored forums	2015-10-28 18:07:43 -04:00
Cyril Soler	04ead356e5	Merge pull request #163 from PhenomRetroShare/AddGxsIdInTextAnchor ... Add GXS Id in anchor in Chat.	2015-10-28 16:00:27 -04:00
Cyril Soler	5beb85215c	Merge pull request #164 from csoler/v0.6-SignedForums2 ... V0.6 signed forums2	2015-10-28 10:01:26 -04:00
Phenom	6df42a0b7d	Add GXS Id in anchor in Chat.	2015-10-28 07:20:17 +01:00
csoler	1471dbc8af	fixed tooltips for anti-spam forum features	2015-10-27 23:53:31 -04:00
csoler	a526a29a2b	added missing flag check for anti-spam feature display	2015-10-27 23:40:18 -04:00
csoler	79c80c968a	fixed a few bugs in display of tracking info	2015-10-27 22:41:29 -04:00
defnax	eefc8d3393	Fixed Tooltip on Outbox #121 ... Store Max Results spinbox #130	2015-10-28 01:59:19 +01:00
csoler	206b27a262	minor bugfix in msg tracking	2015-10-26 23:55:34 -04:00
csoler	c7d0e4cb35	enabled ID tracking forums. Fixed thresholds for anti-spam forums. Changed computation of reputation scored	2015-10-26 23:38:10 -04:00
csoler	f24bddf6f1	merged with upstream head	2015-10-25 20:42:41 -04:00
csoler	fee449bca4	added proper UI for setting anti-spam flags in GroupCreationDialog	2015-10-25 19:28:13 -04:00
csoler	47dd70fbe8	added non selective tracking for GXS messages	2015-10-25 17:26:34 -04:00
electron128	b340d8a37e	Hide about button and add better description for unloaded plugins	2015-10-25 11:49:44 +01:00
defnax	b717d601f4	Added default Email Client Button to Web Mail Page	2015-10-25 00:54:22 +02:00
csoler	8ea97711e8	added new flag to GxsIdChooser to force non anonymous ids. Disabled by default	2015-10-24 12:48:17 -04:00
defnax	b501d91f21	Added Invite page for Web Mail Providers (Connect Friend Wizard) ... Added select page style for Quick Start Wizard.	2015-10-24 17:05:12 +02:00
csoler	febd348d24	added GUI support for non anon forums. Changed serialisation of GxsGroupMetaData so that mSignFlags is serialised in place of mAuthenFlag, which is not used anyway	2015-10-24 00:22:55 -04:00
csoler	a6851b63dc	renamed old flags into indices in rsgenexchange.cc. Fixed up duplicate constants between GxsGroupDialog and rsgxsflags.h	2015-10-23 22:53:00 -04:00
Cyril Soler	463ebe7a7c	Merge pull request #154 from sehraf/pr-lobby-time ... mark chat participants as inactive as long as no activity was seen an…	2015-10-21 18:47:22 -04:00
sehraf	164c7265aa	suggestion from cyril	2015-10-21 22:40:49 +02:00
defnax	bcfb3be460	Hide some Labels on Hidden Mode	2015-10-21 22:39:48 +02:00
sehraf	c06118904e	mark chat participants as inactive as long as no activity was seen and reduce time to inactivity from 30 min to 10 min (patches #67)	2015-10-21 22:18:43 +02:00
defnax	aec42a8e1f	Improved Network Settings Layout, better look and order	2015-10-21 04:16:20 +02:00
csoler	6f3ba57314	fixed up default sizes for list icons and main page icons for high DPI screens	2015-10-20 22:00:15 -04:00
Sergei Reznikov	34758be52a	Add Haiku support	2015-10-20 20:32:44 +03:00
Phenom	79d761ae2e	Add Win32 section in retroshare.pri ... And add MSys2 directories.	2015-10-17 12:15:36 +02:00
Phenom	625461bf69	Fix Windows 7 32b Compilation from scratch. ... Add scripts to build Libs on branch.	2015-10-17 12:15:35 +02:00
defnax	febea809b1	Fixed Reputation display, and set text Alignment.	2015-10-17 02:23:46 +02:00
Phenom	0cadfef3d3	Fix priority Speed Menu for download file. ... Not only downloading file can be setted.	2015-10-15 18:34:56 +02:00
defnax	66670315dc	Moved to display pending packets on a QTreeWidget. ... Fixed People layout/spacing & display votes column.	2015-10-15 02:14:52 +02:00
csoler	441b164c73	fixed small bugs in average friend reputation display	2015-10-13 21:54:52 -04:00
Phenom	245a2826c6	Fix centered Typing Label on ChatWidget.	2015-10-13 20:11:30 +02:00
defnax	791f5fe886	Fixed ID Details Dialog with Reputation	2015-10-13 02:18:41 +02:00
csoler	71c8dfdc58	manual merge before creating a conflict-free PR	2015-10-12 14:45:11 -04:00
csoler	e6bb3073bd	added update for forum messages list when an author gets banned	2015-10-12 14:04:23 -04:00
csoler	7dc59845e9	added update for forum messages list when an author gets banned	2015-10-12 14:03:53 -04:00
csoler	86b47d818b	reduced icon size a little bit in GxsTreeWidgetItem	2015-10-12 10:58:24 -04:00
csoler	5a3756f058	fixed bug on reputation cutoff. Updated tooltips	2015-10-12 10:41:48 -04:00
csoler	82c16c6a27	fixed GUI tooltips over banned items. Added dropping of messages from banned identities in chat lobbies	2015-10-11 22:08:19 -04:00
csoler	1a76bea6ff	enabled bannign button in forums, and disable message passing for banned users	2015-10-11 21:41:35 -04:00
csoler	e309dd6fed	fixed banning users from forum threads	2015-10-11 10:00:11 -04:00
csoler	f750818402	added proper icons and names for banned users	2015-10-10 21:25:06 -04:00
csoler	68ca57ce75	added removal of messages frm banned users	2015-10-10 18:27:15 -04:00
defnax	1a229ef817	Fixed to display GXS ID item with a better icon size	2015-10-10 14:16:12 +02:00
csoler	338fcee865	added button in forums to flag poster identity as bad	2015-10-09 18:51:16 -04:00
defnax	e97f23d91a	Improved icon size display on GroupTree.	2015-10-09 12:06:16 +02:00
csoler	8c6c9344fe	fixed a few bugs in reputation items serialisation code and GUI display	2015-10-08 23:02:34 -04:00
defnax	3cbf0f6657	Fixed Cert Display on Email Invite Page	2015-10-07 20:13:18 +02:00
defnax	95bdd7f0a7	Fixed ChatWidget Margin's ... Set Alignment for frame off's Video icon	2015-10-07 01:35:31 +02:00
Phenom	2b1d39cea1	Add HideChat Button. ... Change layout of video when text is hidden. Add toolbar in fullscreen.	2015-10-05 21:04:26 +02:00
Phenom	8a7e359557	Add a button on VOIP to hide text when video is on.	2015-10-05 21:04:26 +02:00
sehraf	6a570afb84	disable sorting while editing network view	2015-10-05 09:26:36 +02:00
csoler	317e7ea5ab	added some backend for reputation system	2015-10-04 23:14:49 -04:00
csoler	c17dddb79c	updated GUI for reputation	2015-10-04 17:47:30 -04:00
Phenom	64389e35d8	Fiw Delete key event in ChatWidget.	2015-10-03 11:00:16 +02:00
Cyril Soler	bd94fcd08e	Merge pull request #98 from PhenomRetroShare/AddMinimumFontSizeInChat ... Add minimum font size in chat.	2015-10-02 10:53:00 -04:00
sirjenster	68fd1b206e	First Mac/OSX compile fixes	2015-09-22 18:33:16 -07:00
thunder2	1d54630007	Fixed Windows compile.	2015-09-17 10:05:31 +02:00
Cyril Soler	66691d4f37	Merge pull request #108 from sehraf/i2p ... Adding I2P support to RS	2015-09-16 20:01:39 -04:00
sehraf	04abfad894	manually reverted changes by Qt Creator	2015-09-16 17:01:20 +02:00
sehraf	7c7e4f86dc	added ip addr. field to the add certificate dialog	2015-09-16 12:13:54 +02:00
sehraf	6202e83c32	add default case to gui instead of falling back to tor labeling	2015-09-16 11:48:32 +02:00
sehraf	d3d184f2eb	added simple step-by-step guide to add a I2P server tunnel	2015-09-16 11:09:04 +02:00
sehraf	e54358ac11	added simple step-by-step guide to add a I2P client tunnel	2015-09-16 10:55:33 +02:00
sehraf	8725aab180	gui fixes	2015-09-14 15:14:39 +02:00
sehraf	6b87c38951	small fixes	2015-09-14 14:56:14 +02:00
sehraf	6ec191944d	gui changes	2015-09-14 12:39:46 +02:00
sehraf	b0251e3806	generalized tooltips	2015-09-14 12:12:28 +02:00
Phenom	48e6618c8d	Send Mouse event to FriendList's item, since ElidedLabel was fixed.	2015-09-13 19:00:31 +02:00
Phenom	3f155b9b75	Add minimum font size in chat.	2015-09-13 17:35:19 +02:00
defnax	4116f4b5cc	Added Context menus for Edit Circle or Add/Remove Member ... Changed for OK Button renaming to Create (New Mode) or Update(Edit Mode)	2015-09-11 02:46:34 +02:00
defnax	cecaf31f7d	Clean up naming and added to display avatar icons.	2015-09-11 01:15:45 +02:00
defnax	b1527b608f	Improved layout better look & feel for Circles View ... Added activity column	2015-09-10 17:37:42 +02:00
Ivan Lucas	4880fc489b	Fixed grammar on add friend wizard by rewording slightly	2015-09-10 11:21:01 +01:00
Ivan Lucas	840e9306d6	Fix Spelling and Grammar	2015-09-10 10:29:15 +01:00
Ivan Lucas	770e9340b3	Merge remote-tracking branch 'upstream/master'	2015-09-10 10:18:14 +01:00
Phenom	ce9fc7b7b5	Fix ElidedLabel::mousePressEvent.	2015-09-09 22:37:38 +02:00
Ivan Lucas	75a7a89e8f	Fix typo	2015-09-09 15:19:17 +01:00
csoler	0769dabb2e	incorporated defnax changes	2015-09-08 22:40:35 -04:00
Ivan Lucas	a2e7e4de41	Fixed spelling/grammar	2015-09-08 16:12:50 +01:00
Ivan Lucas	4f8b098e94	Fixing spelling	2015-09-08 16:00:00 +01:00
Cyril Soler	da417eede9	Merge pull request #96 from AsamK/qmake_3 ... Qmake: Use PKGCONFIG and reduce duplicate code in .pro files	2015-09-07 20:38:47 -04:00
sehraf	03d99ae4af	made GenCertDislog more generic	2015-09-07 23:55:57 +02:00
defnax	e2768e0c87	Added last used field to Person Details Window	2015-09-07 23:34:39 +02:00
sehraf	fed43450ae	made server settings more generic and added i2p support	2015-09-07 23:01:24 +02:00
sehraf	95d6b06eb5	first working version	2015-09-07 21:34:10 +02:00
sehraf	0107f4e406	first run on gui integration	2015-09-07 21:34:10 +02:00
defnax	2c1743f5bb	Added send message function for Participants list.	2015-09-07 15:13:32 +02:00
defnax	cc4be39025	Merge branch 'master' of https://github.com/RetroShare/RetroShare	2015-09-07 15:08:56 +02:00
csoler	734a308aa3	fixed some gui bits in IdDialog	2015-09-07 00:01:50 -04:00
csoler	a2d686351f	move circles code to IdDialog	2015-09-06 23:53:21 -04:00
csoler	08be890339	added circle edit functionality to People tab	2015-09-06 18:19:51 -04:00
csoler	a1ce7f2d6f	updated branch to upstream/master	2015-09-06 17:37:13 -04:00
csoler	697b7be5d1	fixed compilation of circles	2015-09-06 17:34:43 -04:00
AsamK	fe1ec9d510	Fixed mac compile. Moved sqlcipher.a to libretroshare.pro	2015-09-06 22:27:22 +02:00
AsamK	571336e1f4	Move duplicate common stuff out of platform parts	2015-09-06 22:27:22 +02:00
AsamK	66b9557833	Use PKGCONFIG instead of manually specifying LIBS for Linux ... - The advantage is that this method automatically includes additional dependencies of LIBS (e.g. libupnp needs -lixml). - Also if some distribution moves headers to non default locations the correct locations get added by PKGCONFIG	2015-09-06 22:27:22 +02:00
thunder2	5f36500d02	Fixed click in column "Friend nodes" in FriendList.	2015-09-06 14:21:05 +02:00
thunder2	d4226b6815	Fixed Windows compile. Moved "-lsqlcipher" to libretroshare.pro	2015-09-05 21:31:38 +02:00
AsamK	ae43058520	Make wikis compile ... - rsWiki->updated() doesn't exist anymore, so I ported WikiDialog to inherit from RsGxsUpdateBroadcastPage - add -lglib-2.0 to pegmarkdown.pro	2015-09-05 09:25:08 +02:00
AsamK	2bf81be6a7	Disable compiling of wikis in libretroshare ... It is disabled in the gui anyway	2015-09-05 09:25:08 +02:00
AsamK	1f134d3431	Remove gxs CONFIG, it's always enabled now anyways	2015-09-05 09:25:08 +02:00
AsamK	4e917ea26c	Disable compiling of pegmarkdown by default, only used for wiki ... - Move unfinished CONFIGs to common retroshare.pri file - Compile and link pegmarkdown only if CONFIG+=wikipoos is set	2015-09-05 09:25:08 +02:00
defnax	07c5030c36	Merge branch 'master' of https://github.com/RetroShare/RetroShare	2015-09-03 17:41:30 +02:00
thunder2	b1b2de617a	Fixed Windows compile. ... - Set name for prl file in libretroshare.pro - Use "QMAKE_LFLAGS += -Wl,--start-group" to solve link issue	2015-09-03 13:14:39 +02:00
AsamK	feafb1e291	Add "Paste as plain text" to context menu of RS text edits ... Useful for example when pasting from a website	2015-09-03 00:28:19 +02:00
defnax	3d6e9783f6	Fixed Status Label on Distant Chat	2015-09-02 13:06:15 +02:00
Cyril Soler	d2dc8deeaf	Merge pull request #66 from AsamK/qmake_improvements_next ... More qmake improvements	2015-09-01 20:49:57 -04:00
Chozabu	1630577e04	dont set tooltip if enabling updates, set tooltip on save incase of update between click and save	2015-09-02 01:09:39 +01:00
AsamK	d116f40d6e	Move openpgpsdk to common section of libretroshare.pro ... It is the same for all platforms	2015-09-01 14:53:17 +02:00
AsamK	30d7aa3be3	Remove dependency on qt script, it's unused	2015-09-01 14:53:17 +02:00
AsamK	829c2f396e	Move LIBS from gui/nogui linux section to libretroshare ... remove -lglib-2.0 it's not needed: was added in d8e327afcc to compile for arch, but it compiles on arch now also without this	2015-09-01 14:53:17 +02:00
AsamK	846f7d0204	Make usage of sqlcipher explicit at compile time ... Either the build fails if it is not available, or the user specifies CONFIG+=NO_SQLCIPHER to build without it, even if it exists in the system.	2015-09-01 14:53:09 +02:00
Chozabu	da90bfec08	add option to disable updates to systray tooltip	2015-09-01 13:43:29 +01:00
AsamK	b43e0ab2e0	Fix compile with qt < 4.7 ... Reenable placeholder text for lobby name, not sure why it was disabled	2015-08-31 23:38:50 +02:00
AsamK	dca295143a	Use CONFIG+=create_prl for libretroshare ... Allows to specify all LIBS in libretroshare.pro so they don't also have to be specified in gui/nogui.pro	2015-08-31 22:50:47 +02:00
AsamK	b9c174ba8f	Add BIN_DIR variable to allow packagers to override it	2015-08-31 22:50:46 +02:00
AsamK	b66f466c7a	Move all INSTALLS to the subproject they belong to ... Allows installation of for example only retroshare-nogui, without installing files only relevant for gui $ qmake $ make retroshare-nogui $ make retroshare-nogui-install_subtargets	2015-08-31 22:49:46 +02:00
AsamK	e135e3441c	Create retroshare.pri for common configurations in .pro files ... So far it only contains the default values for installation paths	2015-08-31 21:09:28 +02:00
Cyril Soler	c844d37ada	Merge pull request #63 from AsamK/lobby_gui_lag ... Remove lobby gui lag	2015-08-31 14:11:45 -04:00
Cyril Soler	ef292faa22	Merge pull request #61 from PhenomRetroShare/Improve_ElidedLabel_Alignment_HTML ... Improve ElidedLabel	2015-08-31 10:43:29 -04:00
AsamK	cfde9d303c	Escape name before inserting in name changed message and in anchor info	2015-08-31 16:38:28 +02:00
AsamK	bd6bb8996b	Improve performance of eventFilter in chat lobbies ... - Only check the anchors if the visible content has actually changed by saving lastUpdateCursorPos and End - Check notify first, before doing any work - Simplify regexp as the anchors have a fixed format - Remove unnecessary conversion to utf8 and back	2015-08-31 12:10:49 +02:00
AsamK	5f81d8efc8	Remove nick from anchor names, causes problems ... - Nicknames that contain " could break the formatting - Nicknames containing chars like < or > were converted to html entities by the QTextBrowser so the anchor was no longer identical with the anchor stored in the _listMsg list	2015-08-31 12:10:49 +02:00
Thunder	de92c06f0b	Merge pull request #62 from hunbernd/qt5-fix ... Qt5 fix	2015-08-31 12:05:08 +02:00
hunbernd	bd3f7f6d38	Removed limit on opacity setting with recent windows versions on BandwidthGraphDialog ... Conflicts: retroshare-gui/src/gui/statistics/BandwidthGraphWindow.cpp	2015-08-30 22:53:38 +02:00
hunbernd	acc3e4bb62	Replaced Q_WS_ --> Q_OS_ ... Q_WS macros are not available in Qt5 Restores some functions in Options->General dialog that were not available under Qt5	2015-08-30 22:51:15 +02:00
defnax	d9fd60ee75	Moved Id Chooser to Tool Menu ... Added a place holder text.	2015-08-30 03:48:45 +02:00
Phenom	f73ee2c769	Improve ElidedLabel ... Now respect alignment and html text. Html is shown as plain text, no html in QTextLine... Test with: retroshare://file?name=Test_ElidedLabel.7z&size=7330&hash=bd19f1a486d34d08e434ca4309cf4b8f7a436e9e	2015-08-29 21:06:36 +02:00
Phenom	88a6931758	Allow Chat Text Format Option working.	2015-08-29 19:27:03 +02:00
defnax	ecb5d93685	changed default color for the system chat bubble	2015-08-29 04:01:01 +02:00
defnax	c07bef37a0	Fixed Create Lobby Dialog's window size	2015-08-28 16:40:40 +02:00
Cyril Soler	a45de1ddb3	Merge pull request #57 from csoler/v0.6-SignedLobbies ... V0.6 signed lobbies	2015-08-28 00:14:24 -04:00
csoler	40bffc3042	fixed last GUI bugs for authed lobbies	2015-08-27 23:09:31 -04:00
csoler	6d01461c66	fixed a few GUI bits for non anonymous chat lobbies	2015-08-27 22:37:01 -04:00
defnax	627dcc01a0	Merge pull request #50 from chozabu/forum_additions ... enable customisation of columns in forum thread widget	2015-08-28 02:01:15 +02:00
AsamK	5dad1680e6	Implement history for distant chat ... Uses the same history config as private chat	2015-08-28 01:29:34 +02:00
AsamK	622e94223c	Remove Thumbs.db files and add to .gitignore	2015-08-27 22:35:28 +02:00
AsamK	699213af80	Load chat styles also from DATA_DIR/stylesheets ... Chat styles were only loaded from user config dir (or application dir on windows portable) If a style exists in both folders, it's taken from config dir, so users can customize chat styles by copying them to ~/.retroshare/stylesheets/	2015-08-27 22:35:28 +02:00
AsamK	66ba687acd	Install qss and chat styles	2015-08-27 22:35:28 +02:00
defnax	6e1a8fac10	Merge pull request #21 from AsamK/lobby_history ... Store lobby history on disk	2015-08-27 18:43:28 +02:00
csoler	040b4fb949	implemented gp-authed lobbies. Still needs some GUI	2015-08-26 23:35:36 -04:00
Cyril Soler	b8459b3161	Merge pull request #44 from AsamK/improve_qmake ... Improve qmake: "make install" support and ability to change install prefix	2015-08-26 20:38:27 -04:00
Cyril Soler	ef499cd570	Merge pull request #46 from PhenomRetroShare/Fix_ChatWidgetSearchTextThreshold ... Fix chat widget search text threshold	2015-08-26 19:43:56 -04:00
Cyril Soler	668394d676	Merge pull request #47 from PhenomRetroShare/AddHTML_TextOptimization_0.6 ... Add html text optimization 0.6	2015-08-26 19:42:42 -04:00
Cyril Soler	6ba2f68cb5	Merge pull request #45 from PhenomRetroShare/Fix_ChatWidgetLastCursorFormatting ... Fix chat widget last cursor formatting	2015-08-26 19:31:50 -04:00
defnax	a39663db01	Merge branch 'master' of https://github.com/RetroShare/RetroShare	2015-08-26 23:51:42 +02:00
defnax	17af892434	set a default minimum column header size for comments.	2015-08-26 23:50:06 +02:00
thunder2	641a433f97	Fixed filter in FriendList.	2015-08-26 19:30:43 +02:00
defnax	217c9b9538	Merge branch 'master' of https://github.com/RetroShare/RetroShare	2015-08-26 19:20:32 +02:00
defnax	9d65b087d8	set default background color for system messages at private chat window	2015-08-26 19:19:24 +02:00
thunder2	da66ac5cff	GxsGroupFrameDialog: Fixed restore of active group tree item when subscrube/unsubscribe a group.	2015-08-26 15:06:09 +02:00
Chozabu	185220b08f	enable customisation of columns in forum thread widget	2015-08-25 22:59:38 +01:00
Cyril Soler	836b8668fc	Merge pull request #37 from sehraf/pr-friendlist_import_export-V2 ... friendlist import export	2015-08-24 20:28:38 -04:00
AsamK	5ae5d76ffc	Make file names consistent with packaging ... Rename executables: RetroShare -> RetroShare06 retroshare-nogui -> RetroShare06-nogui Add 06 suffix to icons and desktop file Update README, debian rules and windows installer file	2015-08-24 00:03:57 +02:00
AsamK	d4a36ed38b	Make data and plugin directory configurable at compile time ... e.g.: $ qmake PREFIX=/usr/local $ qmake LIB_DIR=/usr/lib64 A full recompile is necessary when changing the PREFIX!	2015-08-24 00:03:57 +02:00
AsamK	6b7a6e2313	Make RS installable with "make install"	2015-08-24 00:03:57 +02:00
Phenom	531ce34151	Merge branch 'master' into AddRetroShareLinkOpenFileWhenExists	2015-08-23 18:17:09 +02:00
Phenom	860292da12	Merge branch 'master' into AddHTML_TextOptimization_0.6	2015-08-23 18:16:43 +02:00
Phenom	70b9c456d5	Merge branch 'master' into Fix_ChatWidgetSearchTextThreshold	2015-08-23 18:09:30 +02:00
Phenom	79fb8dfe04	Merge branch 'master' into Fix_ChatWidgetLastCursorFormatting	2015-08-23 17:49:19 +02:00
Cyril Soler	e9aa4ff43b	Merge pull request #3 from chozabu/copy_version_info_button ... add button to copy version info in first level about box	2015-08-23 11:15:05 -04:00
sehraf	d1deef0733	fixed new lines in certificate string	2015-08-23 16:43:34 +02:00
Cyril Soler	7bd41e9fcb	Merge pull request #4 from chozabu/grouter_stats_basic_names ... minor tweak to list friends in order they are shown on graph	2015-08-23 10:15:10 -04:00
Phenom	023473443b	When the file in the link already exists, RS open it.	2015-08-23 12:03:46 +02:00
sehraf	791fb78ed9	renaming details and details2 for better clarification	2015-08-23 09:58:31 +02:00
sehraf	ad499e6bd6	renamed 'pubkey' to 'certificate' and removed empty location names	2015-08-23 09:55:43 +02:00
Phenom	326a33059d	Fix ChatWidget last cursor formatting. ... To test it, search a text that will be colored a end. New messages lose their format.	2015-08-22 17:38:35 +02:00
Phenom	c44afc092e	Merge branch 'master' into Fix_ChatWidgetSearchTextThreshold	2015-08-22 17:02:43 +02:00
Phenom	b1fd29033b	Merge branch 'master' into AddHTML_TextOptimization_0.6	2015-08-22 16:38:20 +02:00
Phenom	5c970100f1	Fix ChatWidget search text label threshold.	2015-08-22 16:31:08 +02:00
thunder2	334ddf8efc	Enabled sort by columns other than name combined with sort by state in FriendList.	2015-08-22 00:57:26 +02:00
thunder2	176c3abd8c	FriendSelectionWidget: ... - Added sort by state - Moved buttons "All"/"None" into context menu MessageComposer: - Removed double details action	2015-08-21 19:24:24 +02:00
thunder2	4923c47eb3	RSTreeWidget: ... - Added possibility to add own actions to header context menu - Added resort of items	2015-08-21 19:24:23 +02:00
Phenom	02775c6fb4	Add HTML Text Optimization by exporting styles.	2015-08-20 17:55:20 +02:00
sehraf	04a1c10a56	fixed UTF-8 group names	2015-08-19 19:12:38 +02:00
sehraf	941959cc86	conversion from QSettings to XML	2015-08-19 19:08:48 +02:00
thunder2	48c3eedcf5	Removed "CONFIG += console" for Windows release build.	2015-08-19 13:22:31 +02:00
thunder2	3b40f0e0c8	FriendList: ... - Show information of the "best" ssl item on the gpg item only when the gpg item is not expanded. - Calculate the icon height from the font metrics - Show the information text with normal font and color	2015-08-19 11:04:50 +02:00
csoler	42bbf76035	fixed display of software revision in main window (patch from ASmith)	2015-08-18 20:21:45 -04:00
sehraf	80d765e1d6	small fix	2015-08-18 23:17:29 +02:00
sehraf	36349814a6	added import/export friendlist	2015-08-18 23:05:22 +02:00
Cyril Soler	f6b830d5aa	Merge pull request #35 from hunbernd/chat-fix ... Chat fix. Thx for this.	2015-08-15 21:46:22 -04:00
hunbernd	16859a1d3a	Fix: chatlobby toaster not working	2015-08-15 23:37:33 +02:00
defnax	4a50a62cc8	Merge branch 'master' of https://github.com/RetroShare/RetroShare	2015-08-14 12:38:36 +02:00
hunbernd	0402e53f15	Fix: empty line duplication bug ... to reproduce: hit: a<enter><enter>b the result will be: a<br><br><br>b the empty line is two lines high	2015-08-13 22:13:21 +02:00
thunder2	4095d9d5c9	Switched retrieve of posts in GxsMessageFramePostWidget from "requestMsgRelatedInfo" to "requestMsgInfo".	2015-08-13 22:09:46 +02:00
defnax	e66707111b	Moved IP Filter Widgets into Tabs	2015-08-13 13:48:57 +02:00
defnax	7472f81940	Merge branch 'master' of https://github.com/RetroShare/RetroShare	2015-08-11 17:01:53 +02:00
defnax	9d291aa6f6	update windows build scripts ... changed gxs id icon for linked with profile.	2015-08-11 16:44:59 +02:00
thunder2	a765016240	Moved column show/hide from context menu of the tree to the context menu of the header in IdDialog.	2015-08-11 16:01:43 +02:00
thunder2	e73e68d860	Reduced the size of the status icon on the avatar image in FriendList.	2015-08-11 13:40:02 +02:00
defnax	783465bc89	forget to commit this, for the Search Filter DHT IPs	2015-08-10 18:27:29 +02:00
Cyril Soler	13e77fb7e5	Merge pull request #19 from sehraf/pr-fix_crash_on_shutdown ... Thx sehraf. Indeed, the object was created twice, before your patch. Not good.	2015-08-09 17:04:24 -04:00
thunder2	9d0b0664f1	Fixed hide offline friends in ServicePermissionsPage	2015-08-09 22:30:47 +02:00
thunder2	c9197864c6	Fixed typo. ... Updated english translation.	2015-08-09 15:52:26 +02:00
thunder2	d5c95c4b28	Fixed layout of the ServicePermissionsPage	2015-08-08 22:46:31 +02:00
thunder2	9265145ca7	Updated english translation	2015-08-08 21:14:02 +02:00
thunder2	87f2e6da37	FriendList: ... - Removed avatar column - Removed state column - Added combined avatar and status icon - Added status icons in 64px - Renamed "Hide state" to "Show state" - Added sort by name and state RSTreeWidget: - Added version for load/save state - Added method setColumnCustomizable	2015-08-08 20:27:19 +02:00
AsamK	ef5fca5e5e	Resolve nicks from gxsId in lobby chat history	2015-08-07 19:08:10 +02:00
defnax	c168765bb2	Added tab for the DHT TreeWidgets for better view ... Added a search Filter for DHT IP addresses	2015-08-07 15:14:47 +02:00
sehraf	48bb8b48c9	sequel to 6b2ed2fb2d	2015-08-05 23:45:45 +02:00
thunder2	789df68582	- Added update of version information for Windows build ... - Added template file version.html.in - Removed RS_BUILD_NUMBER from Windows executable FileVersion	2015-08-04 15:15:49 +02:00
csoler	9e978e1442	updated version info to new hexa format	2015-08-02 19:10:59 +02:00
Chozabu	453415fd3e	minor tweak to list friends in order they are shown on graph	2015-07-31 16:42:39 -04:00
Chozabu	69d23a4982	add button to copy version info in first level about box	2015-07-31 16:40:45 -04:00
electron128	9897def2cc	fix #21 typo "defaut" instead of "default" in switch statement in RSGraphWidget (patch from Chozabu)	2015-07-31 17:27:04 +02:00