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
10,277 Commits 63 Branches 22 Tags 194 MiB
6daa3f4f68
Commit Graph

10277 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
9a20160d1e merged upstream/master 2017-01-21 14:01:53 +01:00
felisucoibi
e95c1319b5 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2017-01-21 00:08:23 +01:00
csoler
ee4d722225 fixed cache deletion of GXS grp meta that caused deleted groups to not come back when available 2017-01-20 23:27:18 +01:00
csoler
7bbb993769 disabled emoticons from messages and toasters, since they significantly slow down the whole software 2017-01-20 23:00:05 +01:00
RetroPooh
0ca477d01b add chatlobby option to disable sending typing notifications 2017-01-20 22:26:50 +03:00
csoler
d1af2e09dc merged with upstream/master 2017-01-20 00:00:47 +01:00
csoler
b52ab0f542 added auto-clean of unused groups when grpAutoSync is enabled (so it does not touch identities) 2017-01-19 23:59:26 +01:00
felisucoibi
39aaca9b87 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2017-01-19 14:45:08 +01:00
csoler
f3b3d2b262 disabled emoticon replacement in GxsChannelPostItem and chat lobby toaster and chat toaster, where there are not needed as compare to how problematic they can be 2017-01-19 14:01:54 +01:00
felisucoibi
73f59c2a42 Merge branch 'master' of https://github.com/RetroShare/RetroShare 2017-01-19 13:58:36 +01:00
csoler
cb61d58b12 disabled emoticon replacement in channel title because it causes channels to load extremely slowly due to the enormous amount of emoticons 2017-01-19 13:49:17 +01:00
csoler
410123b976 added warning about consistency error in idservice group flags 2017-01-19 11:16:47 +01:00
csoler
06265f2b54 added consistency check in meta data in publishGroup() and updateGroup() in order to avoid bad data supplied from GXS services 2017-01-19 11:13:06 +01:00
felisucoibi
5f7327f87e Merge branch 'master' of https://github.com/RetroShare/RetroShare 2017-01-18 21:45:56 +01:00
csoler
d2dc632176 Merge pull request #651 from csoler/v0.6-QtOptim 
added a checkbox to load emoticons in forums as an option, so as to a…
 2017-01-18 21:27:27 +01:00
csoler
34962c343a added a checkbox to load emoticons in forums as an option, so as to avoid crazy loading times. Disabled by default until we fix the RsHtml code 2017-01-18 21:22:38 +01:00
jolavillette
1b8de7b30e Attempt to reduce BW bursts 2017-01-18 13:25:45 +01:00
felisucoibi
717b455699 Merge pull request #13 from felisucoibi/0.6-buttons 
0.6 buttons renamed chat lobbies to chat rooms
 2017-01-18 10:55:01 +01:00
felisucoibi
47a4ed55fd Update ChatLobbyWidget.ui 2017-01-18 10:34:34 +01:00
felisucoibi
837bb76d33 Update CreateLobbyDialog.cpp 2017-01-18 10:31:50 +01:00
felisucoibi
2d764f4755 updated sectionnames chat lobbi 2017-01-18 10:26:25 +01:00
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