Commit Graph

395 Commits

Author SHA1 Message Date
sehraf
26fdd79b50
Merge remote-tracking branch 'RetroShare/master' into pr_rsconfig 2020-10-04 20:25:06 +02:00
defnax
05f08003fc removed more icons 2020-09-15 19:22:20 +02:00
csoler
6f6e0de5f1
merged with upstreamm/master 2020-05-09 22:33:27 +02:00
Phenom
1c9bea730f Fix Log User Notify 2020-04-29 17:25:53 +02:00
csoler
f5af7dfeb3
fixed up top bar tooltips to display what the numbers actually mean 2020-04-27 21:56:43 +02:00
defnax
a1ca048082 cleanup & update some icons 2020-03-05 02:10:45 +01:00
defnax
eb96350a5f cleanup & remove old icons with new one 2020-03-03 16:26:47 +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
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
defnax
87f64a1e2b removed old unused icons 2020-02-22 01:26:20 +01:00
defnax
3eec7922f6
Merge pull request #66 from RetroShare/master
update to master
2020-02-15 15:04:17 +01:00
sehraf
1a7510b2c9
convert RS_OPMODE to enum class 2020-02-10 19:51:09 +01:00
drbob
d748278637 update code to get Wiki / Wire and PhotoShare compiling again 2020-02-10 22:24:47 +11:00
defnax
8dd85f2391
Merge pull request #52 from RetroShare/master
update to master
2020-02-06 22:27:37 +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
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
csoler
4a257614f1
merged with upstream/master 2019-11-24 18:38:50 +01:00
defnax
c22524d5d1 updated tray menu icons 2019-11-22 13:58:25 +01:00
csoler
6603dbd913
code to embed webUI server in the main executable (initial version, not yet working) 2019-11-10 17:38:16 +01:00
csoler
c28c193b7c
Merge pull request #1615 from csoler/v0.6-FriendList
V0.6 friend list
2019-08-26 19:07:11 +02:00
csoler
98e41ad075
made messenger an optional component of the UI 2019-08-21 15:23:25 +02:00
csoler
c72b49c296
automaticall save/restore subscribed chat rooms. The advantage is that auto-subscribed is not needed anymore and chat rooms will survive automatically 2019-06-15 13:54:34 +02:00
csoler
0bcbe14b2c
fixed wrong display of trash messages in inbox 2019-04-14 16:25:26 +02:00
csoler
43a5312194
Merge pull request #1509 from RetroPooh/trafcount
display session traffic
2019-04-10 21:04:53 +02:00
RetroPooh
7504964899 display session traffic 2019-04-03 17:29:13 +03:00
csoler
b9a182cb53
fixed licenses in gui/ 2018-12-25 21:34:59 +01:00
csoler
d1a375cbd0
removed RETROTOR #ifdef and started using RsAccounts::isTorAuto() instead. Unfinished yet. 2018-07-25 11:37:40 +02:00
chelovechishko
b3dddeafdf add missing namespaces 2018-07-06 23:55:12 +09:00
Phenom
8f107cca31 Add Never Ask Me For External Link Activated
Need to remove [General] NeverAskMeForExternalLinkActivated key in
RetroShare.conf to revert.
2018-05-19 16:37:29 +02:00
Gioacchino Mazzurco
b36cb1ef17
Fix retroshare GUI building with no_libresapihttpserver 2018-04-15 12:41:54 +02:00
csoler
2c61f38887 added missing call to set compact mode 2018-01-20 19:22:49 +01:00
csoler
15decacc0d attempt to improve the tor statusbar widget 2018-01-20 16:43:38 +01:00
csoler
6179d22ad5 fixed uninitialized pointer in MainWindow 2018-01-19 22:13:40 +01:00
csoler
8534147313 added Tor status icon in the status bar 2018-01-19 13:42:16 +01:00
csoler
5997c10495 fixed bug causing RsCollection to fail on remote files. Now using RsCollectionDialog when downloading directories from friend shared files 2017-11-12 22:46:29 +01:00
csoler
37f6e7e13b
Merge pull request #1064 from PhenomRetroShare/Fix_OpModeRestore
Fix OpMode Restore
2017-11-03 23:49:30 +01:00
csoler
06f489ec61 Merge pull request #1065 from csoler/v0.6-Links2
V0.6 links2
2017-10-23 22:14:06 +02:00
Pooh
4594c1ae9c Update MainWindow.cpp 2017-10-23 11:51:22 +03:00
Pooh
a0f6a741b1 Merge branch 'master' into hid1 2017-10-23 11:46:39 +03:00
RetroPooh
78037a66be disable nat/dht indicators for hidden mode, hide irrelevant network options elements 2017-10-23 11:42:03 +03:00
hunbernd
0c39b5c021 Fix bug causing RS to crash at startup when some icons were removed from toolbar
For example: disabled plugins
2017-10-22 19:44:14 +02:00
csoler
74d5069225 renamed RsCollectionEditor into RsCollection. Added download of FileTree links 2017-10-19 22:14:04 +02:00
csoler
847c1b2bce renamed RsCollectionFile into RsCollectionEditor 2017-10-17 22:39:05 +02:00
Phenom
e63217e7de Fix OpMode Restore 2017-10-17 15:39:38 +02:00
csoler
e66c0d1349 removed updateTotals() method. Replaced it with costless on-the-fly update of totals 2017-09-27 22:26:14 +02:00
Phenom
4336a4ad46 Move SharedFilesDialog to /gui/FileTransfer/
And remove old DEFINE because very olds files are deleted.
2017-09-07 19:53:51 +02:00
Phenom
8563957591 Add the ability to change OpMode in command line.
So you can change OpMode while running via ssh to get more bandwidth.
Usage: RetroShare06 --opmode [full|noturtle|gaming|minimal]
2017-07-17 14:36:51 +02:00