Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-26 07:59:35 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,391 Commits 63 Branches 22 Tags 196 MiB
01a1b9dc36
Commit Graph

5391 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
01a1b9dc36 patch from Henry Morgan to fix some strings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6153 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-27 10:00:35 +00:00
thunder2
2ed1712580 Moved call to setResizeMode in SharedFilesDialog after the call to setModel on QTreeView. 
Qt shows an assertion in debug mode when column count is 0.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6152 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-27 00:23:56 +00:00
drbob
5aa6afbfdb Fixed up page listing from selected group for Gxs Wiki. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6151 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-27 00:23:20 +00:00
drbob
aac114ba8e Added GroupTreeWidget to WikiDialog - enables subscribing to groups. (taken from GxsForums) 
Added Orange Warning Message to GXS Window...




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6150 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-26 23:40:24 +00:00
drbob
61c3afe56d moved GXS Macros (e.g. IS_GROUP_SUBSCRIBED) to gxsflags so they can be used by all gxs services. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6149 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-26 23:34:42 +00:00
csoler
641a24edac removed default qt, gui and xml flags from Qt,not wanted in no-gui 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6146 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-25 17:34:12 +00:00
csoler
2b5af11a28 lupdate on all language files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6145 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-25 17:26:28 +00:00
defnax
2677957df2 fixed compile on windows, include was missed 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6144 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-25 14:16:07 +00:00
csoler
86def5bbdf fixed stupid bug in my previous commit 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6143 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-24 22:55:58 +00:00
csoler
170c0c533d Removed tabs in chat lobbies: 
- unsubscribed lobbies display complete info in a blank page, with some additional help
- double click to subscribe.
- added unsubscribe button to ChatLobbyDialog. Needs a more appropriate icon (e.g. An open door with a leaving arrow)
- the lobby list is now used to display typing status. It could be used to show all sorts of info, the exact same way, such as joining/leaving peers, etc, using various different icons.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6142 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-24 22:44:14 +00:00
csoler
6e9d1beda9 fixed auto-raise of pages that are not in the top level 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6141 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-23 14:29:36 +00:00
csoler
718314af75 removed debug info, added missing error message 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6140 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-23 13:24:16 +00:00
csoler
c117078566 removed debug info 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6139 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-23 12:53:20 +00:00
csoler
50db473329 Merged branch for GUI improvements into trunk. The improvement phase is not finsihed yet. The work on GUI will continue into trunk 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6138 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-22 21:42:27 +00:00
csoler
c23cfd4a0f removed intermediate (re-generated) protobuf .cc and .h files. Fixed missing include line 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6132 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-17 17:01:22 +00:00
chrisparker126
d6c34f1b74 Fixed sign validation. request not reachable in previous logic 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6129 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-16 10:51:00 +00:00
chrisparker126
21dd979ba8 Fixed for duplicate messages ending up in db, set msgId and grpId as primary keys in message and group table respectively in db when created 
Please delete your TESTNET folders so a keyed db is created
few additional fixes
- did create id list for meta request in dataservice
- possible fix for uninitialised values for rsdb



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6123 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-12 21:45:30 +00:00
thunder2
ee62819389 Fixed wrong subscribeFlags in context menu of GxsForumsDialog. 
The color of the QTreeWidgetItem was stored with the same key.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6122 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-11 00:19:35 +00:00
thunder2
7413bdc50c Fixed crash in RsDataService::retrieveNxsGrps 
- accessing a deleted iterator.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6121 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-10 23:28:06 +00:00
drbob
eb8d628d2a removed disable/enable on GxsForumPopup Menu, as it prevented us from subscribing to forums. 
The variable subscribeFlags is wrong ( = -1 ), and somehow broken.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6120 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-10 18:59:57 +00:00
chrisparker126
73ff746773 Passed RsGixs to forums to enabled authentication 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6119 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-10 18:41:15 +00:00
drbob
6cd9faf3ab added AuthenPolicy code for p3wiki. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6118 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-10 17:52:50 +00:00
chrisparker126
bf5981e8b4 Added authentication policy and policy function for gxs forums 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6117 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-10 17:41:30 +00:00
drbob
39a7942337 switched off gxs again 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6116 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-10 17:35:57 +00:00
drbob
a77fa5a8d1 revert back to saving public key always. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6115 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-10 16:50:30 +00:00
drbob
81307de7c9 Added flag to disable dbase reset, and disable dummy data creation. 
This also switches to alternative test data path - to ensure it will be empty.

Fixed bug in p3idservice related to dummy id creation.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6114 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-10 15:40:07 +00:00
chrisparker126
7867063734 Fixed resource exhaustion due to message/group notification not being handled 
Added message/group size limit
Added message validation (identity and publish key)
Added code for message/grp fragmentation/defragmentation (not integrated yet) 
Added crude id picker to photoshare


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6106 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-07 23:04:16 +00:00
thunder2
635f915f46 Fixed ssl path in retroshare-nogui.pro for Windows compile 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6104 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-02-02 18:30:43 +00:00
csoler
02aa54152d fixed compilation of proto files with all versions (always recreated) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6100 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-30 17:45:33 +00:00
csoler
b1ffc14954 removed gxs from default 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6099 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-30 09:21:57 +00:00
csoler
a244ec1a37 updated changelog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6098 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-28 15:47:41 +00:00
csoler
959d7a0855 Improved packaging scripts 
- use the hierarchy in the svn
- removed binary archives, replaced by actual files (easier to handle)
- added packaging rules for FeedReader
- added one package for retroshare-nogui (not anymore in the main package)


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6097 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-28 14:29:23 +00:00
csoler
eed8fb7bfb fixed .pro file. libssh-0.5.2 should be unzipped in a directory next to trunk/ 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6096 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-28 11:48:16 +00:00
csoler
bc4780a739 updated packaging scripts. Unfinished 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6095 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-27 22:22:09 +00:00
thunder2
b433d15536 FeedReader: 
- Fixed enabled state of read all button
- Fixed copy links from context menu

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6091 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-26 11:02:41 +00:00
thunder2
97d0348f23 Added patch from AsamK: 
- Fixed compile on 64 bit by removing an unnecessary cast to va_list

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6086 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-23 13:19:05 +00:00
thunder2
439ccc94f4 Added new dialog to set service permissions for friends. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6085 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-23 00:22:17 +00:00
csoler
62a22fe0fe added patch from bNK to make glib include dir detected on all linux systems. Removed warnings about gpgme and gpg-error, which have no reason to stay now. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6084 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-22 20:43:48 +00:00
thunder2
138a35b2a2 Enabled embedded images in private chat and messages (only for QT version 4.7.0 and higher) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6083 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-22 00:14:10 +00:00
thunder2
a2a27a874f Updated english translation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6082 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-22 00:13:16 +00:00
thunder2
ef49000b9a FeedReader: 
- Added error handling to xml functions
- Added xslt transformation
- Added retransform of existing messages
- Redesigned preview dialog
- Enabled embed images for forum feeds
- Changed config format, switching back to an older version results in a loss of all data of the FeedReader

Added new base class RSPlainTextEdit with placeholder text.
New library libxslt needed

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6081 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-22 00:11:43 +00:00
thunder2
919fb3f62d Added patch from Anonym 
- added tooltips to GroupFlagsWidget when buttons are unchecked

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6080 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-19 22:04:02 +00:00
thunder2
72e5d10bcd Added and modified patch from Anonym 
- when an unknow user attempt to connect, show the name in the security item

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6079 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-19 19:24:08 +00:00
csoler
e7536960c3 - fixed inconsistency in parameter naming, causing error_string to be mixed up with gpg id (Not a bug). 
- removed unimplemented entry loadCertificateFromFile()


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6075 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-19 13:43:35 +00:00
thunder2
13f2863569 FeedReeder: 
- Fixed memory leak in xpath processing
- Stop long loops when closing the preview dialog or shutdown
- Added drag and drop to xpath lists in preview dialog
- Fixed save of xpaths lists

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6074 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-16 23:20:47 +00:00
thunder2
66c4a3d71b Fixed compile with Qt < 4.7 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6073 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-14 22:42:48 +00:00
thunder2
ddc4a37a93 FeedReader: 
- Recalculate message count of the user notify when a feed with new items is deleted.
- Set deleted message to read and !new.
- Added test feed item in notify settings.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6072 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-14 22:41:31 +00:00
thunder2
6f7c424b1f FeedReader: 
- Fixed process of pubDate

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6070 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-11 16:33:16 +00:00
thunder2
3df3850655 FeedReader: 
- Added favicon

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6069 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-10 22:51:04 +00:00
thunder2
edd8a2c0ec Added patch from AsamK 
- Support link in attribute href of the link node, e.g. <link href="..." />

Support author in creator node

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6068 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-01-09 12:17:05 +00:00