Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-15 02:44:20 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,911 Commits 63 Branches 22 Tags 195 MiB
1a76bea6ff
Commit Graph

4579 Commits

Author SHA1 Message Date
defnax
217c9b9538 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2015-08-26 19:20:32 +02:00
defnax
9d65b087d8 set default background color for system messages at private chat window 2015-08-26 19:19:24 +02:00
thunder2
da66ac5cff GxsGroupFrameDialog: Fixed restore of active group tree item when subscrube/unsubscribe a group. 2015-08-26 15:06:09 +02:00
Chozabu
185220b08f enable customisation of columns in forum thread widget 2015-08-25 22:59:38 +01:00
Cyril Soler
836b8668fc Merge pull request #37 from sehraf/pr-friendlist_import_export-V2 
friendlist import export
 2015-08-24 20:28:38 -04:00
AsamK
5ae5d76ffc Make file names consistent with packaging 
Rename executables:
RetroShare -> RetroShare06
retroshare-nogui -> RetroShare06-nogui

Add 06 suffix to icons and desktop file

Update README, debian rules and windows installer file
 2015-08-24 00:03:57 +02:00
AsamK
d4a36ed38b Make data and plugin directory configurable at compile time 
e.g.:
$ qmake PREFIX=/usr/local
$ qmake LIB_DIR=/usr/lib64

A full recompile is necessary when changing the PREFIX!
 2015-08-24 00:03:57 +02:00
AsamK
6b7a6e2313 Make RS installable with "make install" 2015-08-24 00:03:57 +02:00
Phenom
531ce34151 Merge branch 'master' into AddRetroShareLinkOpenFileWhenExists 2015-08-23 18:17:09 +02:00
Phenom
860292da12 Merge branch 'master' into AddHTML_TextOptimization_0.6 2015-08-23 18:16:43 +02:00
Phenom
70b9c456d5 Merge branch 'master' into Fix_ChatWidgetSearchTextThreshold 2015-08-23 18:09:30 +02:00
Phenom
79fb8dfe04 Merge branch 'master' into Fix_ChatWidgetLastCursorFormatting 2015-08-23 17:49:19 +02:00
Cyril Soler
e9aa4ff43b Merge pull request #3 from chozabu/copy_version_info_button 
add button to copy version info in first level about box
 2015-08-23 11:15:05 -04:00
sehraf
d1deef0733 fixed new lines in certificate string 2015-08-23 16:43:34 +02:00
Cyril Soler
7bd41e9fcb Merge pull request #4 from chozabu/grouter_stats_basic_names 
minor tweak to list friends in order they are shown on graph
 2015-08-23 10:15:10 -04:00
Phenom
023473443b When the file in the link already exists, RS open it. 2015-08-23 12:03:46 +02:00
sehraf
791fb78ed9 renaming details and details2 for better clarification 2015-08-23 09:58:31 +02:00
sehraf
ad499e6bd6 renamed 'pubkey' to 'certificate' and removed empty location names 2015-08-23 09:55:43 +02:00
Phenom
326a33059d Fix ChatWidget last cursor formatting. 
To test it, search a text that will be colored a end.
New messages lose their format.
 2015-08-22 17:38:35 +02:00
Phenom
c44afc092e Merge branch 'master' into Fix_ChatWidgetSearchTextThreshold 2015-08-22 17:02:43 +02:00
Phenom
b1fd29033b Merge branch 'master' into AddHTML_TextOptimization_0.6 2015-08-22 16:38:20 +02:00
Phenom
5c970100f1 Fix ChatWidget search text label threshold. 2015-08-22 16:31:08 +02:00
thunder2
334ddf8efc Enabled sort by columns other than name combined with sort by state in FriendList. 2015-08-22 00:57:26 +02:00
thunder2
176c3abd8c FriendSelectionWidget: 
- Added sort by state
- Moved buttons "All"/"None" into context menu

MessageComposer:
- Removed double details action
 2015-08-21 19:24:24 +02:00
thunder2
4923c47eb3 RSTreeWidget: 
- Added possibility to add own actions to header context menu
- Added resort of items
 2015-08-21 19:24:23 +02:00
Phenom
02775c6fb4 Add HTML Text Optimization by exporting styles. 2015-08-20 17:55:20 +02:00
sehraf
04a1c10a56 fixed UTF-8 group names 2015-08-19 19:12:38 +02:00
sehraf
941959cc86 conversion from QSettings to XML 2015-08-19 19:08:48 +02:00
thunder2
48c3eedcf5 Removed "CONFIG += console" for Windows release build. 2015-08-19 13:22:31 +02:00
thunder2
3b40f0e0c8 FriendList: 
- Show information of the "best" ssl item on the gpg item only when the gpg item is not expanded.
- Calculate the icon height from the font metrics
- Show the information text with normal font and color
 2015-08-19 11:04:50 +02:00
csoler
42bbf76035 fixed display of software revision in main window (patch from ASmith) 2015-08-18 20:21:45 -04:00
sehraf
80d765e1d6 small fix 2015-08-18 23:17:29 +02:00
sehraf
36349814a6 added import/export friendlist 2015-08-18 23:05:22 +02:00
Cyril Soler
f6b830d5aa Merge pull request #35 from hunbernd/chat-fix 
Chat fix. Thx for this.
 2015-08-15 21:46:22 -04:00
hunbernd
16859a1d3a Fix: chatlobby toaster not working 2015-08-15 23:37:33 +02:00
defnax
4a50a62cc8 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2015-08-14 12:38:36 +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
4095d9d5c9 Switched retrieve of posts in GxsMessageFramePostWidget from "requestMsgRelatedInfo" to "requestMsgInfo". 2015-08-13 22:09:46 +02:00
defnax
e66707111b Moved IP Filter Widgets into Tabs 2015-08-13 13:48:57 +02:00
defnax
7472f81940 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2015-08-11 17:01:53 +02:00
defnax
9d291aa6f6 update windows build scripts 
changed gxs id icon for linked with profile.
 2015-08-11 16:44:59 +02:00
thunder2
a765016240 Moved column show/hide from context menu of the tree to the context menu of the header in IdDialog. 2015-08-11 16:01:43 +02:00
thunder2
e73e68d860 Reduced the size of the status icon on the avatar image in FriendList. 2015-08-11 13:40:02 +02:00
defnax
783465bc89 forget to commit this, for the Search Filter DHT IPs 2015-08-10 18:27:29 +02:00
Cyril Soler
13e77fb7e5 Merge pull request #19 from sehraf/pr-fix_crash_on_shutdown 
Thx sehraf. Indeed, the object was created twice, before your patch. Not good.
 2015-08-09 17:04:24 -04:00
thunder2
9d0b0664f1 Fixed hide offline friends in ServicePermissionsPage 2015-08-09 22:30:47 +02:00
thunder2
c9197864c6 Fixed typo. 
Updated english translation.
 2015-08-09 15:52:26 +02:00
thunder2
d5c95c4b28 Fixed layout of the ServicePermissionsPage 2015-08-08 22:46:31 +02:00
thunder2
9265145ca7 Updated english translation 2015-08-08 21:14:02 +02:00
thunder2
87f2e6da37 FriendList: 
- Removed avatar column
- Removed state column
- Added combined avatar and status icon
- Added status icons in 64px
- Renamed "Hide state" to "Show state"
- Added sort by name and state

RSTreeWidget:
- Added version for load/save state
- Added method setColumnCustomizable
 2015-08-08 20:27:19 +02:00
AsamK
ef5fca5e5e Resolve nicks from gxsId in lobby chat history 2015-08-07 19:08:10 +02:00
defnax
c168765bb2 Added tab for the DHT TreeWidgets for better view 
Added a search Filter for DHT IP addresses
 2015-08-07 15:14:47 +02:00
sehraf
48bb8b48c9 sequel to 6b2ed2fb2d 2015-08-05 23:45:45 +02:00
thunder2
789df68582 - Added update of version information for Windows build 
- Added template file version.html.in
- Removed RS_BUILD_NUMBER from Windows executable FileVersion
 2015-08-04 15:15:49 +02:00
csoler
9e978e1442 updated version info to new hexa format 2015-08-02 19:10:59 +02:00
Chozabu
453415fd3e minor tweak to list friends in order they are shown on graph 2015-07-31 16:42:39 -04:00
Chozabu
69d23a4982 add button to copy version info in first level about box 2015-07-31 16:40:45 -04:00
electron128
9897def2cc fix #21 typo "defaut" instead of "default" in switch statement in RSGraphWidget (patch from Chozabu) 2015-07-31 17:27:04 +02:00
electron128
6b2ed2fb2d fix #20 crash on shutdown with plugins enabled. Settings window did leak plugin config pages (patch from hunbernd) 2015-07-31 17:26:52 +02:00
electron128
d004056f67 fixed position of scaled/highlighted nodes in node graph (patch from Chozabu) 2015-07-31 17:26:22 +02:00
electron128
a9ef48d133 webui: added chat 2015-07-31 17:26:11 +02:00
csoler
1939ea9f54 added correct image file for finished transfers 2015-07-31 17:25:54 +02:00
csoler
2a47095599 removed unused method for OutQueue statistics; improved BW curve display; fixed a few display bugs 2015-07-31 17:24:19 +02:00
csoler
685ddbbf0a fixed a few bugs in statistics GUI. Still misses names and proper curve display 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8612 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-31 17:23:31 +02:00
thunder2
c76141ed65 Added missing initialization in 
- pqissl
- pqissludp
- PeerConnectStateBox
- RsTlvBanListEntry
- RsServer
- TcpStream
- PGPCertificateInfo
- peerConnectAddress
- AudioInputConfig
- SpeexInputProcessor
- xProgressBar
- TBoard

Removed unused member:
- xProgressBar


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8611 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-13 11:03:18 +00:00
thunder2
2a6e1d0a8c Removed unused member from ProfileManager. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8609 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-13 08:27:49 +00:00
csoler
989f80786e saving current work on new bandwidth display. Still need to add names for services/peers, and use an appropriate curve style 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8608 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-13 03:04:36 +00:00
thunder2
9279cc17b1 Added missing restore of ostream format (std::dec) in CreateLobbyDialog::createLobby. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8606 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-12 22:00:10 +00:00
thunder2
737da1201d Fixed crash in ChatMsgItem::removeItem when "mParent == NULL". 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8605 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-12 21:56:12 +00:00
thunder2
a9094f8faf Fixed crash in ChatLobbyUserNotify::subMenuClicked when using "Remove All" of the chat lobby notifier. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8603 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-12 21:10:03 +00:00
electron128
951a1f9454 fixed wrong include line in ui file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8602 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-12 11:41:40 +00:00
electron128
402e77d532 added missing include 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8601 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-12 08:57:38 +00:00
csoler
9471a91795 added basic functions to collect bandwidth info in pqistreamer both ways; added a sorting method in BWGraphSource to create curves from extracted BW info. Still not yet functional 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8600 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-12 04:04:18 +00:00
thunder2
409db56a59 Removed dead code from ImHistoryBrowser::fillItem. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8597 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-12 01:27:27 +00:00
thunder2
8691a911aa Fixed possible crash in DetailsDialog::setFileHash by checking return value of dynamic_cast. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8596 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-12 01:19:28 +00:00
thunder2
86a5c2e656 Fixed possible crash in ChatLobbyDialog::init by checking return value of dynamic_cast. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8591 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-12 00:54:42 +00:00
csoler
6e4045124c fixed wrong include line in ui file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8588 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-11 23:30:07 +00:00
csoler
2d04a991fb added missing file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8587 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-11 21:07:21 +00:00
csoler
975b2d8783 moved all bw graph files in statistics. Removed outqueue info widget. Created new cpp files to host the bw graph code. Started minimal UI to display bw information. The goal is to create a widget for displaying selective bw info [work in progress] 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8586 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-10 03:24:39 +00:00
thunder2
621abee8da Enabled Messenger Window in system tray icon. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8585 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-09 21:36:32 +00:00
csoler
249c827f95 improved debug info in a few places 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8584 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-09 20:55:11 +00:00
thunder2
c0ad7d3e46 FriendList: 
- Added customize of columns with RSTreeWidget.
- Reduced display menu.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8583 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-09 20:53:28 +00:00
thunder2
e8e02b9c79 Added customize of columns to RSTreeWidget. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8582 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-09 20:23:52 +00:00
csoler
46a4273668 added back functionality to choose DL directory for each channel 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8581 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-07 00:52:52 +00:00
thunder2
f91ca2b47e Removed generate of channel messages. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8580 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-06 23:35:52 +00:00
thunder2
b7bbe3c937 Optimized fill of forums when modifying the read state. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8579 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-06 14:17:02 +00:00
thunder2
00007768f1 Fixed overlay icon (star) for tray icon. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8578 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-06 09:10:57 +00:00
csoler
0dbd5a22a0 fixed up permission matrix icons 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8577 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-04 19:07:17 +00:00
csoler
13e25ea432 fixed icon sizes in lobby participant list 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8576 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-03 20:27:30 +00:00
csoler
bdb85a3f54 fixed up FileTransferInfoWidget for high DPI 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8575 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-07-01 20:04:12 +00:00
csoler
d3257e4455 fixed a few more icons (help icons, grou tree widgets, bullets) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8573 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-30 16:44:58 +00:00
csoler
ebc8bb072c fixed a few icons and sizeHint functions. Removed unused SFListDelegate files from compilation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8571 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-29 16:08:17 +00:00
electron128
18df09e032 fixed typo in server page "127.0.01" 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8570 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-29 13:28:29 +00:00
csoler
4e08cd2f83 fixed wrong icon path for Transfers tab 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8569 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-29 12:01:28 +00:00
thunder2
3a71b8b662 Added stylesheet to plugins. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8563 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-28 10:11:47 +00:00
thunder2
686fec496f Moved fix font from GenCertDialog to qss (Modified patch from Henry). 
Added defaults to ui without style sheet

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8562 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-27 13:18:57 +00:00
csoler
b8434a649e added a few 128px icons 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8561 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-27 11:47:37 +00:00
csoler
6003b0d0d2 setup new icons directory and qrc file generation script 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8560 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-27 09:42:25 +00:00
csoler
8822d12707 fixed sizes in GxsIdTreeWidgetItem 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8559 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-27 09:14:20 +00:00
csoler
765e2a15ed fixed fnt size problems in global router stats window 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8558 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2015-06-26 18:33:03 +00:00