Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-13 18:04:34 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
13,766 Commits 63 Branches 22 Tags 195 MiB
33236aeca3
Commit Graph

272 Commits

Author SHA1 Message Date
RetroPooh
328168d9a7 add space after quoting sign 2017-03-02 20:03:16 +03:00
csoler
ee9fbefd76 added signal blockign trick for widgets, and fixed the bug causing wrong values to be displayed in server settings 2017-02-27 22:29:01 +01:00
hunbernd
d0ab10cc38 Fix slow emoticons by using generic regex rules where possible. 2017-02-05 22:06:36 +01:00
csoler
34962c343a added a checkbox to load emoticons in forums as an option, so as to avoid crazy loading times. Disabled by default until we fix the RsHtml code 2017-01-18 21:22:38 +01:00
Phenom
40cf76808c Fix compilation and some new warnings. 2016-12-21 21:23:54 +01:00
csoler
8de9ee8b8d made friendly time unit returns empty string when time is 0. Fixes 46y display in search dialog 2016-12-19 23:29:04 +01:00
Phenom
ae8365167e Add grouped emoticons. 2016-11-23 18:48:16 +01:00
felisucoibi
628177c302 fix for windows compile 2016-11-16 11:22:23 +01:00
felisucoibi
ddff9f5358 Improved total file size and a small bug with a comma in TB string of file size 2 CLEANED CODE 2016-11-16 11:03:02 +01:00
csoler
8c8cc88503 fixed problems with negative time shifts in DirDetails causing multiple GUI bugs in File Lists and Search 2016-11-14 21:58:58 +01:00
Phenom
2827233880 Fix windows Compil with sys/socket.h 2016-11-08 23:04:34 +01:00
Gio
ea42d822c2 Merge branch 'master' into android 2016-10-26 13:43:24 +02:00
Phenom
fd5a5cc804 Fix PR#540 2016-10-24 20:11:47 +02:00
Phenom
58a4d39b0f Fix handle of url in EmbedInHtmlAhref. 
The url cannot contains space. Query and hash are now handled.
 2016-10-22 14:48:47 +02:00
Phenom
fdfd2e9248 Add context menu to show hidden image on lobby. 
A tooltip show hidden image too.
The RSImageBlockWidget is removed.
 2016-10-05 12:27:31 +02:00
Gio
9a980def2c libretroshare now compiles for Android, instruction on how to do it included 2016-08-23 12:15:28 +02:00
csoler
5a55de5ec8 added missing DontUseNativeDialog flag in misc.cpp 2016-08-04 22:01:30 +02:00
Phenom
6935441e4f Fix other QFileDialog call in misc adding DontUseNativeDialog option. 2016-07-31 16:23:41 +02:00
csoler
1707c07937 added DontUseNativeDialog as default flag in file dialog in order to avoid some crashed when not using it 2016-07-29 21:58:59 +02:00
Phenom
ddbcd2150c Add buttons to send message in plain text and without EmoteIcon. 2016-06-14 23:01:08 +02:00
csoler
d6ae71ebc8 removed pointer to QStringList in QHash, causing memory loss 2016-04-20 20:21:29 -04:00
Chuck Rhode aka Manuel Davis
5645e44f9c Change regular expression(s) for identifying hotlinks in feral text. 2016-04-19 11:32:56 -05:00
csoler
d512c4a35a enabled new link type for posted (patch from Fanch) 2016-04-12 22:59:12 -04:00
Phenom
10bb542e83 Allow only one instance for useLocalServer option activated. If exists, 
pass to it arguments.

For now, only allow to pass RsCollection file and retroshare://
protocol.
 2016-04-06 22:04:53 +02:00
csoler
6c8737c84a merged with upstream/master 2016-03-25 21:09:37 -04:00
csoler
d1b09b93b9 removed some debug info 2016-03-25 18:54:13 -04:00
csoler
4e0ee29d6a fixed creation/distribution of self-restricted circles 2016-03-17 20:18:54 -04:00
csoler
b6388d7a7a fixed update of GUI when circles change 2016-03-17 18:17:58 -04:00
csoler
36edde6d25 fixed bug causing GUI to not auto-unsubscribe in circles 2016-03-16 23:30:23 -04:00
Phenom
16c59af9f4 Correct Colored Name Contrast in chat, same way than text. 2016-03-12 13:25:10 +01:00
Phenom
1d2be232f0 Fix Quote Lines With Image 
When get text with image from toPlainText(), a (-4) char is inserted.
 2016-01-23 18:38:30 +01:00
sehraf
54f9912c32 Add whitespaces around smileys. 
Only replace smileys with an image when they are surrounded by whitespaces.
This fixes smileys in links and other text that happen to include the sequence for a smiley.
 2016-01-05 15:01:22 +01:00
electron128
3b2eae4f49 fixed memory leak by using stack memory instead of heap memory 2016-01-01 12:17:08 +01:00
Phenom
162b5fa2eb Fix colored font in chat. 
Colored styles were replaced by emoticons.
 2015-12-26 15:57:46 +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
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
ff44965e2c Added save image function into chat 2015-12-06 23:00:29 +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
defnax
5404cda302 Added Forum reply with plaintext quote (by anmo) 2015-11-19 12:05:52 +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
Sergei Reznikov
34758be52a Add Haiku support 2015-10-20 20:32:44 +03: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
Phenom
3f155b9b75 Add minimum font size in chat. 2015-09-13 17:35:19 +02:00
Thunder
de92c06f0b Merge pull request #62 from hunbernd/qt5-fix 
Qt5 fix
 2015-08-31 12:05:08 +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
Phenom
88a6931758 Allow Chat Text Format Option working. 2015-08-29 19:27:03 +02:00
Phenom
02775c6fb4 Add HTML Text Optimization by exporting styles. 2015-08-20 17:55:20 +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
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