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
13,144 Commits 63 Branches 22 Tags 194 MiB
3457f6e2f1
Commit Graph

13144 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
defnax
3457f6e2f1 Added country emojis 2019-05-01 16:12:43 +02:00
defnax
74c7230b1b
Merge pull request #9 from RetroShare/master 
update to master
 2019-04-22 17:34:58 +02:00
csoler
bc8adb74c4
Merge pull request #1502 from defnax/added-group-icons-for-posted-links 
Added group icons for posted links
 2019-04-18 21:56:07 +02:00
defnax
7c534d50ea removed posted links related font-size from qss file 
removed posted links related font-size from qss file
 2019-04-16 19:38:13 +02:00
csoler
051e2ee682
Merge pull request #1522 from csoler/v0.6-Turtle 
Add Fast Track items in Turtle and make GxsTunnel to use them. Improves distant chat.
 2019-04-14 20:52:35 +02:00
csoler
c33a265ebd
Merge pull request #1526 from csoler/v0.6-ImprovedGUI 
V0.6 improved gui
 2019-04-14 20:52:04 +02:00
csoler
0bcbe14b2c
fixed wrong display of trash messages in inbox 2019-04-14 16:25:26 +02:00
csoler
64fecf42f4
moved MessagesDialog.* to msgs/ 2019-04-14 15:50:25 +02:00
G10h4ck
bff3cd6845
Merge pull request #1523 from G10h4ck/json_api 
Channel API fixes
 2019-04-13 00:00:39 +02:00
Gioacchino Mazzurco
b25c4ecb77
Fix channels JSON API 2019-04-12 23:10:31 +02:00
Gioacchino Mazzurco
4d703b9df9
Increase waitToken interval for channel creation 
Creating GXS groups imply a bunch of crypto operations that require lot
  of time expecially on embedded device, channel creation was reported
  as failed while it was still pending.
Reduce too long lines.
Print API error messages also on std::cerr.
 2019-04-12 22:14:16 +02:00
Gioacchino Mazzurco
81f73aaf44
Merge branch 'v0.6-ImprovedGUI' of https://github.com/csoler/RetroShare into json_api 2019-04-12 21:39:05 +02:00
csoler
44d0cbe295
finished fast track turtle items for distant chat 2019-04-12 21:29:49 +02:00
G10h4ck
50604f90b6
Merge pull request #1521 from G10h4ck/update_readme 
Fix appveyor badge link
 2019-04-12 12:53:44 +02:00
Gioacchino Mazzurco
4ac6d7b7d1
Fix appveyor badge link 2019-04-12 11:49:42 +02:00
csoler
3f75bff48b
first branch of faster turtle track for distant chat 2019-04-11 23:57:18 +02:00
csoler
322334b076
fixed compilation warning 2019-04-11 21:04:29 +02:00
csoler
4c8851801f
fixed merging with pending modifications 2019-04-11 21:04:13 +02:00
csoler
0aff3a2b03
Merge pull request #1517 from zapek/mark_as_bad_context_menu_improvement 
Moved the 'Mark as bad' entry in the search result files context menu
 2019-04-11 12:50:12 +02:00
zapek
e9f341908a Moved the 'Mark as bad' entry in the search result files context menu 
further down away from 'Download' to avoid accidental clicks
 2019-04-11 11:27:43 +02:00
G10h4ck
276328dd91
Merge pull request #1512 from G10h4ck/csoler-jsonapi-channel 
Improve GxsChannels API
 2019-04-11 10:13:52 +02:00
Gioacchino Mazzurco
9ad79f0c89
Improve documentation 2019-04-10 21:10:21 +02:00
csoler
43a5312194
Merge pull request #1509 from RetroPooh/trafcount 
display session traffic
 2019-04-10 21:04:53 +02:00
csoler
565afbd834
Merge pull request #1510 from zapek/windows_hash_warning_fix 
fixed wrong file hash daylight saving time warnings on windows
 2019-04-10 20:34:40 +02:00
G10h4ck
a8867f21fb
Merge pull request #1513 from Piraty/license-agpl 
add AGPL license text
 2019-04-10 12:38:44 +02:00
csoler
b128407159 fixed rare bug in chat notify that appeared when your nickname is happenned at the end of the text 2019-04-08 14:33:14 +02:00
Piraty
c872044c83 add AGPL license text 
Many source files mention the `AGPL-3.0-or-later` license in their header,
but there is no license file for AGPL in the project.

Text is used as shown at https://www.gnu.org/licenses/agpl.txt

Also see: https://spdx.org/licenses/AGPL-3.0-or-later.html
 2019-04-06 14:48:45 +02:00
zapek
3f8611f40f the cache is corrected and saved 2019-04-06 00:15:01 +02:00
Pooh
617b924e1f
Update rsconfig.h 2019-04-05 10:48:00 +03:00
G10h4ck
da088746de
Merge pull request #1511 from PhenomRetroShare/Fix_AppVeyorBuild 
Fix AppVeyor build
 2019-04-05 02:25:16 +02:00
Gioacchino Mazzurco
ab80d9a374
Fix compilation, retrocompatibility and enums 
Workaround miss-behaviour on old Android phones
Cleanup indentation a bit
Consistent param naming
Introduce default parameter values also for output paramethers
 2019-04-05 01:43:23 +02:00
Phenom
5ab75d0308 Fix AppVeyor build 2019-04-04 23:53:05 +02:00
csoler
61aeae67ea
disable auto-ban identities for own IDs 2019-04-04 22:52:25 +02:00
csoler
db9d202ab7
fixed missign read-only flag on identity info display 2019-04-04 22:41:02 +02:00
zapek
683e3579aa fixed wrong file hash daylight saving time warnings on windows 2019-04-03 21:29:34 +02:00
RetroPooh
7504964899 display session traffic 2019-04-03 17:29:13 +03:00
csoler
44c1f1580f
added other clean API entries for channel: createComment(), createVote() and createPost() 2019-03-31 22:11:09 +02:00
csoler
e0af46eb85
added new method to create a channel with more explicit parameters and JSon API for it 2019-03-30 22:53:14 +01:00
csoler
ef1755d97f
Merge pull request #1493 from csoler/v0.6-Messaging 
V0.6 messaging
 2019-03-29 22:27:27 +01:00
csoler
5ee86262aa fixed compilation 2019-03-29 09:17:32 +01:00
defnax
a1ca31afa0 fixes from cyril & removed stylesheets from some buttons 
fixed size of thumbnail on all screens
fixed aspect ratio
removede the stylsheet for comments,share, notes
 2019-03-29 02:00:13 +01:00
csoler
031a717de0
moved column resize after procesSettings() 2019-03-28 20:06:32 +01:00
csoler
da57f80095
Merge pull request #1506 from defnax/subscribe-button-with-count 
Count subscribers on the channels subscribe button like Youtube
 2019-03-28 20:04:52 +01:00
csoler
8b3f3fe717
Merge pull request #1487 from defnax2k/People-V2-improvements 
Added more actions to People V2 Thumbed View
 2019-03-28 19:59:59 +01:00
defnax
94997bd0d3 Added infoframe for Posted List Widget 
* Added infoframe for Posted List Widget
* Fixed channels infoframe look both same
 2019-03-28 02:00:42 +01:00
defnax
c2ebd10aa6 Count subscribers on the channels subscribe button like Youtube 2019-03-27 19:33:10 +01:00
G10h4ck
72e0a9607b
Merge pull request #1491 from hunbernd/fix/jsonapi 
Fix jsonapi compilation
 2019-03-27 10:23:45 +01:00
hunbernd
d2d336ee01 Made the restbed compile command better 2019-03-26 20:54:36 +01:00
defnax
b658839214 Removed the dummy buttons & added sorting the comments treewidget via combobox 2019-03-26 18:35:10 +01:00
csoler
f404962b51
fixed notification display for msgs 2019-03-26 11:47:11 +01:00