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
5,501 Commits 63 Branches 22 Tags 194 MiB
b913c8ae4f
Commit Graph

5501 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
b913c8ae4f made one additional string translat-able 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6263 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-21 12:00:29 +00:00
chrisparker126
f0e0b85637 Code for message cleanup (inactive), message store period param added to RsGenExchange 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6262 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-20 22:26:24 +00:00
thunder2
3f0b21b396 Updated languages from transiflex. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6261 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-20 21:28:29 +00:00
csoler
c1576d4ad2 updated ubuntu changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6260 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-20 21:00:38 +00:00
csoler
72da514e0a fixed auto DL for own channels. Apparently the channel status is missing for this special case. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6259 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-20 20:34:03 +00:00
csoler
6121e613eb removed compilation warnings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6258 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-20 20:25:13 +00:00
csoler
eca77205de fixed typos (patch from Henry Morgan) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6257 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-20 14:22:42 +00:00
csoler
214100be7d updated english translation strings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6256 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 22:35:46 +00:00
thunder2
60e617150e Set initial size of the chat lobby splitter. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6255 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 22:34:30 +00:00
csoler
0b7f836eb1 removed debug info 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6254 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 21:45:13 +00:00
csoler
64c5a7ece2 patch from AC to improve the list of participants in chat lobbies 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6253 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 21:37:38 +00:00
csoler
6e3a388f52 allow to unselect "create new identity" when the keyring is empty. This makes the Import Identity button appear 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6252 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 21:18:49 +00:00
csoler
1353cd3411 restored the profile manager, but only kept the export button 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6251 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 21:10:54 +00:00
csoler
9348310f79 attempt at fixing layout in chat lobby widget 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6250 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 20:49:24 +00:00
csoler
ace83e9ed5 removed debug info 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6249 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 20:35:00 +00:00
csoler
1500fda2fd clicking on download for channel item marks the item as read 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6248 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 20:32:46 +00:00
csoler
2dcc35d979 further remove of debug info 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6247 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 20:21:20 +00:00
csoler
87842640e1 removed debug output 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6246 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 20:16:40 +00:00
chrisparker126
83e41eb04c Fix for channel bug: used service id twice 
Fix for posted lock-up/rsgenexchange bug: did not release after try lock
Removed erroneous use of subscribe_admin to mean subscribed (subscribe_subscribe) in gxsnet

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6245 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 20:13:13 +00:00
csoler
ef240cc6f0 removed column 1 and 2 of lobby lists. Put the info in tooltip => space gained. Enabled sorting in lobby list 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6244 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 19:46:39 +00:00
csoler
bffef991d8 fixed bug showing time shift warning multiple times. Removed the time estimate from the message 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6243 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-19 19:37:26 +00:00
csoler
7f53f0e0cc added consistent detection of time-shift in chat lobbies. Shows a warning when the shift is larger than 2^9 seconds (approx. 10 minutes. Warning shown only once). 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6242 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-18 23:19:37 +00:00
csoler
a850b18be2 renamed Security page Profile. Disabled profile manager for now, since generating a new profile while RS is running corrupts the current session. More work is needed to make the profile manager usable which RS is running. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6241 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-18 14:16:22 +00:00
csoler
2cd709d4bf updated english ts file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6240 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-18 14:04:28 +00:00
csoler
f60f3627bb dropping chat lobby messages from more than 10 minutes in the future (sorry Marty) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6239 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-17 23:26:26 +00:00
thunder2
813a8fad34 - Moved the created GxsIdRSTreeWidgetItem from the forum fill thread to the main thread so the signal to fill the id can be processed. 
- Removed QTimer from GxsIdTreeWidgetItem and GxsIdRSTreeWidgetItem.
- Added new tick signal (every second) on Rshare to fill the id.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6238 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-17 16:31:30 +00:00
thunder2
c74a36fff8 Fixed memory leak in RsGenExchange::processRecvdGroups when group could not be deserialised. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6237 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-17 15:46:05 +00:00
csoler
85aaebe576 re-enabled context menu in chat lobby list 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6236 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-17 15:03:21 +00:00
thunder2
0e10205c0b Renamed VoteHolder constants to avoid compile problems under Windows because of doubled defined name ERROR when including wingdi.h. 
Added missing files GxsFeedItem.* to retroshare-gui.pro.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6235 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-16 17:20:56 +00:00
chrisparker126
ea2788b2d2 Updated gxs net test 
tested fragmentation with 1 item coalesion
created groups now have admin/subscribed/publish flag (no publish optimisation yet)
was incorrectly apply group_subscribe_mask to group subscribed, using correct mask now. Added comments clarifying purpose of subscribe_mask
Implemented fragmentation but placed under preprocessor flags for phase 2. 



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6234 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-16 16:44:33 +00:00
csoler
206b230f33 fixed bug in dummy circles generation code 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6233 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-16 13:37:39 +00:00
drbob
211596e88c tweaks for GXS test network. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6232 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-16 12:47:31 +00:00
drbob
a4aa011207 GxsChannels are basically complete now!: 
- Fixed up Automatic downloads for GxsChannels. 
 - Tweaked GXS backend to make Meta Changes happen before requests.
 - Added some new Macros.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6231 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-16 12:31:31 +00:00
drbob
0c604d08d9 Cleanup of GxsChannels GUI. 
- disabled last references to old channels system.
 - switched on contextMenu.
 - removed FillThread.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6230 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-16 12:28:14 +00:00
drbob
5dac882572 updating svn version for release. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6229 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-16 12:13:09 +00:00
drbob
c141950b8c updated version for release. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6228 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-16 12:11:53 +00:00
csoler
221e96fd96 added destination directory to file transfer details window 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6227 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-15 23:16:33 +00:00
csoler
ae130674ba added warnign when openning http/https links using system services 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6226 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-15 23:08:54 +00:00
drbob
f1e23599da Finished most of Comment GUI side. 
- Created GxsFeedItem to subclass all potential Gxs feeds.
 - Modified GxsChannelPostItem & PostedItem to use GxsFeedItem.
 - Added Posted and Channel Items to Comment Header.
 - Added Message Title to Comment Tab.
 - Added MessageBoxes for missing signatures in various places.
 - Changed Licence from GPL to LGPL for gxs, Posted, gxschannels.
 - Deleted Old Posted Classes that are no longer needed.
 - Added Comment Up/Down/Own Vote to CommentTree.
 - Tweaked FeedHolder fns to support GXS comments.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6225 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-15 21:02:43 +00:00
drbob
1f6d6a4fc2 Added backend support for Comments. 
- Single Vote per comment checks and balances added. 
 - Fixed up RsGxsImage stuff. (TODO move to proper REF counted Image).
 - Added GxsTokenQueue ticks were required.
 - Made GenExchange publicToken() fns  public, so that comments can use them.
 - Added OwnVote details to Comments 



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6224 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-15 20:46:49 +00:00
defnax
de9ec4776e update version 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6223 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-15 11:36:20 +00:00
csoler
79cef5704e updated revision string to 0.5.4e 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6222 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-14 20:14:51 +00:00
csoler
c064113c1b updated ubuntu changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6221 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-14 19:54:29 +00:00
csoler
706fcc20f1 increased friction factor in network graph to compensate the oscillations due to a less precise calculation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6220 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-14 19:53:21 +00:00
drbob
5ba4c8f7ff Major improvements to Comments GUI for channels and posted. 
- Split GxsIdWidgetTreeItem into two types.
 - Added Voter Id into Comment Dialog.
 - Expanded Comment display to show Votes and Score.
 - Expanded Comment Context Menu to include Voting and Reputation Options.
 - Fixed up CreateComment Dialog to include AuthorId, and enabled.
 - Completed Basic Comment Voting.
 - Made Comment Windows Closable.
 - Cleanup up Channel Posts before loading new ones.
 - Fixed up Channel Post Attachments, and Thumbnails.
 - Added View Comments button to Channel Posts
 - Misc other Bugs.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6219 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-13 00:33:14 +00:00
drbob
b9f2708927 Improvements to Comment Handling and GxsChannels. 
- Added Vote dummy data into channels.
 - Fixed up RsGxsImage handling to avoid memory issues - need to switch to shared_ptr later.
 - Added "BestScore" calculations into Comments - not sure if the maths is right.
 - Added Hashing interface to Channels.
 - misc bugfixes.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6218 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-13 00:24:57 +00:00
thunder2
4866c5585b Updated languages from transiflex. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6217 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-12 22:14:42 +00:00
csoler
4c670e81f0 removed debug output from ftcontroller 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6216 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-12 17:44:00 +00:00
thunder2
f56ef4f165 Updated english translation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6215 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-12 00:08:28 +00:00
thunder2
f4569c57bd Fixed compile on Windows. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6214 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-03-12 00:07:20 +00:00