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
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
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
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
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
csoler
f404962b51
fixed notification display for msgs
2019-03-26 11:47:11 +01:00
csoler
1d4934b71e
fixed QuickView filtering
2019-03-26 11:32:43 +01:00
csoler
5820364b0d
fixed sorting
2019-03-26 11:21:31 +01:00
csoler
90995f16ce
fixed filter/sort by author name
2019-03-26 10:25:54 +01:00
csoler
d38ad97911
changed order of operation between init and processSettngs because it was messing up the msg list
2019-03-26 10:05:54 +01:00
csoler
d2c15c2d9e
fixed merge upstream/master
2019-03-24 20:59:23 +01:00
csoler
c7e65a0111
Merge pull request #1504 from csoler/v0.6-ImprovedGUI
...
removed explicit size on channel feed buttons that causes unbalanced …
2019-03-24 20:42:11 +01:00
csoler
e76ad99f3b
removed explicit size on channel feed buttons that causes unbalanced items in high DPI screens
2019-03-24 19:59:43 +01:00
csoler
ec66ad5b80
Merge pull request #1501 from csoler/v0.6-ImprovedGUI
...
created a cache for default icons to avoid allocating them everytime …
2019-03-24 19:49:36 +01:00
csoler
db4f8f18b8
fixed sqlcipher version on OS 10.14
2019-03-24 18:58:18 +01:00
csoler
1d09269e42
switched macOS version to 10.14
2019-03-24 16:22:17 +01:00
csoler
e6d86b5b6f
switched macOS version to 10.14
2019-03-24 16:20:12 +01:00
csoler
63ca76167b
removed brew-doctor command
2019-03-24 13:04:23 +01:00
csoler
32729adb5e
attempt #2 to fix MacOS compilation
2019-03-24 12:56:43 +01:00
csoler
364c3917ac
attempt to fix MacOS compilation
2019-03-23 23:48:39 +01:00
csoler
2ad641d908
added a test for QImage::isDetached() in cache to solve the problem of whether a cache image is still used or not
2019-03-23 22:59:37 +01:00
G10h4ck
f4e13975b0
Merge pull request #1478 from G10h4ck/jsonapi
...
extend JSON API to identities, circles and reputation
2019-03-23 09:11:05 -03:00