Cyril Soler
66691d4f37
Merge pull request #108 from sehraf/i2p
...
Adding I2P support to RS
2015-09-16 20:01:39 -04:00
sehraf
04abfad894
manually reverted changes by Qt Creator
2015-09-16 17:01:20 +02:00
sehraf
7c7e4f86dc
added ip addr. field to the add certificate dialog
2015-09-16 12:13:54 +02:00
sehraf
6202e83c32
add default case to gui instead of falling back to tor labeling
2015-09-16 11:48:32 +02:00
sehraf
d3d184f2eb
added simple step-by-step guide to add a I2P server tunnel
2015-09-16 11:09:04 +02:00
sehraf
e54358ac11
added simple step-by-step guide to add a I2P client tunnel
2015-09-16 10:55:33 +02:00
sehraf
8725aab180
gui fixes
2015-09-14 15:14:39 +02:00
sehraf
6b87c38951
small fixes
2015-09-14 14:56:14 +02:00
sehraf
6ec191944d
gui changes
2015-09-14 12:39:46 +02:00
sehraf
b0251e3806
generalized tooltips
2015-09-14 12:12:28 +02:00
Phenom
48e6618c8d
Send Mouse event to FriendList's item, since ElidedLabel was fixed.
2015-09-13 19:00:31 +02: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
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
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
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
sehraf
03d99ae4af
made GenCertDislog more generic
2015-09-07 23:55:57 +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
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
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
5f36500d02
Fixed click in column "Friend nodes" in FriendList.
2015-09-06 14:21:05 +02:00
thunder2
d4226b6815
Fixed Windows compile. Moved "-lsqlcipher" to libretroshare.pro
2015-09-05 21:31:38 +02: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
defnax
07c5030c36
Merge branch 'master' of https://github.com/RetroShare/RetroShare
2015-09-03 17:41:30 +02:00
thunder2
b1b2de617a
Fixed Windows compile.
...
- Set name for prl file in libretroshare.pro
- Use "QMAKE_LFLAGS += -Wl,--start-group" to solve link issue
2015-09-03 13:14:39 +02:00
AsamK
feafb1e291
Add "Paste as plain text" to context menu of RS text edits
...
Useful for example when pasting from a website
2015-09-03 00:28:19 +02:00
defnax
3d6e9783f6
Fixed Status Label on Distant Chat
2015-09-02 13:06:15 +02:00
Cyril Soler
d2dc8deeaf
Merge pull request #66 from AsamK/qmake_improvements_next
...
More qmake improvements
2015-09-01 20:49:57 -04:00
AsamK
d116f40d6e
Move openpgpsdk to common section of libretroshare.pro
...
It is the same for all platforms
2015-09-01 14:53:17 +02:00
AsamK
30d7aa3be3
Remove dependency on qt script, it's unused
2015-09-01 14:53:17 +02:00
AsamK
829c2f396e
Move LIBS from gui/nogui linux section to libretroshare
...
remove -lglib-2.0 it's not needed:
was added in d8e327afcc
to compile for arch,
but it compiles on arch now also without this
2015-09-01 14:53:17 +02:00
AsamK
846f7d0204
Make usage of sqlcipher explicit at compile time
...
Either the build fails if it is not available, or the user specifies
CONFIG+=NO_SQLCIPHER to build without it, even if it exists in the system.
2015-09-01 14:53:09 +02:00
AsamK
b43e0ab2e0
Fix compile with qt < 4.7
...
Reenable placeholder text for lobby name, not sure why it was disabled
2015-08-31 23:38:50 +02:00
AsamK
dca295143a
Use CONFIG+=create_prl for libretroshare
...
Allows to specify all LIBS in libretroshare.pro so they don't also have
to be specified in gui/nogui.pro
2015-08-31 22:50:47 +02:00
AsamK
b9c174ba8f
Add BIN_DIR variable to allow packagers to override it
2015-08-31 22:50:46 +02:00
AsamK
b66f466c7a
Move all INSTALLS to the subproject they belong to
...
Allows installation of for example only retroshare-nogui, without
installing files only relevant for gui
$ qmake
$ make retroshare-nogui
$ make retroshare-nogui-install_subtargets
2015-08-31 22:49:46 +02:00
AsamK
e135e3441c
Create retroshare.pri for common configurations in .pro files
...
So far it only contains the default values for installation paths
2015-08-31 21:09:28 +02:00
Cyril Soler
c844d37ada
Merge pull request #63 from AsamK/lobby_gui_lag
...
Remove lobby gui lag
2015-08-31 14:11:45 -04:00