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
csoler
9a24af87a4
Moved #ifdef RS_WEBUI inside RS_JSONAPI ifdefs so that the webui files cannot be requested unless jsonapi files are compiled
2019-11-27 21:14:20 +01:00
defnax
e7c863e70e
Merge pull request #35 from RetroShare/master
...
fixed compilation: both rs_jsonapi and rs_webui are needed to compile…
2019-11-27 20:47:21 +01:00
csoler
50529654f8
fixed compilation: both rs_jsonapi and rs_webui are needed to compile p3webui.h/cc
2019-11-27 20:24:56 +01:00
defnax
6710e80091
Merge pull request #34 from RetroShare/master
...
update to master
2019-11-27 20:04:42 +01:00
Gioacchino Mazzurco
5fae53d65c
Merge branch 'v0.6-WebUI'
2019-11-27 19:19:29 +01:00
Gioacchino Mazzurco
1d4ca64dee
Prepare for merging
2019-11-27 18:44:10 +01:00
defnax
93fcd47747
Merge pull request #33 from RetroShare/master
...
update to master
2019-11-26 22:13:31 +01:00
csoler
b3dddd117b
Merge pull request #1718 from defnax/Update-the-news-Feed-items-&-removed-the-default-old-stylesheets
...
Update the news feed items & removed the default old stylesheets
2019-11-26 22:07:30 +01:00
csoler
a591289ec2
Merge pull request #1716 from defnax/Fixed-feedreader-compile-and-changed-icons-for-the-feed-item
...
Fixed feedreader compile and changed icons for the feed item
2019-11-26 22:06:05 +01:00
csoler
7fa63f9342
Merge pull request #1719 from csoler/v0.6-ImprovedGUI
...
fixed size problem in channel feed items
2019-11-26 22:04:50 +01:00
csoler
3834939eae
fixed size problem in channel feed items
2019-11-26 21:00:17 +01:00
csoler
b1860d8682
fixed two warnings
2019-11-26 18:52:39 +01:00
defnax
01c5c270a7
Removed the old stylsheets from the news feeds & update the icons
2019-11-26 15:32:49 +01:00
defnax
483a77f3a9
Merge pull request #32 from RetroShare/master
...
update to master
2019-11-26 15:20:38 +01:00
csoler
3af234f4b0
added missing file
2019-11-26 14:00:20 +01:00
defnax
be929f4335
little changes
2019-11-25 23:06:04 +01:00
csoler
fd34091fbf
Merge pull request #1715 from defnax/Fixed-tabwidget-text-for-retroshare-id
...
Fixed tabwidget text for Retroshare ID
2019-11-25 22:33:04 +01:00
csoler
7aa51423a4
fixes required by review of pr1700
2019-11-25 22:16:32 +01:00
csoler
5223ff751a
removed .gitignore
2019-11-24 18:39:36 +01:00
csoler
4a257614f1
merged with upstream/master
2019-11-24 18:38:50 +01:00
defnax
13b8fe77f9
Improved Circle Feed Item
2019-11-24 17:32:51 +01:00
defnax
c12d633730
Fixed FeedeReader compile & changed feed item icons
2019-11-24 16:54:24 +01:00
csoler
b842936ae7
removed webUI shutdown when quiting because it duplicates jsonapi shutdown.
2019-11-24 15:47:41 +01:00
csoler
ef76b571c8
added missing restart
2019-11-24 11:04:26 +01:00
