12915 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
csoler	3c4d4e37e9	Merge pull request #1320 from hunbernd/feature/native-dialogs ... Added switch to enable native dialogs at compile time	2019-01-11 15:24:21 +01:00
csoler	343ccaa1c5	Merge pull request #1457 from csoler/v0.6-ImprovedGUI ... fixed sorting of last time used in keyring	2019-01-10 23:45:06 +01:00
csoler	266edf06aa	fixed sorting of last time used in keyring	2019-01-10 23:43:19 +01:00
Gioacchino Mazzurco	97633ec8db	Fix crash if JSON object deserialization ... In case an object was expected while another type was got RsSerializable JSON deserialization code was crashing, this commit solve the crash in this not so corner case	2019-01-10 19:06:35 +01:00
defnax	993f1e8ada	Merge pull request #1455 from defnax/master ... *Improved Display of Moderator selection box on a useable place *Restored back changes from circles & profile gen dialog	2019-01-09 23:41:09 +01:00
defnax	868a2a30b6	restored back changes from circles & profile gen dialog ... *Restored back changes from circles & profile gen dialog *Fixed channel frame stylesheet	2019-01-09 22:35:07 +01:00
csoler	b74520cb30	Merge pull request #1454 from csoler/v0.6-ImprovedGUI ... added some debug info to GxsIdChooser and fixed a typo (possibly caus…	2019-01-07 13:21:22 +01:00
csoler	b7340ef7ee	fixed case insensitive sorting in Keyring, and cleanup dead code	2019-01-06 20:58:32 +01:00
csoler	ba57ddfef9	added JSon api for file control	2019-01-06 20:56:57 +01:00
csoler	2d06aa3eb0	use case insensitive sorting in People	2019-01-06 20:29:45 +01:00
defnax	ef4a29d4d4	Improved Display of Moderator selection box on a useable place ... * Improved Author & Moderator labels display as link * Improved display of moderator selection box display on right side * Added own tree item "My Circles" to see your own circles easyer then before when you are admin. * Profile generation dialog moved node type box to advanced section.	2019-01-06 15:56:39 +01:00
csoler	9e63467aba	added some debug info to GxsIdChooser and fixed a typo (possibly causing a bug?)	2019-01-06 13:18:59 +01:00
csoler	88c22c470b	fixed compilation of jsonapi	2019-01-06 10:09:26 +01:00
defnax	2af202063f	Merge pull request #2 from RetroShare/master ... update branch	2019-01-05 22:25:15 +01:00
csoler	a3ad5f7707	Merge pull request #1443 from defnax/master ... * Fixed icon size of the group tree to display icon complete.	2019-01-03 22:42:32 +01:00
csoler	3527382dbe	Merge pull request #1450 from csoler/v0.6-ForumModel3 ... added a "show author in People" function in mails	2019-01-03 22:41:10 +01:00
csoler	3b6bac2d9b	added a "show author in People" function in mails	2019-01-03 22:20:00 +01:00
csoler	ca50944ddf	make only default opinion to be changed to positive for contacts (optionally)	2019-01-03 18:32:08 +01:00
csoler	8505561700	fixed bug causing all GXS ids to be added to contacts. Warning: IDs added to contacts by this bug need to be cleaned manually.	2019-01-02 00:20:53 +01:00
hunbernd	50ee33b229	RS_ prefix	2018-12-31 22:36:30 +01:00
hunbernd	584b9039c9	Added switch to enable native dialogs at build time ... CONFIG+=use_native_dialogs	2018-12-31 22:36:30 +01:00
hunbernd	3822d277ad	Allow passing custom CONFIG options to msys2 buildscript ... Use all cores	2018-12-31 22:36:29 +01:00
Gioacchino Mazzurco	18c5ab8913	add /rspeers/setVisState JSON API	2018-12-28 13:26:26 +01:00
csoler	f122aec41e	Merge pull request #1446 from csoler/v0.6.5-DebianPackaging ... fixed license in bss_tou	2018-12-27 17:36:07 +01:00
csoler	1c5f5de3dc	fixed license in bss_tou	2018-12-27 17:34:27 +01:00
csoler	e88a7075d9	Merge pull request #1445 from csoler/v0.6.5-DebianPackaging ... V0.6.5 debian packaging	2018-12-27 17:31:05 +01:00
csoler	6502bdd1b3	fixed up license in html files for help/	2018-12-27 17:28:52 +01:00
csoler	01c40d2593	removed some dead files and finished license cleaning	2018-12-27 16:56:28 +01:00
csoler	45a2d22b45	firther license cleaning/fixing	2018-12-27 16:35:21 +01:00
csoler	d9683459d6	more license fixes and updated version in Debian control files	2018-12-27 15:47:58 +01:00
csoler	bc3a71d3f5	fixed license in util/ lang/ and idle/	2018-12-27 14:39:10 +01:00
csoler	b9a182cb53	fixed licenses in gui/	2018-12-25 21:34:59 +01:00
csoler	f85ca95a87	fixed license in TheWire, WikiPoos, style and toaster	2018-12-25 21:10:15 +01:00
csoler	ef45a8225a	fixed license in statusbar/	2018-12-25 20:54:48 +01:00
csoler	bcea548d83	Merge pull request #1440 from csoler/v0.6-Identity ... added button (enabled by default) to automatically add IDs signed by …	2018-12-25 20:35:21 +01:00
csoler	1176908e71	Merge pull request #1441 from csoler/v0.6-ForumAdmin2 ... automatically add moderator rights to the owner of a forum	2018-12-25 20:34:42 +01:00
defnax	e7085eeb75	Fexed Icon size of the group tree ... * Fixed icon size of the group tree to display icon complete. Added for channel adminstrator clickable to contact easy. * Format Channel Description when contains links or emote * Added setting for disable Emoteicon	2018-12-25 19:14:48 +01:00
Gioacchino Mazzurco	69debe5052	Enable direct chat by default	2018-12-24 12:48:03 +01:00
csoler	e09b416674	automatically add moderator rights to the owner of a forum	2018-12-24 11:47:33 +01:00
csoler	3770810238	added button (enabled by default) to automatically add IDs signed by friends as contacts	2018-12-24 10:13:27 +01:00
defnax	590f5f6944	Merge pull request #1 from RetroShare/master ... merge with master	2018-12-23 21:13:39 +01:00
defnax	ac146c6808	Merge branch 'master' into master	2018-12-23 21:13:06 +01:00
defnax	e670e7c4f5	Merge branch 'master' of https://github.com/defnax/RetroShare	2018-12-23 21:05:39 +01:00
defnax	6aefce4974	restore	2018-12-23 21:04:33 +01:00
csoler	66887db369	fixed licenses in statistics	2018-12-23 20:09:23 +01:00
defnax	c8dbe47d89	Update .gitignore	2018-12-23 18:59:34 +01:00
defnax	3d66d84112	fixed conflicts for pr 1438	2018-12-23 18:45:07 +01:00
csoler	4375698d1d	fixed licenses in settings	2018-12-23 18:03:08 +01:00
defnax	1c998e4f8e	Fixed the size problem of the group tree ... * Fixed the size problem of the group tree * Added to format the Administrator as rs link for easyer contact admin. * Format the Channel Description on the Channel posts widget for clickable links	2018-12-23 17:58:37 +01:00
csoler	e99c718be9	half-fixed licenses in settings	2018-12-23 17:49:01 +01:00