Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 08:59:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,346 Commits 63 Branches 22 Tags 196 MiB
9cfc9ecee1
Commit Graph

6346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
7bb561d9e0 added generic function to return the correct string for scanf for unsigned ints depending on the size of the actual variable that is scanned. Shoudl fix the rehash bug and bugs corrupting timestamps on 32bits systems 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6987 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-04 20:05:08 +00:00
defnax
50ebd781e5 * Corrected the layout of the Connect Progress Dialog 
* Added few more file type icons for "cpp", "h" nd "c"
* Corrected some strings
* Moved Uploads to Downloads Tab. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6986 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-04 19:54:07 +00:00
csoler
4ce8ea73d2 moved PGP id types into rsid.h, and renamed them with a more appropriate name 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6985 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-03 22:42:17 +00:00
csoler
91291a9920 added proof of work algorithms to GRouter key items 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6984 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-03 22:41:20 +00:00
defnax
469da4914f Added a default FileType icon for the "patch" and "diff" extensions. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6983 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-03 19:32:53 +00:00
thunder2
76b3ccc1a5 Added service pointer for forums to the plugin interface. 
FeedReader:
- Used the forums pointer from the plugin interface instead of the global pointer

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6982 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-03 15:05:48 +00:00
thunder2
2a9a6f8a75 Changed order of the shutdown to fix a crash of the WebUI plugin. 
First stop the plugins then the other services.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6981 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-02 17:13:41 +00:00
thunder2
92fabf4c56 Modified the patch from electron. 
Moved the calls to the plugin to ChatWidget for use with all types of chats (private chat, chat lobby and distant chat).
Recompile needed

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6980 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-02 00:56:46 +00:00
defnax
7b0a6afa56 patch "chatdialog_allow_buttons_from_different_plugins_3" from electron. ChatDialog allows now Buttons from different Plugins. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6979 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-01 22:25:49 +00:00
defnax
0e134d0a92 Added to change the text for the Play Button, when file is not a media file. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6978 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2014-01-01 16:58:52 +00:00
thunder2
abd6b46ca0 Added a custom context menu for pasting RS-links to the base class MimeTextEdit and removed the custom context menu from derived classes. 
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6977 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-30 19:12:16 +00:00
thunder2
dddc4356f1 Changes for Windows compile: 
- removed some unnecessary libraries from retroshare_plugin.pri
- FeedReader
  - updated external libraries to libxml2-2.9.1 and curl-7.34.0
  - enabled ssl in libcurl
  - removed debug output

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6976 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-28 23:49:50 +00:00
csoler
be3a593ee2 enabled load/save of grouter configuration. Checked that keys and info is properly restored at startup 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6975 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-28 21:47:15 +00:00
csoler
146465a53f fixed cipher list for openssl, since ECDHE is not configured, it cannot be used 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6974 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-28 21:41:43 +00:00
csoler
3b381b9d22 patch "Fix_ChannelNotificationFeedLink" from Phenom. Allows to finish loading a channel before jumping to the linked post 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6973 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-27 22:15:53 +00:00
csoler
03c68c1276 patch "AddSearchFilesourceSorted_6951.diff" from Phenom. Adds correct sorting for search results. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6972 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-27 20:25:49 +00:00
csoler
ee4985c935 patch "Fix_ChatLobbyAutoSubscribe_6951.diff" from Phenom. Fixes request for existing lobbies when no lobby ihas been found yet. Code beautification 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6971 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-27 20:21:44 +00:00
csoler
5c52890ad5 added grouter as a msg sending service. Not enable yet. Added serialisation for grouter items and test methods in tests/serialiser/. Added saveList/loadList for grouter. set connectToTurtleRouter() and connectToGRouter() to be mandatory methods 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6970 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-27 20:06:47 +00:00
csoler
da1b6ac845 added serialisation methods for SSLId and time_t 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6969 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-27 20:02:25 +00:00
csoler
98847c60b1 moved SSLIdType to rsid.h which has less dependencies 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6968 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-27 20:01:47 +00:00
defnax
93c331f40b * Enabled min and max buttons for settings window 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6967 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-27 19:59:25 +00:00
defnax
51ed2ca9f9 * Changed the logo size for some news feed items to use same size for better look. 
* Added to display blue/black forum message icons for the forum feeds, when forum is anon or signed. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6966 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-27 18:24:13 +00:00
csoler
d5cfa5c9b5 fixed ghost lobby issue (thx to thunder for spotting it out) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6965 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-27 09:16:43 +00:00
csoler
490abbeffc fixed small issue in chat lobby list. Not yet the cause for the ghost lobby 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6964 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-26 21:44:02 +00:00
csoler
cb7dccf0b8 added lobby ID as tooltip to lobby list 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6963 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-26 19:35:12 +00:00
defnax
9d78ad8942 renaming strings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6962 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-25 17:16:17 +00:00
csoler
7edfa21ffd added routing methods for data in grouter. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6961 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-24 16:41:07 +00:00
defnax
beedc07de8 Added a default background color for the Channel Message Logo for a better look and feel, removed stretching of the logo, set a minimum size, background is now filled black. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6960 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-23 20:03:46 +00:00
csoler
03bd9dbef4 added serialisation methods and tests for grouter 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6959 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-23 16:05:46 +00:00
csoler
2c19810e37 patch from HM to avoid allocating absurdly long uids 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6958 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-23 12:59:34 +00:00
csoler
22f41b8e16 fixed parsong of file_cache. %ld was used in place of %lu 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6957 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-22 19:50:46 +00:00
csoler
1e52c7f22b added an option in the pro file for dsdv, as it is compiled when not used 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6956 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-22 17:10:56 +00:00
csoler
fd994a546b progress in grouter code 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6955 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-22 17:04:13 +00:00
chrisparker126
8aca56bc4f merge fix 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6954 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-21 19:27:48 +00:00
chrisparker126
39909b705f merging rs_gxs-finale to v0.6 branch 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6953 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-21 18:20:47 +00:00
thunder2
dbfe3f6c51 Updated languages from Transifex 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6952 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-20 18:51:12 +00:00
chrisparker126
cc7569e396 - enabled config saving of sync information 
- additional fixes for sync reloading
- confirmed sync now working with A B test

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6951 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-20 14:48:32 +00:00
csoler
a4a4d3bdda added check for malloc success in packet-parse.c 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6950 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-19 22:16:17 +00:00
csoler
2f188b8217 removed asserts in packet-parse.c 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6949 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-18 20:22:59 +00:00
csoler
f7142be9dd fixed parsing of size on non windows systems. unsigned long int requires %lu. Needs to be tested on MacOS 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6948 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-17 19:46:35 +00:00
chrisparker126
dab782fbaa Fixes for gxsupdate item serialisation 
- now works

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6947 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-15 20:11:39 +00:00
csoler
d839301b7c added missing services in RsPluginInterface class 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6946 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-15 19:35:14 +00:00
csoler
d26d6fa355 added check to only import version 4 keys in the keyring 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6945 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-13 20:58:06 +00:00
csoler
3add068cdd removed status member from FileDetails. Not used => misleading 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6944 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-13 19:41:52 +00:00
thunder2
607458dad7 Added missing language files. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6943 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-13 16:12:16 +00:00
thunder2
3d48e8b4cb - Added language Catalan (ca_ES) 
- Updated english translation
- Updated languages from Transifex

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6942 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-13 15:08:36 +00:00
csoler
d8f42ddac7 fixed mistake introduced in 6937 that prevents correct writing of uncompressed packets 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6941 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-12 17:32:23 +00:00
csoler
156db5fb7c removed asserts and added proper error handling 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6940 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-10 19:51:47 +00:00
csoler
f4ec563595 removed asserts in reader_armoured.c 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6939 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-10 14:20:17 +00:00
csoler
5800069acf error handling in pgphandler.cc 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6938 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-12-10 10:08:41 +00:00