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,301 Commits 63 Branches 22 Tags 194 MiB
13ac670eec
Commit Graph

5301 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
thunder2
13ac670eec Changed config type of the FeedReader. There was a conflict with general config. 
Added warning in p3ConfigMgr::addConfiguration when a config type is used twice.
Removed checkbox for "Experimental Features" in general page without function.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6027 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-22 00:02:40 +00:00
thunder2
fc78f6c7ac Added patch from Henry 
- some more corrections

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6026 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-21 20:26:09 +00:00
defnax
f1777abb59 Added pegmarkdown compile to build script 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6025 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-21 09:59:48 +00:00
thunder2
a570f969bc FeedReader: 
- added language support

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6023 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-20 18:36:58 +00:00
defnax
d9ebe7c593 Added Turkish language translation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6022 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-20 14:50:00 +00:00
thunder2
0a499634dd FeedReader: 
- added notify in main window, systray icon and settings

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6021 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-20 13:30:16 +00:00
thunder2
b1d887b614 Added patch from Henry: 
- removed hardcoded font Arial
- fixed some strings
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6020 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-20 12:16:53 +00:00
thunder2
e6839c3245 Fixed compiler warning in Serverpage.ui. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6019 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-20 11:11:28 +00:00
csoler
986c2cf3e6 added some automatic test scripts. Needs to be done in all directories. Only serializer/ and util/ done now. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6018 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-19 23:05:38 +00:00
chrisparker126
470b3df7c2 Added update broadcast component, works, but don't use yet, will change 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6017 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-18 22:25:00 +00:00
thunder2
e2ad5b6cb6 Disabled "CONFIG += debug" in retroshare-nogui.pro 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6016 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-18 21:26:01 +00:00
thunder2
8b794a8f8f retroshare-nogui 
- fixed path to libssh
- link static ssh on Windows
- fixed compiler warning on Windows

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6015 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-18 19:48:31 +00:00
thunder2
5f27f64ad3 FeedReader: 
- enabled for Windows compile
- removed internal stylesheets
- added missing header for Linux compile

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6014 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-18 13:41:36 +00:00
defnax
46054187fc fixed retroshare no-gui project file for windows compile 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6013 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-18 10:52:34 +00:00
defnax
cb6d161518 update changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6012 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-18 09:39:16 +00:00
csoler
06f1f18e17 fixed some compilation bugs 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6011 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-17 23:19:05 +00:00
csoler
cfa2640ff8 forgot to patch this Makefile 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6010 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-17 23:08:53 +00:00
csoler
bc65dd40c2 - Restored compilation of most tests (The part using previously named p3ConnectMgr is still to be done). 
- moved ftSearchDummy and ftDataSendPair in tests/ft since it is only used there.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6009 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-17 23:05:25 +00:00
csoler
6571279b70 fixed (again) bug with bad chars notification 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6007 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-17 20:58:35 +00:00
drbob
ab01e46f44 made port non-optional for -S <port> .... 
This is because the gnu getopt extension for optional arguments is very confusing:  -S7022 is accepted but -S 7022 is not.

Switching to non-optional will save the confusion.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6006 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-17 20:34:38 +00:00
drbob
5803a5ab65 Fixed up bootstrap singleshot search function. Now returns parameters. 
Not functioning 100% correctly yet - due to libbitdht behaviour (TO FIX)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6005 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-17 20:19:27 +00:00
drbob
766d156315 Added SystemExternalAccess Function to RPC. 
This provides ExternalPort + DHTKey to Client. To be used to find and connect - even if Dynamic IP address changes :)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6004 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-17 19:15:04 +00:00
drbob
97e9458f36 Added little upnp utility / test. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6003 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-17 17:58:45 +00:00
thunder2
04510b1fa1 Updated english translation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6001 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-17 13:21:22 +00:00
drbob
d3787cb324 Make rs-nogui+SSH compile against the trunk. 
* converted to new flags format for File Operations.
 * converted from PUBLIC to VISIBLE lobbies. NB: This required name changes to protobuf definitions.
 * converted DataRates to new function.
 * directory sharing shifted to using OTHERS flags (text menus) - No support for group Flags yet.
 * Added == operator to Flags Type.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6000 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-17 01:24:16 +00:00
thunder2
f764a82408 Fixed compile of gxs on Windows. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5999 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-16 22:39:58 +00:00
thunder2
a3901d2b6b Added pegmarkdown to the main project file. 
Added revision number to the FeedReader plugin.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5998 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-16 21:22:14 +00:00
drbob
d8e327afcc * Patched for Arch. 
* Disabled FeedReader until is compiles properly.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5997 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-16 21:12:26 +00:00
drbob
069b72e0b2 Merged branch v0.5-gxs-b1 into trunk (from -r 5351 -> 5995) 
This brings a huge amount of goodness into the trunk,
but there is still a big chunk todo before it can be released.

 * GXS Backend.
 * GXS Services:
	- Identities.
	- Circles
	- Photos
	- Wiki
	- GxsForums
	- Posted.
 * SSH no-gui server.

See branch commits for more info.

To switch on GXS stuff, enable CONFIG += gxs
in both libretroshare.pro and retroshare-gui.pro



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5996 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-16 19:17:11 +00:00
csoler
dc57acb20c fixed bug in notification of substituted chars in RetroShareLink 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5995 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-16 16:28:00 +00:00
csoler
f1b7a3eee5 fixed display of ongoing chunks 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5994 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-16 16:10:43 +00:00
drbob
9217dcc8f7 simplified gxs compilation, now a single switch. 
attempted to fixup extra library includes (might not work for everyone).



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5993 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-16 15:52:49 +00:00
drbob
9b776ce6a4 fixed library (sqlite) config in .pro 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5992 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-16 15:30:21 +00:00
drbob
7b8bb8dff7 Cleaned up GXS compilation. now single config option (gxs) in .pro file. 
Removed GXS headers from p3face.h and used class declarations.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5991 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-16 15:04:52 +00:00
drbob
bfe9271740 Added basics to Circles Dialog. 
- List of Friends & List of Circles.
 - Hightlighting friend or Circle will show what they are members of.
 - cleaned up old code.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5990 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-16 14:19:24 +00:00
chrisparker126
17bdfa7cad enabled token expiration, 30 seconds 
add new, and hot ranking, and fixed top ranking for posts (not comments yet)
top ranking decay period set at 4 seconds for testing
enabled ranking posts 
fixed comments generation


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5989 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-16 00:43:15 +00:00
drbob
7935c5547f * Added gxs Circle Helper Classes: GxsCircleLabel / Chooser. 
* Added Circles into generic GxsGroupDialog.
 	 - Fixed up display of circles in GxsGroupDialog, 
	 - and correctly set GroupMetaData for circles.
 * Added new Circles Window to ApplicationWindow (doesn't do much yet).



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5988 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-15 23:11:11 +00:00
drbob
95cbb57abf * Created dummy Circles (This takes a while - as we have to wait for dummyIds to be made). 
* Provide CircleList, and Circle Details via rs interface.
 * Added debugging to help check its all working.
 * disabled caching of localIds - as this just causes cache to be flushed in p3IdService



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5987 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-15 23:07:12 +00:00
csoler
68c3e19a19 fixed compilation for SheevaPlug (Anonymous patch #61) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5986 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-15 22:43:31 +00:00
csoler
08d6bad6f0 added missing include for debian squeeze 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5985 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-15 21:03:34 +00:00
csoler
4ff8b55845 added missign dependency, fixed .tgz package for debian 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5984 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-15 21:01:20 +00:00
csoler
a438c92a77 updated ubuntu changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5983 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-15 13:42:08 +00:00
csoler
a14f893acc updated version numbers 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5982 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-15 13:31:28 +00:00
thunder2
a28267a8e7 Updated translations from transiflex. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5981 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-14 00:29:10 +00:00
thunder2
ef7a2aaa59 Added missing closeConnection when the connection dies with SSL_ERROR_SYSCALL. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5980 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-13 22:54:17 +00:00
csoler
bb7645549f extended character filtering to fit a common denominator for all filesystems 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5979 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-13 22:48:36 +00:00
csoler
892057b53e added replacement of \ and / in filenames from RsLinks 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5978 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-13 22:13:58 +00:00
csoler
bf3194f035 added proper filtering of slash and backshash from directory and file names in RsCollection to avoid files that can be redirected to wrong locations 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5977 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-13 21:53:27 +00:00
chrisparker126
eed8c28d7b git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5976 b45a01b8-16f6-495d-af2f-9b41ad6348cc 2012-12-12 22:41:21 +00:00
drbob
2d4c89aacf Switched on Markdown Rendering in the GUI. 
Enabled linking against pegmarkdown library.
Added Circle files to .pro, but disabled for now.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5975 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2012-12-12 19:27:02 +00:00