Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,732 Commits 63 Branches 22 Tags 194 MiB
941959cc86
Commit Graph

172 Commits

Author SHA1 Message Date
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
c3b794afb2 Fixed compile with Qt 5 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8555 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-26 08:14:09 +00:00
csoler
d81a1c3900 removed useless debug info 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8548 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-23 19:36:47 +00:00
thunder2
846d5f4f50 Optimized fill of feed items by moving the fill of the hidden area to the first expand of the frame. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8514 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-17 18:59:12 +00:00
csoler
a49b1c7c0c removed debug output 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8373 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-04 20:24:29 +00:00
thunder2
9bef4502b1 Added feed item to notify a blacklisted ip address. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8346 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-02 21:36:26 +00:00
csoler
77a33cd445 removed unnecessary debug output 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8153 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-04-21 20:09:20 +00:00
electron128
d65adeb2ea disabled debug print of DHT requests, disabled debug print in p3Peers::getProxyServer(), added missing newlines in debug prints (modified patch from Hypfer) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8084 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-27 18:41:44 +00:00
electron128
6dff335515 use notify for gxs events. Removed the previous polling based system. Now multiple clients can receive gxs changes. This also fixes the always growing changes queue in rs-nogui. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8057 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-20 10:39:17 +00:00
csoler
6ef761e4e5 added jpeg format to thumbnail creation/loading (patch from cave) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8012 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-03-11 20:20:32 +00:00
csoler
481ee246b5 added avatars to identities. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7875 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-25 22:09:12 +00:00
thunder2
f02948c54c Removed timeout of waiting tokens in TokenQueue (gui) and increased timeout of requests in libretroshare from 30 seconds to 2 minutes. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7873 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-25 12:29:33 +00:00
thunder2
94ec83fcdb Removed version files from retroshare-gui. 
Moved header file with version information to retroshare/rsversion.h.
Added version information to Windows executable.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7845 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-01-14 23:26:51 +00:00
thunder2
a8b08c9957 Optimized polling in TokenQueue 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7748 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-11 22:40:03 +00:00
defnax
b11459329b * Moved to display own video at bottom and Friend at top. 
* Added to display system message text when call is stopped.
* Fixing spaces on chat window.
* Clean up chatwidget buttons, moved text color to the font menu button

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7731 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-12-06 14:21:36 +00:00
csoler
b593a918a0 optim: changed postfixed ++ into prefix++ for non trivial operators, replaced test on std::list::size() by std::list::empty() (Patch from Phenom, modified) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7627 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-10-21 22:33:02 +00:00
thunder2
e07dac9ca7 Show channel logo in group tree 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7528 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-09-11 22:07:06 +00:00
defnax
ff366f0ec2 Added Phenom's Patch Fix_NonBreakingSpace_0.6_7480.patch 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7486 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-08-07 23:07:16 +00:00
thunder2
d20ce41c96 - Removed all usages of the old windows icon (rstray3.png) and used the standard icon of the application 
- Added possibility to change the icon of the GxsGroupDialog

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7471 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-24 23:26:04 +00:00
thunder2
60a67846b0 Added notify of meta changes to RsGenExchange 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7428 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-07-04 21:51:17 +00:00
defnax
e65f73a44d Added new Patch from Phenom (AddRSCollectionEditor_v0.6_7386) 
Some Improvements : added submenu, Edit and view mode.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7388 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-05-29 14:49:45 +00:00
thunder2
07e57836bf Merged revision 7165 from v0.5.5 
Create a hard link for preview on Windows with the real name of the downloading file


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7309 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-04-28 23:20:29 +00:00
defnax
b785132cbe Fixing layout changes in Id Edit Dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7113 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-02-13 11:55:14 +00:00
drbob
08f442d65b updated version. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7065 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-28 09:03:34 +00:00
csoler
037abea5eb Fixed spaces in copy/paste of rich text (Patch from Phenom) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7035 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-18 22:55:14 +00:00
csoler
735eb7a5c6 updated version numbers 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7026 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-17 17:53:12 +00:00
thunder2
a0f6b6f36c Fixed version file rsguiversion.in 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6934 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-08 14:38:35 +00:00
csoler
f6bdbd5e21 removed HandleRichText.cpp from last commit 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6931 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-08 13:52:47 +00:00
csoler
6380f6121c moved defines for version to .h, as it is super hard to script the replacement of the defines in the cpp file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6930 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-08 13:50:10 +00:00
csoler
fc56b95d3f show fingerprint in ConfCertDialog, and splitted the string with spaces. Removed the use of the ambiguous peer id for both pgp and locations ids 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6900 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-09 22:52:26 +00:00
thunder2
a20109a8ee Fixed version files (*.in) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6894 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-11-05 23:53:39 +00:00
drbob
bd0b1a5ac5 Updated SVN revision number for v0.5.5b. 
Moved #defines to code files for better encapsulation.
Removed other references to #defines.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6877 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-25 00:42:49 +00:00
thunder2
f10f029d45 Code maintenance for Qt 5: 
- Added usage of QUrlQuery
- Removed QSound::isAvailable()
- Changed Qt::escape() to QString::toHtmlEscaped()
- Changed QAbstractItemModel::setSupportedDragActions() to virtual QAbstractItemModel::supportedDragActions()

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6851 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-19 20:59:55 +00:00
thunder2
6dbcc3e99b Code maintenance for Qt 5: 
- Added new options to retroshare-gui.pro for Qt 5
- Added new file QtVersion.h with macros to compile with Qt 4 and Qt 5
  - QHeaderView::setResizeMode -> QHeaderView::setSectionResizeMode
  - QHeaderView::setMovable -> QHeaderView::setSectionsMovable

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6849 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-19 13:25:06 +00:00
thunder2
3e15a7bb86 Code maintenance for Qt 5: 
- Fixed some missing headers
- Fixed some deprecated functions

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6845 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-19 02:07:01 +00:00
thunder2
135a5e579a Code maintenance for Qt 5: 
- Replaced Qt::WFlags with Qt::WindowFlags.
- Removed path "QtCore/" and "QtGui/" from the includes.
- Replaced "QString::toAscii()" with "QString::toLatin1()".

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6843 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-18 21:10:33 +00:00
csoler
48839249c0 changed version string to 0.5.5b 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6826 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-13 12:23:00 +00:00
csoler
a9290e9dd7 fixed image resizing for channel thumbnails. Apparently there is a bug in Qt preventing Qt::KeepAspectRatioByExpanding to work correctly 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6800 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-10-04 19:40:29 +00:00
thunder2
961f079882 Fixed version number (*.in) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6727 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-10 21:10:11 +00:00
drbob
894c2d965e fixed version number. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6723 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-09 05:03:26 +00:00
thunder2
3879622fb9 Fixed version number in retroshare-gui 
Updated english translation

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6713 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-08 10:15:12 +00:00
csoler
2cca7a3b02 updated version number to 0.5.5 prior to release 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6703 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-09-07 08:21:13 +00:00
csoler
57ed22910d updated version numbers 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6572 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-08-09 16:54:30 +00:00
thunder2
f4ee02bb01 TokenQueue: 
- fixed stop of TokenQueue polling when events are locked

RsProtectedTimer:
- switched to faster poll when events are locked


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6507 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-16 00:03:20 +00:00
thunder2
621c8037bc GXS: 
- added three new classes for automatic refresh of ui
  - RsGxsUpdateBroadcastBase
  - RsGxsUpdateBroadcastWidget
  - RsGxsUpdateBroadcastPage
- prevent call to :singleShot on RsProtectedTimer
- extend RsGxsUpdateBroadcast
- added automatic refresh to Identity and Forums (except subscribe/unsubscribe)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6503 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-14 18:48:40 +00:00
thunder2
f02cc51409 Identity: 
- Redesigned dialog
- Fixed high CPU usage when showing reputation list
- Added todo button

UIStateHelper:
- Added new base class for easier handling of ui elements with token request (show "Loading", set enable state, ...)

RsProtectedTimer:
- Fixed compile on Windows

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6495 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-10 21:57:23 +00:00
csoler
e36557d542 added Specific protected timer class RsProtectedTimer to avoid passwd deadlock. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6494 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-10 21:11:11 +00:00
thunder2
249f2ff2e0 Added new method cancelActiveRequestTokens to TokenQueue. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6492 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-09 11:57:57 +00:00
thunder2
30c4a6ef93 Added quick fix to show the plain name and title in the chat lobby. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6470 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-07-01 20:35:07 +00:00
thunder2
27d72c6fba Fixed some compiler warnings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6421 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-06-10 13:27:24 +00:00