Cyril Soler
7195d4c20d
Merge pull request #105 from ericthefish/master
...
Improve wordings
2015-09-10 09:41:28 -04:00
Ivan Lucas
4880fc489b
Fixed grammar on add friend wizard by rewording slightly
2015-09-10 11:21:01 +01:00
Ivan Lucas
840e9306d6
Fix Spelling and Grammar
2015-09-10 10:29:15 +01:00
Ivan Lucas
770e9340b3
Merge remote-tracking branch 'upstream/master'
2015-09-10 10:18:14 +01:00
Cyril Soler
4a0539c035
Merge pull request #103 from AsamK/html_parsing
...
Improve HTML parsing in libresapi
2015-09-09 19:57:07 -04:00
Cyril Soler
1acd4a3b01
Merge pull request #104 from PhenomRetroShare/Fix_ElidedLabel_mousePresEvent
...
Fix ElidedLabel::mousePressEvent.
2015-09-09 16:44:59 -04:00
Phenom
ce9fc7b7b5
Fix ElidedLabel::mousePressEvent.
2015-09-09 22:37:38 +02:00
Ivan Lucas
75a7a89e8f
Fix typo
2015-09-09 15:19:17 +01:00
AsamK
7aad9c12d0
Improve HTML parsing in libresapi
...
- Completely ignore content of <style> tags, otherwise CSS declarations
from newer RS builds are displayed
- Only remove <…> tags if it's really html, to prevent destroying messages
from other webui users
2015-09-09 13:36:00 +02:00
AsamK
b8c3c89ae0
Extract getPlainText method
2015-09-09 12:42:41 +02:00
thunder2
ebd5da5e83
Optimizations in RsGenExchange, p3GxsForums and p3GxsChannels.
...
- Removed not used variables
- avoid copy constructors
- Use swap instead of operator= to move elements of std containers
2015-09-09 09:46:46 +02:00
Cyril Soler
490b88c16a
Merge pull request #100 from ericthefish/master
...
Fix a couple of minor spelling issues
2015-09-08 14:17:29 -04:00
Ivan Lucas
a2e7e4de41
Fixed spelling/grammar
2015-09-08 16:12:50 +01:00
Ivan Lucas
4f8b098e94
Fixing spelling
2015-09-08 16:00:00 +01:00
thunder2
c4061fc6aa
Removed not used time consuming calculation of row count from RetroCursor.
2015-09-08 15:14:26 +02:00
thunder2
29a1fa2ce4
Removed unnecessary copy of results in RsGxsDataAccess.
2015-09-08 15:07:45 +02:00
sehraf
0bc77d75ae
added some error handling
2015-09-08 13:48:30 +02:00
Cyril Soler
da417eede9
Merge pull request #96 from AsamK/qmake_3
...
Qmake: Use PKGCONFIG and reduce duplicate code in .pro files
2015-09-07 20:38:47 -04:00
Cyril Soler
63e38af19c
Merge pull request #94 from AsamK/correct_libav_version
...
Fix libav version check
2015-09-07 20:36:03 -04:00
sehraf
03d99ae4af
made GenCertDislog more generic
2015-09-07 23:55:57 +02:00
sehraf
4fc6c73dd9
replaced some ifs with switch
2015-09-07 23:40:52 +02:00
defnax
e2768e0c87
Added last used field to Person Details Window
2015-09-07 23:34:39 +02:00
sehraf
fed43450ae
made server settings more generic and added i2p support
2015-09-07 23:01:24 +02:00
sehraf
95d6b06eb5
first working version
2015-09-07 21:34:10 +02:00
sehraf
0107f4e406
first run on gui integration
2015-09-07 21:34:10 +02:00
sehraf
ba74c04581
removed duplicated code, fixed compile, few additions
2015-09-07 21:34:10 +02:00
sehraf
c17d0e1498
add i2p support to libretroshare
2015-09-07 21:34:10 +02:00
defnax
2c1743f5bb
Added send message function for Participants list.
2015-09-07 15:13:32 +02:00
defnax
cc4be39025
Merge branch 'master' of https://github.com/RetroShare/RetroShare
2015-09-07 15:08:56 +02:00
AsamK
0793a6a52d
Use PLUGIN_DIR to define plugin directory only once
2015-09-06 22:27:22 +02:00
AsamK
fe1ec9d510
Fixed mac compile. Moved sqlcipher.a to libretroshare.pro
2015-09-06 22:27:22 +02:00
AsamK
571336e1f4
Move duplicate common stuff out of platform parts
2015-09-06 22:27:22 +02:00
AsamK
66b9557833
Use PKGCONFIG instead of manually specifying LIBS for Linux
...
- The advantage is that this method automatically includes additional
dependencies of LIBS (e.g. libupnp needs -lixml).
- Also if some distribution moves headers to non default locations the
correct locations get added by PKGCONFIG
2015-09-06 22:27:22 +02:00
thunder2
b8e3a434cf
Auto download of recommended files adds the sender as source of the download.
2015-09-06 21:28:34 +02:00
thunder2
5f36500d02
Fixed click in column "Friend nodes" in FriendList.
2015-09-06 14:21:05 +02:00
thunder2
869077b4a5
Combined selects in RsDataService::retrieveNxsGrps/RsDataService::retrieveNxsMsgs.
2015-09-06 01:13:27 +02:00
csoler
8bb76c95ac
fixed VOIP compilation on ubuntu 14.04
2015-09-05 16:21:49 -04:00
csoler
1de2f01d22
updated ubuntu changelog
2015-09-05 16:21:30 -04:00
thunder2
d4226b6815
Fixed Windows compile. Moved "-lsqlcipher" to libretroshare.pro
2015-09-05 21:31:38 +02:00
AsamK
d6f50c71f2
Fix libav version check
...
- Off-by-one error in the #ifs
- Libav actually contains the old constants and functions as well,
marked as deprecated. Just the CodecID enum was removed completely.
2015-09-05 15:52:03 +02:00
Cyril Soler
cd2dce3e3e
Merge pull request #93 from AsamK/pegmark_wiki
...
Disable pegmarkdown build by default, only used by disabled wiki
2015-09-05 09:49:40 -04:00
AsamK
ae43058520
Make wikis compile
...
- rsWiki->updated() doesn't exist anymore, so I ported WikiDialog to
inherit from RsGxsUpdateBroadcastPage
- add -lglib-2.0 to pegmarkdown.pro
2015-09-05 09:25:08 +02:00
AsamK
2bf81be6a7
Disable compiling of wikis in libretroshare
...
It is disabled in the gui anyway
2015-09-05 09:25:08 +02:00
AsamK
1f134d3431
Remove gxs CONFIG, it's always enabled now anyways
2015-09-05 09:25:08 +02:00
AsamK
4e917ea26c
Disable compiling of pegmarkdown by default, only used for wiki
...
- Move unfinished CONFIGs to common retroshare.pri file
- Compile and link pegmarkdown only if CONFIG+=wikipoos is set
2015-09-05 09:25:08 +02:00
Cyril Soler
6bc6e22e12
Merge pull request #92 from AsamK/fix_travis_voip
...
Fix travis voip
2015-09-04 21:05:55 -04:00
defnax
e9a5523c54
Merge branch 'master' of https://github.com/RetroShare/RetroShare
2015-09-05 00:16:07 +02:00
AsamK
f2994b7558
Old libav versions used constant without AV_ prefix
...
From Jenster
2015-09-04 23:59:13 +02:00
AsamK
efc057e128
Fix build with libavcodec < 55
2015-09-04 23:42:26 +02:00
Cyril Soler
7385dd12ac
Merge pull request #91 from AsamK/fix_opensuse_compile
...
Fix opensuse compile
2015-09-04 13:48:58 -04:00
