csoler
734a308aa3
fixed some gui bits in IdDialog
2015-09-07 00:01:50 -04:00
csoler
a2d686351f
move circles code to IdDialog
2015-09-06 23:53:21 -04:00
csoler
08be890339
added circle edit functionality to People tab
2015-09-06 18:19:51 -04:00
csoler
a1ce7f2d6f
updated branch to upstream/master
2015-09-06 17:37:13 -04:00
csoler
697b7be5d1
fixed compilation of circles
2015-09-06 17:34:43 -04:00
thunder2
738dadadc9
Fixed Windows compile of VOIP.
2015-09-03 16:33:50 +02:00
thunder2
9bbdefa48a
Added "QMAKE_LFLAGS += -Wl,--start-group" to pluigns for Windows compile.
2015-09-03 16:24:57 +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
csoler
97237c867c
merge PR/81, merging with master
2015-09-02 22:43:42 -04:00
csoler
5dfdffb763
merged Pull Request #81 , providing avcodec video encoding/decoding
2015-09-02 22:39:39 -04:00
csoler
77c0d562fb
fixed deleting/stopping video devices
2015-09-02 22:14:04 -04:00
Cyril Soler
0b50aa28f3
Merge pull request #80 from AsamK/paste_plain_text
...
Add "Paste as plain text" to context menu of RS text edits
2015-09-02 20:32:23 -04: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
Cyril Soler
3fbbcd30eb
Merge pull request #79 from chozabu/more_travis
...
added more details to travis IRC output
2015-09-02 18:27:51 -04:00
Chozabu
11d54b8c0b
added more details to travis IRC output
2015-09-02 22:37:34 +01:00
Cyril Soler
a022019358
Merge pull request #74 from RetroShare/revert-72-Fix_WinCompil_libresapi_u_int_32_t
...
Revert "Fix Windows compilation of libresapi with error:"
2015-09-01 21:10:45 -04:00
Cyril Soler
6af57f3aea
Revert "Fix Windows compilation of libresapi with error:"
2015-09-01 21:03:23 -04:00
Cyril Soler
296ffd2f2d
Merge pull request #73 from AsamK/fix_tlv_deserialization
...
Fix subtle bug in tlv deserialization of TLV_TYPE_KEYSIGNATURETYPE
2015-09-01 20:53:28 -04:00
Cyril Soler
d2dc8deeaf
Merge pull request #66 from AsamK/qmake_improvements_next
...
More qmake improvements
2015-09-01 20:49:57 -04:00
Cyril Soler
1713789917
Merge pull request #72 from PhenomRetroShare/Fix_WinCompil_libresapi_u_int_32_t
...
Fix Windows compilation of libresapi with error:
2015-09-01 20:45:02 -04:00
AsamK
3cfe69787f
Fix subtle bug in tlv deserialization of TLV_TYPE_KEYSIGNATURETYPE
...
When using -O2, the variable currType is optimized out, so the
signature is added with the wrong sign type. Then when verifying the
data the signature is not found and verification fails.
The main sympton of this bug was receiving no more forum/channel posts.
Wit debug builds (-O0) this worked, that's why not every one was affected
by this.
This bug was introduced in 2012 (19e856c2a8
)
2015-09-02 02:03:46 +02:00
Phenom
3e68741994
Fix Windows compilation of libresapi with error:
...
\libresapi\src\api\ForumHandler.cpp:108: erreur : 'u_int32_t' was not
declared in this scope
KeyValueReference<u_int32_t>
vis_msg("visible_msg_count", grp.mMeta.mVisibleMsgCount);
^
2015-09-01 22:49:15 +02:00
thunder2
c3fff39624
Fixed Windows compile
2015-09-01 22:49:08 +02:00
AsamK
dda8a49ef5
Add CONFIG+=NO_SQLCIPHER to travis config
2015-09-01 14:53:18 +02:00
AsamK
069b112135
Update README.md
2015-09-01 14:53:18 +02: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
2be400e33e
CONFIG shouldn't be reset at qmake call, use CONFIG+=… instead
...
With CONFIG=…, the default values of CONFIG are cleared, with qt4 this
doesn't seem to be a problem, but with qt5 the build fails.
CONFIG=staticlib in openpgpsdk.pro was added in 3caeb0ab7f
for OS X, but is not necessary on linux
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
csoler
b1572c2924
added missing deps for avcodec
2015-08-31 22:50:20 -04:00
csoler
c5cd701d4c
removed experimental wavelet codec
2015-08-31 22:44:34 -04:00
csoler
3d9e3e8b7c
attempt to setup variable bitrate. Improved codec params
2015-08-31 22:41:38 -04:00
Cyril Soler
4006b08093
Merge pull request #65 from AsamK/fix_qt46
...
Fix compile with qt < 4.7
2015-08-31 19:50:12 -04: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
electron128
5d4e94c671
libresapi: add basic forum read api (patch from Chozabu) close #32
2015-08-31 19:44:15 +02:00
Cyril Soler
ef292faa22
Merge pull request #61 from PhenomRetroShare/Improve_ElidedLabel_Alignment_HTML
...
Improve ElidedLabel
2015-08-31 10:43:29 -04:00
AsamK
cfde9d303c
Escape name before inserting in name changed message and in anchor info
2015-08-31 16:38:28 +02:00
AsamK
bd6bb8996b
Improve performance of eventFilter in chat lobbies
...
- Only check the anchors if the visible content has actually changed
by saving lastUpdateCursorPos and End
- Check notify first, before doing any work
- Simplify regexp as the anchors have a fixed format
- Remove unnecessary conversion to utf8 and back
2015-08-31 12:10:49 +02:00
AsamK
5f81d8efc8
Remove nick from anchor names, causes problems
...
- Nicknames that contain " could break the formatting
- Nicknames containing chars like < or > were converted to html entities
by the QTextBrowser so the anchor was no longer identical with the
anchor stored in the _listMsg list
2015-08-31 12:10:49 +02:00
Thunder
de92c06f0b
Merge pull request #62 from hunbernd/qt5-fix
...
Qt5 fix
2015-08-31 12:05:08 +02:00
hunbernd
bd3f7f6d38
Removed limit on opacity setting with recent windows versions on BandwidthGraphDialog
...
Conflicts:
retroshare-gui/src/gui/statistics/BandwidthGraphWindow.cpp
2015-08-30 22:53:38 +02:00
hunbernd
acc3e4bb62
Replaced Q_WS_ --> Q_OS_
...
Q_WS macros are not available in Qt5
Restores some functions in Options->General dialog that were not available under Qt5
2015-08-30 22:51:15 +02:00
csoler
68918bf9c1
added variable bitrate and attempt to control it.
2015-08-29 21:48:58 -04:00
defnax
d9fd60ee75
Moved Id Chooser to Tool Menu
...
Added a place holder text.
2015-08-30 03:48:45 +02:00