Commit Graph

10256 Commits

Author SHA1 Message Date
felisucoibi
1217a85d99 change chat lobies t chat rooms strings 2017-01-18 10:15:07 +01:00
felisucoibi
07dd196e6d changed friends to second flaces csoler agreed 2017-01-18 09:54:32 +01:00
felisucoibi
564618764b Merge branch 'master' of https://github.com/RetroShare/RetroShare 2017-01-18 00:48:00 +01:00
csoler
bdc5680f88 Merge pull request #647 from RetroPooh/master
fix mute option in chatlobby id menu
2017-01-17 23:01:51 +01:00
felisucoibi
e778b8c854 Merge pull request #12 from felisucoibi/0.6-buttons
Buttons 0.6 v3
2017-01-17 17:01:37 +01:00
felisucoibi
dc391c53fb Update ChatLobbyWidget.h 2017-01-17 17:00:41 +01:00
felisucoibi
8519b790bd Merge pull request #11 from felisucoibi/0.6-buttons
0.6 buttons v2
2017-01-17 16:56:17 +01:00
felisucoibi
ce53a9d392 Update FriendsDialog.h 2017-01-17 16:55:14 +01:00
felisucoibi
296903a00d Update MainWindow.cpp 2017-01-17 16:51:16 +01:00
felisucoibi
66ab7c9eab Update ChatLobbyUserNotify.cpp 2017-01-17 16:49:36 +01:00
felisucoibi
afd5e55c03 Merge pull request #10 from felisucoibi/0.6-buttons
0.6 buttons
2017-01-17 16:38:18 +01:00
felisucoibi
982c8377f8 Update PostedDialog.h 2017-01-17 16:37:23 +01:00
felisucoibi
d31cb0d67d Update NewsFeed.h 2017-01-17 16:36:24 +01:00
felisucoibi
701868d88c Update MessagesDialog.h 2017-01-17 16:35:20 +01:00
felisucoibi
0633744aa8 buttons 2017-01-17 16:34:37 +01:00
felisucoibi
02aec3d9ef button changes 2017-01-17 16:32:56 +01:00
RetroPooh
f079e99642 fix mute option in chatlobby id menu 2017-01-17 17:21:51 +03:00
cyril soler
8568199497 fixed mistake that prevented GXS posts to propagate 2017-01-17 12:40:09 +01:00
csoler
e19711785b fixed last commit because of compilation 2017-01-16 20:57:19 +01:00
csoler
d5936a56e7 removed debug msg 2017-01-16 20:49:52 +01:00
csoler
967b85c9bf removed old call to rsIdentity in rsgxsnetservice and removed warning 2017-01-16 20:49:52 +01:00
csoler
c00caa967d Merge pull request #644 from G10h4ck/ccleanup
Some cleanup and deprecation
2017-01-15 21:28:28 +01:00
csoler
e7a119f22c added a warning and skip files with missing hash in copy link 2017-01-15 21:13:27 +01:00
csoler
f314e7d330 simplified code in PR/630 2017-01-15 20:56:44 +01:00
csoler
7e750d3161 Merge pull request #630 from RetroPooh/master
small gui fixes in lobbies id menu and stats window
2017-01-15 20:31:22 +01:00
RetroPooh
75d717c2df fix 2017-01-15 20:29:59 +03:00
csoler
6a925ea8af updated changelog 2017-01-15 11:36:23 +01:00
csoler
5c296b9349 removed warning when peer list is empty in cache_load of identities 2017-01-15 09:57:06 +01:00
RetroPooh
ed4de4ecda Merge branch 'master' of https://github.com/RetroShare/RetroShare 2017-01-15 11:48:35 +03:00
Gioacchino Mazzurco
a881441384 Some cleanup and deprecation
RsGxsDataAccess deprecate unused ansType
RsGxsDataAccess::setReq(...) use proper types for params
RsGxsDataAccess::getGroupData(...) print useful information in case of error
GxsRequest proper initialization in constructor
GxsRequest deprecate meaningless ansType
RsGroupMetaData Fix comment to avoid confusion
Deprecated meaningless RS_TOKREQ_ANSTYPE_* common source of confusion
p3GxsCircles::request_CircleIdList() removed unused variable
p3GxsCircles::request_CircleIdList() preper return value
2017-01-14 23:12:50 +01:00
csoler
233c38d8db Merge pull request #641 from csoler/v0.6-Reputations
V0.6 reputations
2017-01-14 20:45:53 +01:00
csoler
dd408773c7 removed debug info 2017-01-14 19:08:14 +01:00
csoler
318a3720c6 fixed reloading of distribution icons when opinion is changed over an ID in forums. Improved efficiency of forum loading in general. 2017-01-14 19:04:14 +01:00
csoler
25680d586c removed quadratic cost in forum thread fill 2017-01-14 17:29:37 +01:00
csoler
730869591d fixed reloading of GXS id icon when banned/unbanned in forums 2017-01-14 11:02:02 +01:00
csoler
57f22e9764 removed costly size() call in QList 2017-01-14 10:51:14 +01:00
csoler
14352220ab fixed compilation in tests 2017-01-14 10:19:31 +01:00
csoler
c4695e3341 fixed compilation of unittests 2017-01-13 22:41:54 +01:00
csoler
df94de9142 disallow to ban your own identity in forums, and make opinions show up as a function ofwhat the ID opinion already is 2017-01-13 18:31:50 +01:00
csoler
17cf6607f8 improved settings->People text fields and tooltip 2017-01-13 16:35:42 +01:00
RetroPooh
cef62e30fc fix 2017-01-13 18:20:19 +03:00
csoler
e4960e07c8 Merge pull request #642 from G10h4ck/ccleanup
Documentation and code cleanup
2017-01-13 10:24:28 +01:00
csoler
3c800c45c6 fixed enabled 0 in settings->People fields 2017-01-12 22:54:38 +01:00
Gioacchino Mazzurco
cdd39736d4 Documentation and code cleanup
Fix a warning in RsGenExchange::messagePublicationTest(...)
Fix documentation for RsGenExchange::{generatePublicToken(), acknowledgeTokenGrp(...)}
Properly initialize RsGroupMetaData, RsMsgMetaData and p3GxsForums members
Cleanup RsGxsNotify
2017-01-12 22:34:28 +01:00
csoler
19819b9b77 removed debug info 2017-01-12 22:14:41 +01:00
csoler
d7e068220d fixed sorting by reputation in IdDialog 2017-01-12 21:59:44 +01:00
csoler
3c07d50dac set auto-reset of banned nodes to "never" by default 2017-01-12 21:27:02 +01:00
csoler
70a92a1c32 various small fixes in reputation/identity cleaning 2017-01-12 21:14:36 +01:00
csoler
bd7f6aca99 added to parameters in options to fix the time banned ids are kept in list and prevented to re-download 2017-01-12 20:39:49 +01:00
RetroPooh
8ae9eff928 chatlobby id context menu - fix reputation change actions 2017-01-12 16:26:35 +03:00