hunbernd
e8bdce6e23
Fix sticker button disabled on distant chat
2019-12-24 00:14:38 +01:00
hunbernd
33236aeca3
Merge branch 'upstream' into feature/stickers-upgrade
2019-12-23 23:54:55 +01:00
csoler
71149935f9
fixed path issue in calling webui from rs-gui
2019-12-21 18:11:43 +01:00
csoler
11bc7a886a
fixed cmpilation error, where impossible case is not handled
2019-12-21 11:14:37 +01:00
Gioacchino Mazzurco
63d879b3d9
Update OBS submodule
2019-12-21 00:29:08 +01:00
Gioacchino Mazzurco
3172879b0e
Update OBS submodule
2019-12-20 00:20:23 +01:00
Gioacchino Mazzurco
7e88276339
Little cleanup in retroshare.pri
2019-12-19 15:09:32 +01:00
Gioacchino Mazzurco
655582e970
Improve license according to REUSE 3.0
...
FSFE licensing checking program lint is now happy
$ reuse lint
* Bad licenses:
* Missing licenses:
* Unused licenses:
* Used licenses: AGPL-3.0-only, AGPL-3.0-or-later, Apache-2.0, CC-BY-SA-4.0, CC0-1.0, GPL-3.0-or-later, LGPL-3.0-or-later, MIT
* Read errors: 0
* Files with copyright information: 6324 / 6324
* Files with license information: 6324 / 6324
Congratulations! Your project is compliant with version 3.0 of the REUSE Specification :-)
2019-12-18 17:57:20 +01:00
Gioacchino Mazzurco
633d5866ef
Use SPDX standard names for licenses
2019-12-18 13:08:22 +01:00
csoler
69b1649d05
Merge pull request #1738 from defnax/Added-publish-time-display-and-some-feeds-fixes
...
Added publish time display and some feeds fixes
2019-12-13 21:33:20 +01:00
defnax
f088b8e2af
improved Topics details view
2019-12-11 13:54:26 +01:00
Gioacchino Mazzurco
2a0e1ab59d
Fix Android compilation
...
Fix also a couple of warnings and update build documentation
2019-12-11 01:25:14 +01:00
G10h4ck
d1b86400bc
Merge pull request #1695 from G10h4ck/gxs_invites
...
GXS groups links
2019-12-10 22:17:33 +01:00
defnax
d6b67bc41b
updated authors & website links & on channel files view to move Download/Status button to the middle
2019-12-09 21:13:51 +01:00
defnax
6692b2be49
improved Node page look & feel
2019-12-07 16:39:00 +01:00
defnax
d2ae01ab50
update some icons
2019-12-04 21:49:59 +01:00
defnax
fd04d386ce
Added to display the created time to display & feed ui fixes
2019-12-03 23:59:40 +01:00
defnax
ed6e839894
Merge pull request #38 from RetroShare/master
...
update to master
2019-12-02 21:23:51 +01:00
csoler
b799f18df8
fixed early crash caused by calling rsBanList before it is initialized
2019-12-02 13:14:56 +00:00
csoler
60ed77461a
removed duplicate call to StartupRetroshare
2019-12-02 13:14:18 +00:00
G10h4ck
b830fe6602
Merge pull request #1734 from felisucoibi/master
...
aded PB PetaByte to filelists.
2019-12-02 11:50:10 +01:00
felisucoibi
b709e68c72
Update misc.cpp
2019-12-02 11:00:35 +01:00
felisucoibi
c9aab51c7c
Update hash_cache.cc
2019-12-01 23:01:20 +01:00
felisucoibi
c3437da7b3
Merge pull request #2 from RetroShare/master
...
fixed compilation due to get_version not found in restbed
2019-12-01 19:56:24 +01:00
csoler
f5d32a8a9c
fixed compilation due to get_version not found in restbed
2019-12-01 16:59:40 +01:00
felisucoibi
ff9c7774f2
Update hash_cache.cc
2019-12-01 12:28:52 +01:00
felisucoibi
2340c8ff20
Update misc.cpp
2019-12-01 12:28:07 +01:00
felisucoibi
7ed186fdf8
Merge pull request #1 from RetroShare/master
...
asdf
2019-12-01 12:11:21 +01:00
csoler
694e05d4b9
fixed compilation
2019-11-30 22:13:12 +00:00
G10h4ck
24295c7852
Merge pull request #1730 from defnax/Added-rapidjson-for-msys2-
...
Added rapidjson package for msys2
2019-11-30 16:16:16 +01:00
defnax
9baff55ced
update the msys2 win install guide for rapidjson package
2019-11-30 16:11:25 +01:00
defnax
03b17ef797
Merge pull request #37 from RetroShare/master
...
update to master
2019-11-30 14:44:54 +01:00
Gioacchino Mazzurco
610fedabb8
Fix JSON API related files licensing based on talk with Cyril and FSFE suggestions
2019-11-29 19:46:46 +01:00
G10h4ck
b8f2bee295
Merge pull request #1724 from G10h4ck/travis_mac_fix
...
Fix Continuous Integration
2019-11-28 22:29:57 +01:00
Gioacchino Mazzurco
c5472a2b24
Appveyor remove abandoned libresapi libraries deploy
2019-11-28 20:55:47 +01:00
Gioacchino Mazzurco
f94bd70ca6
Appveyor fix debug deploy
2019-11-28 20:26:10 +01:00
Gioacchino Mazzurco
2cca38c2a6
Appveyor use a different directory for build
2019-11-28 19:51:22 +01:00
Gioacchino Mazzurco
6464870cf9
Cleanup qmake files, Appveyor list produced files
2019-11-28 19:03:55 +01:00
Gioacchino Mazzurco
ba4af74a06
Add reminder to rsversion.h that no C++ includes are admitted
2019-11-28 18:22:01 +01:00
Gioacchino Mazzurco
5bf8792bc5
Fix windows compile due to rsversion JSON API
2019-11-28 17:41:03 +01:00
Gioacchino Mazzurco
6bae8237e1
TavisCI OSX add miniupnpc include and lib path
2019-11-28 16:01:47 +01:00
Gioacchino Mazzurco
722b1dbffc
Attempt to fix AppveyorCI
...
+ Cleanup macosx variables
2019-11-28 14:28:27 +01:00
Gioacchino Mazzurco
8a70174fb6
TravisCI linux use rapidjson from bionic repository
2019-11-28 01:42:30 +01:00
Gioacchino Mazzurco
3bb42ca799
Fix wrong rapidjson include on Appveyor
2019-11-28 01:38:49 +01:00
Gioacchino Mazzurco
516b5e7a83
Update and enable TravisCI for GNU/Linux
2019-11-28 01:24:22 +01:00
Gioacchino Mazzurco
b883db0d4d
Fix TravisCI OSX build
2019-11-28 01:08:56 +01:00
csoler
6df71ef5f6
fixed compilation
2019-11-27 23:45:18 +01:00
Gioacchino Mazzurco
c73bdb83cd
Drop libresapi and modules that depends on it
...
A copy of the repository freezed before this deletion to ease old code
viewing is available at
https://github.com/RetroShare/zz_archive_RetroShare_libresapi
Removed some more cruft
Temporarly disabled JSON API generation of RsWebUi methods due to
compilation breakage when rs_webui is disabled, RsWebUi keeps working
but cannot be restarted from JSON API
2019-11-27 23:32:38 +01:00
defnax
220ccd8bf3
Merge pull request #36 from RetroShare/master
...
update to master
2019-11-27 21:32:01 +01:00
csoler
887e3ad394
make sure rs_webui cannot be enabled without rs_jsonapi
2019-11-27 21:22:21 +01:00
