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
11,006 Commits 63 Branches 22 Tags 195 MiB
d60bb781b8
Commit Graph

5723 Commits

Author SHA1 Message Date
felisucoibi
2dbe3a1d5a Start login 2/4 
Login screen was changed because of new code aded so with this code i revert these changes. 2/4
 2017-05-26 18:13:57 +02:00
felisucoibi
0fa3b9ec62 smaller login screen and less blue 1 
Login screen was changed because of new code aded so with this code i revert these changes. 1/4
 2017-05-26 18:12:24 +02:00
csoler
14b9a54773 added group data retrieval to GxsTransStatistics 2017-05-25 16:56:29 +02:00
sehraf
a3ee85a30d Add I2P BOB support to libretroashare and RetroShare GUI 2017-05-24 19:40:01 +02:00
csoler
9ff81b9e93 Merge pull request #835 from felisucoibi/master 
Improved GUI gencert
 2017-05-23 22:06:46 +02:00
defnax
483d5386ba fit the background image to the login page 2017-05-23 18:46:50 +02:00
csoler
a136fb6fda added display of ongoing record status for GxsTrans. Unfinished. 2017-05-22 23:54:55 +02:00
felisucoibi
ac66ee7eb7 Improved GUI gencert 
Aded a new logo, fixed height for the background to fit and smaller window in general with the changes.
 2017-05-22 15:21:06 +02:00
csoler
fbeb6ff98d added infrastructure for gathering statistics about GxsTransport. Unfinished. 2017-05-21 15:57:10 +02:00
felisucoibi
2adde95412 fixed bad uploading of previous pr 
using gui of github
 2017-05-21 15:08:07 +02:00
felisucoibi
6bc72dd5cf restored start dialog and fixed 
I made a mistake using visual editor of github, fixed.
 2017-05-21 14:51:43 +02:00
csoler
b341fea170 merged upstream/master 2017-05-21 13:49:41 +02:00
felisucoibi
a5cebb9f1e simplified and upgraded gui logo added 2017-05-21 12:35:43 +02:00
felisucoibi
ecf3fc52fb simplified gui 2017-05-21 12:34:52 +02:00
felisucoibi
d83c42dd98 Add files via upload 2017-05-21 12:33:40 +02:00
defnax
95c9b37479 update background image resolution 2017-05-21 04:12:34 +02:00
csoler
8b079f8fdf Merge pull request #827 from csoler/v0.6-EditPosts 
V0.6 edit posts
 2017-05-20 18:34:07 +02:00
csoler
0321037eb8 fixed centering of comments 2017-05-20 18:15:57 +02:00
defnax
7a2807a46e added missed icon 2017-05-20 18:06:23 +02:00
csoler
9da1e1ce05 fixed proper comment number in channels feeds 2017-05-20 17:53:25 +02:00
csoler
51710c10a0 merge comments between channel item versions 2017-05-20 17:33:05 +02:00
defnax
bda7a50621 Improved look & feel for Generate and Login Window 2017-05-20 15:14:43 +02:00
Phenom
7acefda943 Fix Chat Font setting saving. 
And don't use native dialog.
 2017-05-19 18:40:17 +02:00
csoler
6b09fa0f67 allow GxsFeedItems to have versions. Unfinished (does not compile) 2017-05-18 22:31:52 +02:00
csoler
d5ec641f9e changing background color as a function of commenter ID (needs to be further adapted to all styles) 2017-05-16 19:45:27 +02:00
csoler
fd136c1a30 made gxs comments multi-lines 2017-05-16 10:24:23 +02:00
csoler
2bc36bc06c properly merge new version feed items in channels when some items are already present 2017-05-15 22:13:36 +02:00
csoler
84e588b7e0 switch file to REMOTE state in subfileitem if the attachment has already been checked in the past but the file is not here anymore 2017-05-15 21:37:22 +02:00
csoler
18e37deba0 hide download buttons when the file is local in sub file item 2017-05-14 21:41:26 +02:00
csoler
f832f3dc82 added delete button to channel attached files 2017-05-14 21:26:45 +02:00
csoler
af57545501 removed unused button in GxsChannelPostsWidget 2017-05-14 20:59:43 +02:00
csoler
c0c5cc52db Merge branch 'master' into gxs_mail_experiments 2017-05-13 21:08:16 +02:00
csoler
01bb4b09a9 added ifdefs around debug info and fixed a few bugs in channel post edit 2017-05-13 20:41:56 +02:00
csoler
6859e0d8ca fixed post replacement algorithm in channel editing 2017-05-13 17:13:05 +02:00
csoler
659e3c949b merged upstream/master 2017-05-12 23:55:09 +02:00
csoler
305c5d6deb added collapsing of new versions of channel posts 2017-05-12 23:54:02 +02:00
defnax
2f17a80103 added missed icons 2017-05-12 21:39:50 +02:00
defnax
837fcd7989 Added Placeholder text for Password field, removed "Password:" label. 2017-05-12 18:29:39 +02:00
csoler
5044ac12ca moved the edit button from top bar to each channel post 2017-05-11 23:44:57 +02:00
csoler
5406da92fa first part of channel post editing 2017-05-11 23:21:13 +02:00
csoler
38d07430b7 used more saturated colors in stats graph 2017-05-11 21:22:07 +02:00
csoler
7a19deea03 small fix to statistics view 2017-05-11 21:22:07 +02:00
csoler
eb30af57bd improved display in bw statistics 2017-05-11 21:22:07 +02:00
defnax
d73e850122 look n feel improvements 2017-05-11 18:14:21 +02:00
csoler
7eb5e8e02b added warning when switching opmode status to non turtle for the first time 2017-05-10 21:37:40 +02:00
Phenom
1ff1b8960f Save last state of OpMode status bar droplist and restore it at start. 
Add colored style sheet to OpModeStatus ComboBox.
And defined default color when stylesheet file are not found.
 2017-05-10 21:37:40 +02:00
Phenom
6ffae36242 Fix Start page password focus. 
And readd "log in" button.
 2017-05-10 19:06:03 +02:00
csoler
5d7d8c0653 Merge pull request #813 from csoler/v0.6-ImprovedGUI 
fixed bug causing edited posts to turn into missing messages when the…
 2017-05-09 21:56:22 +02:00
csoler
52a0aea0dc fixed bug causing edited posts to turn into missing messages when they have submessages 2017-05-09 21:33:02 +02:00
Phenom
a5386eb6ea Fix text's color gray in Forum thread when selected. 2017-05-09 19:19:28 +02:00
Phenom
237db96e7a Add Open Cert File in Home Add Friend wizard. 2017-05-09 18:50:06 +02:00
csoler
9a0df3f757 Merge pull request #804 from PhenomRetroShare/Fix_Warnings 
Fix warnings
 2017-05-08 22:21:28 +02:00
csoler
9a7f78f1c7 Merge pull request #805 from PhenomRetroShare/Fix_Commit_#77adc82 
Fix Commit #77adc82
 2017-05-08 22:18:51 +02:00
csoler
caa36b4623 Merge pull request #807 from PhenomRetroShare/Fix_ToasterPositionSetting 
Fix Toaster Position Setting.
 2017-05-08 22:17:09 +02:00
csoler
d74bb2abad Merge pull request #806 from PhenomRetroShare/Fix_LobbySoundNotification 
Fix Lobby's sound notification.
 2017-05-08 22:16:39 +02:00
csoler
8a86b9ed7d added a per-friend upload slots limit in FT. Default is 0=unlimited 2017-05-08 22:00:51 +02:00
Phenom
594ab53ef2 Fix Toaster Position Setting. 2017-05-08 15:37:33 +02:00
Phenom
a869a37802 Fix Lobby's sound notification. 
Lobby "message arrived" sound play depends of notify ChatRooms settings.
 2017-05-08 15:29:37 +02:00
Phenom
79bbe0e5bb Fix Commit #77adc82 
Fix Missing messages when mark all as read.
 2017-05-08 14:54:25 +02:00
Phenom
5022ef00d4 Fix Warnings: this ‘if’ clause does not guard... 
warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
     if(!mPosterId.isNull())
     ^~
 2017-05-08 12:26:37 +02:00
Phenom
f352939154 Fix Warnings: 
warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
     if(! rsIdentity->getIdDetails(gxs_id,details))
     ^~
 2017-05-08 12:25:29 +02:00
Phenom
bf47edfd12 Fix Warnings: 
warning: this ‘if’ clause does not guard... [-Wmisleading-indentation]
             if(_hash.isNull())
             ^~
 2017-05-08 12:22:46 +02:00
csoler
9714409309 Merge pull request #802 from csoler/v0.6-ImprovedGUI 
moved passphrase box into start dialog, and removed blank logo, repla…
 2017-05-08 10:57:00 +02:00
csoler
de0f8b9595 moved passphrase box into start dialog, and removed blank logo, replaced it by RS splash logo 2017-05-08 10:51:15 +02:00
csoler
6cb499065f fixed compilation with qt4 2017-05-08 10:06:40 +02:00
csoler
84c81588bb disabled show OpMode status on default 2017-05-08 09:39:18 +02:00
defnax
24eca4a64f Moved status icon column to the last position 2017-05-07 19:39:20 +02:00
Gioacchino Mazzurco
5159e326c7 Merge branch 'master' into gxs_mail_experiments 2017-05-05 15:44:22 +02:00
csoler
6484ea66f7 improved graph widget 2017-05-04 21:19:23 +02:00
Phenom
07201e894c Fix FriendList Import/Export filename and error message. 2017-05-01 12:48:11 +02:00
csoler
1f56db5495 Merge pull request #790 from PhenomRetroShare/Add_CreateGxsIdentityByDefault 
Create a Gxs Identity by default.
 2017-04-30 22:45:18 +02:00
csoler
0c17570728 Merge pull request #792 from PhenomRetroShare/Add_DoubleClickOnTextBrowser 
Add Double Click on Name for Chat to add their name in text writer.
 2017-04-30 22:44:20 +02:00
csoler
3d17d31e49 Merge pull request #789 from PhenomRetroShare/Add_FriendTimeOffsetNewsFeed 
Add Friend Time Offset news feed.
 2017-04-30 22:43:10 +02:00
csoler
8aa9be334f Merge pull request #791 from PhenomRetroShare/Fix_MissingMessageMarkedRead 
Fix Missing messages when mark all as read.
 2017-04-30 22:39:07 +02:00
Phenom
4fbcc1e85f Add Double Click on Name for Chat to add their name in text writer. 2017-04-29 22:14:18 +02:00
Phenom
77adc82aa2 Fix Missing messages when mark all as read. 
If message get olders versions, these ones was not marked as read. So it
left unread messages on thread despite nothing appears on tree view.
 2017-04-29 17:32:23 +02:00
Phenom
8a9edb2905 Create a Gxs Identity by default. 2017-04-27 17:03:53 +02:00
Phenom
19b4fb892c Add Friend Time Offset news feed. 2017-04-27 16:42:25 +02:00
Phenom
9e246c9670 Add warning about relays bandwidth. 2017-04-25 18:39:36 +02:00
csoler
4d7bd833a9 Merge pull request #786 from PhenomRetroShare/Fix_RelaySettingValues 
Fix Relay setting values
 2017-04-25 10:14:50 +02:00
Phenom
078913f0f3 Fix GCC warnings: enumeration value ‘TYPE_IDENTITY’ not handled in 
switch

warning: enumeration value ‘TYPE_IDENTITY’ not handled in switch [-
Wswitch]
  switch (link.type()) {
         ^
 2017-04-25 09:54:53 +02:00
Phenom
593c0cb7e6 Fix CSA warnings: Called C++ object pointer is null 
Logic error: Called C++ object pointer is null
 1: Null pointer value stored to field 'mInternalTokenQueue' in /home/
phenom/GIT/RetroShare/trunk/retroshare-gui/src/gui/gxs/
GxsGroupDialog.cpp:70
 2: Calling 'GxsGroupDialog::init' in /home/phenom/GIT/RetroShare/trunk/
retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp:72
 3: Calling 'GxsGroupDialog::initMode' in /home/phenom/GIT/RetroShare/
trunk/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp:136
 4: Calling 'GxsGroupDialog::requestGroup' in /home/phenom/GIT/
RetroShare/trunk/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp:190
 5: Called C++ object pointer is null in /home/phenom/GIT/RetroShare/
trunk/retroshare-gui/src/gui/gxs/GxsGroupDialog.cpp:866
 2017-04-25 09:52:43 +02:00
Phenom
90aaace69c Fix CSA warnings: Called C++ object pointer is null 
Logic error: Called C++ object pointer is null
 1: Value assigned to field 'mMainAction' in /home/phenom/GIT/
RetroShare/trunk/retroshare-gui/src/gui/common/UserNotify.cpp:94
 2: Assuming pointer value is null in /home/phenom/GIT/RetroShare/trunk/
retroshare-gui/src/gui/common/UserNotify.cpp:95
 3: Called C++ object pointer is null in /home/phenom/GIT/RetroShare/
trunk/retroshare-gui/src/gui/common/UserNotify.cpp:103
 2017-04-25 09:52:01 +02:00
Phenom
1f16f46aad Fix CSA warnings: Called C++ object pointer is null 
Logic error: Called C++ object pointer is null
 1: Assuming pointer value is null in /home/phenom/GIT/RetroShare/trunk/
retroshare-gui/src/gui/common/MimeTextEdit.cpp:65
 2: Called C++ object pointer is null in /home/phenom/GIT/RetroShare/
trunk/retroshare-gui/src/gui/common/MimeTextEdit.cpp:83
 2017-04-25 09:51:08 +02:00
Phenom
30632dcfeb Fix CSA warnings: Called C++ object pointer is null 
Logic error: Called C++ object pointer is null
 1: Calling 'MainWindow::createNotifyIcons' in /home/phenom/GIT/
RetroShare/trunk/retroshare-gui/src/gui/MainWindow.cpp:291
 2: Loop body executed 0 times in /home/phenom/GIT/RetroShare/trunk/
retroshare-gui/src/gui/MainWindow.cpp:600
 3: Calling 'MainWindow::updateTrayCombine' in /home/phenom/GIT/
RetroShare/trunk/retroshare-gui/src/gui/MainWindow.cpp:605
 4: Value assigned to field 'notifyMenu' in /home/phenom/GIT/RetroShare/
trunk/retroshare-gui/src/gui/MainWindow.cpp:654
 5: Assuming pointer value is null in /home/phenom/GIT/RetroShare/trunk/
retroshare-gui/src/gui/MainWindow.cpp:658
 6: Called C++ object pointer is null in /home/phenom/GIT/RetroShare/
trunk/retroshare-gui/src/gui/MainWindow.cpp:679
 2017-04-25 09:50:14 +02:00
Phenom
f22dc0f0df Fix Clang warnings: unused variable 'action' 
warning: unused variable 'action' [-Wunused-variable]
                                QAction *action = contextMenu-
>addAction(QIcon(":/images/chat_24.png"),tr("Copy identity to
clipboard"),this,SLOT(copyRetroshareLink())) ;
 2017-04-25 09:45:57 +02:00
Phenom
490f8d2f54 Fix Clang warnings: 'TYPE_IDENTITY' not handled 
warning: enumeration value 'TYPE_IDENTITY' not handled in switch [-
Wswitch]
 2017-04-25 09:45:27 +02:00
Phenom
1327582096 Fix Relay setting values 
Was multiply by 1024 then divide by 1000.
 2017-04-24 17:28:25 +02:00
defnax
6313d89718 Improved look n feel of Profile Generation Window. 2017-04-24 01:23:05 +02:00
Phenom
4c326f5e80 Fix Relay setting page. 2017-04-23 10:27:18 +02:00
defnax
0e087db807 Fixed to use right icons for context menu actions 2017-04-22 17:32:59 +02:00
Phenom
969b5ce1f1 Fix MacOSX compilation. 2017-04-21 15:57:57 +02:00
csoler
5f8bf03dfe added mechanism to allow services to document the names of their items, and improved bandwidth graph to show names for GXS services. Other services still need to supply their own names 2017-04-20 20:54:51 +02:00
csoler
f406b81238 removed all FFT code and cleaned up deleted code in graphwidget.cpp 2017-04-19 18:46:58 +02:00
csoler
1da89dd70d changed FFT code in graph widget into a more efficient one, with free licence 2017-04-19 17:16:30 +02:00
csoler
e95ddb91af Merge pull request #767 from PhenomRetroShare/Fix_CommentWithLineReturn 
Fix comment view when they have line return.
 2017-04-18 20:28:36 +02:00
Phenom
3c5e61a297 Encode Radix in RSLinks. 
Because it can contains special characters like '+', '/'.
But this is not backward compatible.
 2017-04-18 17:36:43 +02:00
Phenom
4f939b2b76 Fix Clang warnings: unused function 'set_item_background' 
warning: unused function 'set_item_background' [-Wunused-function]
static void set_item_background(QTreeWidgetItem *item, uint32_t type)
 2017-04-17 22:01:28 +02:00
Phenom
0bbd1499d4 Fix Clang warnings: comparison of integers of different signs 
warning: comparison of integers of different signs: 'uint32_t' (aka
'unsigned int') and 'int' [-Wsign-compare]
        for(uint32_t i=0;i<(*it).size();++i)
                         ~^~~~~~~~~~~~~
 2017-04-17 21:54:49 +02:00
Phenom
a476a8138c Fix Clang warnings: function 'update_children_background' is not needed 
warning: function 'update_children_background' is not needed and will
not be emitted [-Wunneeded-internal-declaration]
static void update_children_background(QTreeWidgetItem *item, uint32_t
type)
            ^
 2017-04-17 21:53:57 +02:00
Phenom
d8a73132c1 Fix Clang warnings: implicit conversion from 'double' to 'int' 
warning: implicit conversion from 'double' to 'int' changes value from
0.5 to 0 [-Wliteral-conversion]
    painter.setPen(QColor::fromRgb(0.5,0.5,0.5));
 2017-04-17 21:51:08 +02:00
Phenom
94ac8216f7 Fix Clang warnings: Unused variable Pi 
warning: unused variable 'Pi' [-Wunused-const-variable]
static const double Pi = 3.14159265358979323846264338327950288419717;
 2017-04-17 21:47:38 +02:00
Phenom
fd92bca688 Fix Clang warnings: variable 'layout' is used uninitialized 
warning: variable 'layout' is used uninitialized whenever 'if' condition
is false [-Wsometimes-uninitialized]
                if (wid) layout =
 2017-04-17 21:46:42 +02:00
Phenom
8d85cf558b Fix Clang warnings: 'xxxWidget::sizeHint' hides overloaded vf 
warning: 'IdentityWidget::sizeHint' hides overloaded virtual function [-
Woverloaded-virtual]
        QSize sizeHint();
warning: 'CircleWidget::sizeHint' hides overloaded virtual function [-
Woverloaded-virtual]
        QSize sizeHint();
/usr/include/qt4/QtGui/qwidget.h:537: hidden overloaded virtual function
'QWidget::sizeHint' declared here: different qualifiers (const vs none)
    virtual QSize sizeHint() const;
 2017-04-17 21:46:11 +02:00
Phenom
6f2d7bbca0 Fix Clang warnings: implicit conversion from 'double' to 'int' 
warning: implicit conversion from 'double' to 'int' changes value from
2.5 to 2 [-Wliteral-conversion]
        QSize buttonSize = QSize(iconSize + QSize(FMM,FMM));
 2017-04-17 21:42:13 +02:00
Phenom
07b67e9cc9 Fix Clang warnings: 'PopupDistantChatDialog::init' hides overloaded 
virtual function

warning: 'PopupDistantChatDialog::init' hides overloaded virtual
function [-Woverloaded-virtual]
                virtual void init(const DistantChatPeerId& peer_id);
/retroshare-gui/src/gui/chat/PopupChatDialog.h:49: hidden overloaded
virtual function 'PopupChatDialog::init' declared here: different number
of parameters (2 vs 1)
        virtual void init(const ChatId &chat_id, const QString &title);
 2017-04-17 21:41:38 +02:00
Phenom
eea49d96bf Fix Clang warnings: change ChatDialog::init definition 
warning: 'PopupChatDialog::init' hides overloaded virtual function [-
Woverloaded-virtual]
    virtual void init(const ChatId &chat_id, const QString &title);
                 ^
/retroshare-gui/src/gui/chat/ChatDialog.h:87: hidden overloaded virtual
function 'ChatDialog::init' declared here: type mismatch at 1st
parameter ('ChatId' vs 'const ChatId &')
    virtual void init(ChatId id, const QString &title);
                 ^
 2017-04-17 21:40:25 +02:00
Phenom
9319caffc7 Fix Clang warnings: 'Node::advance' hides overloaded virtual function 
warning: 'Node::advance' hides overloaded virtual function [-
Woverloaded-virtual]
    bool advance();
         ^
/usr/include/qt4/QtGui/qgraphicsitem.h:323: hidden overloaded virtual
function 'QGraphicsItem::advance' declared here: different number of
parameters (1 vs 0)
    virtual void advance(int phase);
                 ^
 2017-04-17 21:39:44 +02:00
Phenom
13c8f7d342 Fix Clang warnings: Infinite recursion 
warning: all paths through this function will call itself [-Winfinite-
recursion]
{
^
 2017-04-17 21:38:41 +02:00
Phenom
e0225efef3 Fix Clang warnings: 'ChatLobbyDialog::init' hides overloaded virtual 
function

warning: 'ChatLobbyDialog::init' hides overloaded virtual function [-
Woverloaded-virtual]
    virtual void init();
                 ^
/retroshare-gui/src/gui/chat/ChatDialog.h:87: hidden overloaded virtual
function 'ChatDialog::init' declared here: different number of
parameters (2 vs 0)
    virtual void init(ChatId id, const QString &title);
                 ^
 2017-04-17 21:37:17 +02:00
Phenom
de4f6c06dd Fix Clang warnings: Z-order assignment to spacer 
warning: Z-order assignment: 'verticalSpacer_2' is not a valid widget.
 2017-04-17 21:36:14 +02:00
Phenom
e83104ee0f Fix Clang warnings: Add author and date to #warning 2017-04-17 21:32:14 +02:00
csoler
b2e37fe47e Merge pull request #773 from csoler/v0.6-Identity 
V0.6 identity
 2017-04-15 20:24:06 +02:00
csoler
273aae7cc1 fixed sharing of own identity 2017-04-15 19:01:13 +02:00
csoler
3130ec9041 added GUI async call to ID serialised data. Allows to copy+paste identities. 2017-04-10 20:02:14 +02:00
electron128
4c9b62070f fixed --base-dir command line argument in rs-gui when running multiple instances. 
Only forward "link" and "rsfile" arguments to a running instance.
Start a new instance if other arguments are present.
 2017-04-09 10:26:18 +02:00
electron128
7f12ca266b fixed name of local socket where RS waits for rslinks etc. 2017-04-09 09:57:48 +02:00
csoler
54cd402f1c fixed a few bugs in latest identity link code 2017-04-08 21:43:07 +02:00
csoler
6d290389f0 added RSLink for GXS identities 2017-04-08 21:12:48 +02:00
Phenom
f175533d8d Fix comment view when they have line return. 
Before, they grow row height but only show 2 lines.
Now, height stay at one line, but tooltip show the correct message.
 2017-04-08 14:06:47 +02:00
csoler
dbcf2d2149 Merge pull request #756 from RetroPooh/guistuff 
minor gui stuff
 2017-03-25 20:27:18 +01:00
csoler
ccb632a442 Merge pull request #749 from PhenomRetroShare/Fix_WindowsHeightAtFirstStart 
Fix windows height at first start.
 2017-03-25 19:26:12 +01:00
RetroPooh
f5e7217bb4 statistics - router - fix bold marking for tunnel speeds over 1mbs 2017-03-21 17:24:59 +03:00
RetroPooh
85cfda1963 add tree item counters for channels,forums,posted 2017-03-21 16:52:40 +03:00
RetroPooh
50c81d7142 chat lobby list - mark signed lobbies with color 2017-03-21 16:41:39 +03:00
RetroPooh
000dabfaed chat lobby list - add tree item counters 2017-03-21 15:02:46 +03:00
RetroPooh
19bd51dfae searchdialog - mark current downloads green 2017-03-21 14:57:06 +03:00
csoler
ca0521cb2d allowed to edit subject hen editing forum posts. Only the latest subject is visible 2017-03-16 21:01:27 +01:00
Phenom
107d48f1b8 Fix windows height at first start. 2017-03-15 23:00:22 +01:00
csoler
2046dbede9 merged latest fixes from official 0.6.2 release branch 2017-03-15 20:53:01 +01:00
csoler
e4fad4530d fixed layout in ConfCertDialog, removed overnumerous tabs 2017-03-15 20:51:40 +01:00
csoler
21143742fd fixed update of Tor proxy address in hidden nodes server page 2017-03-15 19:26:07 +01:00
csoler
44f297156e Merge pull request #682 from csoler/v0.6-EditPosts 
V0.6 edit posts
 2017-03-14 20:04:22 +01:00
Gioacchino Mazzurco
2630ed4573 Merge branch 'master' into gxs_mail_experiments 2017-03-13 22:57:33 +01:00
thunder2
733b1143ba Updated languages from Transifex 2017-03-10 15:57:40 +01:00
mestaritonttu
999e845bdf Fix grammar 2017-03-08 13:17:34 +02:00
csoler
e6cf628fb3 Merge pull request #740 from RetroPooh/trstats 
router stats - mark active tunnels bold
 2017-03-07 21:58:59 +01:00
csoler
283a2ee5fe Merge pull request #717 from PhenomRetroShare/Fix_SettingListWidth 
Fix Setting list width.
 2017-03-07 21:54:56 +01:00
csoler
bbc27b2265 Merge pull request #736 from mestaritonttu/patch-18 
Added whitespace to strings
 2017-03-07 21:53:21 +01:00
csoler
ed22b48db9 Merge pull request #738 from mestaritonttu/patch-20 
Various improvements and fixes to strings
 2017-03-07 21:51:51 +01:00
csoler
376be42950 Merge pull request #739 from mestaritonttu/patch-21 
Improvements and typo fixes in strings
 2017-03-07 21:51:13 +01:00
csoler
b3578f6a46 Merge pull request #734 from mestaritonttu/patch-16 
Remove whitespace from string
 2017-03-07 21:50:20 +01:00
csoler
d9c084bc0d Merge pull request #730 from mestaritonttu/patch-12 
Fix grammar
 2017-03-07 21:49:52 +01:00
csoler
ec21698dcd Merge pull request #727 from mestaritonttu/patch-9 
Added period
 2017-03-07 21:48:30 +01:00
csoler
7d8e06b050 Merge pull request #732 from mestaritonttu/patch-14 
Clarify sorting by posts
 2017-03-07 21:47:43 +01:00
csoler
f3e29bd754 Merge pull request #731 from mestaritonttu/patch-13 
Fix grammar
 2017-03-07 21:47:00 +01:00
csoler
17c44db7e1 Merge pull request #733 from mestaritonttu/patch-15 
Fix typo
 2017-03-07 21:46:21 +01:00
csoler
5f9f0617e5 Merge pull request #735 from mestaritonttu/patch-17 
ASCII uppercase
 2017-03-07 21:45:50 +01:00
csoler
8881a44db6 Merge pull request #737 from mestaritonttu/patch-19 
Remove extra your
 2017-03-07 21:45:11 +01:00
csoler
160c289e6f Merge pull request #728 from mestaritonttu/patch-10 
Removed extra "to"
 2017-03-07 21:44:42 +01:00