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
2,443 Commits 63 Branches 22 Tags 194 MiB
00e5dc311f
Commit Graph

148 Commits

Author SHA1 Message Date
leander-256
988c6c31f5 Fixes two problems in the current group chat: 
- the parser fails to embed two links in the same sentence
- the parser can potentially put smileys in the middle of <a> tags

Solution:
Since the message is in HTML, it is parsed into a DOM tree, then that DOM tree
is traversed and only the text nodes are parsed (see HandleRichText.cpp for
details).

Bonus fixes:
- missing std:: for endl (which was falling back to its Qt counterpart)
- commenting useless code in PeersDialog::smileyWidgetgroupchat()
- replacing int by size_t
- RetroShare.pro now queries gpgme-config for its include path


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2888 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-12 00:17:10 +00:00
defnax
8feeb2adb3 Added Chat Settings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2845 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-03 21:17:36 +00:00
csoler
bffcbfe467 fixed the sorting of SearchDialog by age and by size, by using proper delegates for displaying the numbers. Removed the SR_REALSIZE_COL column, that is no longer necessary. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2840 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-02 21:37:54 +00:00
defnax
996e930f70 removed newsettings define from project file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2838 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-02 20:15:02 +00:00
chrisparker126
8957fb919c - added creatchannelmsg source to pro file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2832 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-05-02 13:07:26 +00:00
chrisparker126
b2213e15e6 new idle status feature added 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2800 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-27 12:30:46 +00:00
defnax
fbd46c062e disabled version_detail_bash_script from project file, this makes lots of trouble for new Developers or which want compile first time RetroShare. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2751 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-21 11:45:22 +00:00
csoler
c6c8e63e91 ported branch commits 2666-2668, 2670-2672, 2679, 2682-2683 into trunk 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2702 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-10 14:56:34 +00:00
defnax
92df7037b2 Added ShareDialog for ShareManager 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2693 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-04-08 16:33:10 +00:00
defnax
9acfe64d97 enabled updated Danish translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2641 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-26 16:20:12 +00:00
defnax
1fdb4a31e6 forget to add this 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2598 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-22 22:06:08 +00:00
defnax
6b71666284 update translation strings, and add section to project file to update unfinished translations files easy 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2597 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-22 21:59:33 +00:00
defnax
26afeccacb clean up unfinished, removed not useful sources 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2572 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-17 12:52:42 +00:00
defnax
9634f5e6fc disabled unfinished translations. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2571 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-17 12:30:57 +00:00
csoler
cc17744ee3 ported branch v0.5.0 commits 2529 and 2544 to trunk 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2545 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-15 12:57:08 +00:00
defnax
42184efe70 fixed to get work again Chinese language , and load now Qt translations for widgets 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2520 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-12 00:16:39 +00:00
csoler
a657def956 cleaned the RS link code, factorized the parsing into a single class. Still missing: copy/paste of multiple links 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2514 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-10 21:38:26 +00:00
defnax
edb4562ae4 clean up languages and corrected few languages 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2499 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-07 22:42:41 +00:00
joss17
6c686496a9 reengineered the network dialog insert connect method 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2492 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-06 21:30:18 +00:00
defnax
323b96cc04 added BlogDetails to Blogs, added context menu actions for subscribe/unsubscribe 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2463 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-28 21:26:46 +00:00
defnax
1ee9a6ae0d added for blogs own define to project file and set on MainWindow the defines for Blogs, added to function for Messages icon 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2423 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-25 13:12:18 +00:00
defnax
7cba8b3b6b clean up blogs from project file added to the unfinished section for compiling 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2413 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-24 12:58:24 +00:00
drbob
f2f23e7ece Modifications to get it compiling under MacOSX. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2345 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-16 23:08:48 +00:00
csoler
5db2d85ad6 restored this file in proper workign state 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2320 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-14 15:50:10 +00:00
joss17
94aa902a95 clean the qmake files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2318 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-14 14:18:53 +00:00
andrewsteinborn
be92a7941a added "make install" target -- configurable at qmake run w/ PREFIX=/whatever qmake -o Makefile before build 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2270 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-10 08:00:31 +00:00
defnax
57454e0486 removed not needed sources 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2226 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-07 14:24:51 +00:00
chrisparker126
f9a66766bf script for blogs to .pro file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2184 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-03 23:09:55 +00:00
defnax
309e88e6b7 Added to send own Shared File as link to Public Chat 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2169 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-01 14:47:54 +00:00
defnax
fb5bbf2e96 Added TransferPage to Settings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2140 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-01-27 20:24:49 +00:00
defnax
6cb925016a little improvements for Compose Messsage, 
added Blockquote,Increase font size,Decrease font size,text font to code style Buttons
added when reply to a message set TextCursor to End.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2123 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-01-25 14:03:38 +00:00
defnax
28a1244a1b Added Attach File feature for Messages 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2099 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-01-20 21:39:27 +00:00
defnax
3a1c6ed76f Added ChannelDetails for Channel Informations 
Added Context Menu for Channelist for open ChannelDetails


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2095 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-01-20 00:29:40 +00:00
defnax
a44d28d7de Added a new CreateChannelMsg Dialog as replacement for GeneralMessage for Channels. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2070 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-01-18 21:02:16 +00:00
defnax
b05dbc80e4 Added Quick Start Wizard 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1982 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-01-08 13:00:00 +00:00
defnax
5008cfdf25 Added DetailsDialog for Transfers 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1978 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-01-06 00:10:15 +00:00
defnax
65b35e8c53 Added Forum Details Dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1961 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-01-02 15:47:07 +00:00
defnax
e919981e00 * added a about dialog 
* quit RetroShare with rApp not more use qApp for quit, shutdown is now faster.
* added first retranslateUi for MainWindow
* changend Add Share string.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1944 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-31 02:23:02 +00:00
csoler
f4a2eaecce - implemented a visualisation for currently handled chunks, availability maps, and transfer info 
- implemented transfer protocol for chunk availability maps between peers (not enabled yet though)
- suppressed rsiface directory from retroshare-gui
- moved notifyqt.{h,cpp} to gui/

next moves: 
	- send availability maps to clients; 
	- connect turtle search to unfinished files;
	- test multisource download with unfinished files.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1939 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-28 21:11:00 +00:00
defnax
bbe773b91c removed not needed old Preferences 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1876 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-14 17:13:10 +00:00
joss17
61c570b0f0 remove DHT from the gui 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1873 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-14 13:47:04 +00:00
joss17
fdb3673ce2 Add the tunneling connection. Warning, encryption is not implemented yet for tunnel connection, use only for testing. 
Redesign the udp connection
Remove the rsiface duplicates from retroshare-gui.
Add some randomness in timings for connect manager

Merge branch 'connectionTunneling'

Conflicts:
	libretroshare/src/libretroshare.pro
	libretroshare/src/pqi/p3connmgr.cc
	retroshare-gui/src/RetroShare.pro
	retroshare-gui/src/rsiface/rsfiles.h
	retroshare-gui/src/rsiface/rstypes.h

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1867 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-13 21:59:26 +00:00
defnax
ff8befbb2c fixed RetroShare.pro 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1861 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-06 12:03:29 +00:00
defnax
ecac6008bc added unfinished section to compile unfinished examples and prototypes 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1858 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-05 13:42:24 +00:00
defnax
5b35308f81 clean up, removed not needed old sources 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1844 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-23 20:46:03 +00:00
csoler
506f14eb2f - Added a parent page widget (class RsAutoUpdatePage) to handle auto-update. The page updates using a timer, only wh 
en visible, and each time it gets showed. I already made some RS pages derive from this page.
- Modified and renamed the taskGraphPainterWidget to display info about currently selected file transfers. For know, it only shows file chunks info, but we should use it to display additional info about the transfer. Warning: in its
 current state, only fake chunk info is displayed.
 - Suppressed p3files.h, because it is not used.

 Remains to do (in order):
 - Implement a chunk map class in ft/ to properly manage which chunks should be downloaded 
 - Display correct chunk info by requesting the transfer's chunk map
 - Add check-sum verification of chunks
 - allow RS to import a partially downloaded file by force re-checking chunks
 - Add chunk map exchange from file source peer id to file destination peer id.
 - Manage chunks from different peers.
 - Allow search (turtle search) for partially downloaded files 



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1832 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-17 12:45:06 +00:00
joss17
5a776b1eff removed unused library links for linux make 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1830 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-16 10:52:59 +00:00
defnax
97770a16f2 forget commit this 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1829 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-15 20:40:56 +00:00
defnax
e26c14573f added taskGraphPainterWidet 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1828 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-15 19:26:34 +00:00
joss17
efa84ef24d remove zlib dependance 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1815 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-11 22:13:36 +00:00