csoler
fc94cf2c2d
added latest update to IdDialog from defnax
2015-12-11 23:49:35 -05:00
csoler
11fb0bacc8
fixed missing code in previous merge
2015-12-05 17:25:55 -05:00
csoler
0c1e6301b3
merged with latest upstream trunk
2015-12-05 16:49:00 -05:00
csoler
325956e8ed
renamed flag for messaging permissions to a more appropriate name
2015-12-04 23:15:52 -05:00
csoler
be17a563d1
fixed compilation and added flag function for permissions in messaging
2015-12-04 23:08:49 -05:00
csoler
39f4878244
incorporated changed from defnax
2015-12-04 22:42:56 -05:00
Cyril Soler
dcdf9df0a4
merged
2015-12-04 14:14:13 -05:00
Cyril Soler
88d3e98b7e
updated TODO list
2015-12-04 14:13:46 -05:00
Cyril Soler
89693b1fd5
updated TODO list
2015-12-04 14:12:35 -05:00
defnax
d2a99786ac
Fixed Qt5 Fusion stylesheet on MessageComposer
2015-12-04 19:56:56 +01:00
Cyril Soler
d32765cd5d
updated TODO list
2015-12-04 10:53:14 -05:00
defnax
4b38b66937
update todo
2015-11-29 17:28:05 +01:00
defnax
923efda9ae
update todo list
2015-11-28 18:13:35 +01:00
Cyril Soler
950f407614
updated todo
2015-11-27 14:16:57 -05:00
Cyril Soler
874f304cd2
Merge pull request #167 from G10h4ck/pqicleaning
...
Removed some cruft like mymethod(){return;} from pqi
2015-11-26 14:48:30 -05:00
csoler
87ede7eff5
removed debug info
2015-11-25 18:41:40 -05:00
csoler
bca89c63c6
fixed serialisation bug and added new GUI bits
2015-11-25 18:08:53 -05:00
Cyril Soler
2f31dcf008
Merge pull request #182 from ericthefish/master
...
Improve some of the wording of labels and information
2015-11-25 09:27:56 -05:00
Ivan Lucas
e8173bdaec
Improve some of the wording of labels and information
2015-11-25 10:33:28 +00:00
defnax
397729bd93
Added to count downloads/uploads items
...
Enabled to get copy the DHT label values via mouse
Added counting on DHT Window & added context menu for DHT Tree, to copy IP addresses to clipboard
2015-11-24 19:41:13 +01:00
Cyril Soler
36c68e71ec
Merge pull request #181 from dali99/patch-1
...
Fixed a small spelling error
2015-11-24 09:31:29 -05:00
Daniel Løvbrøtte Olsen
8eadba60a3
Fixed a small spelling error
2015-11-24 14:43:09 +01:00
Cyril Soler
b2470565c3
Merge pull request #179 from sirjenster/osx
...
latest OSX patches.
2015-11-21 15:08:43 -05:00
defnax
c89ff9f059
Added nickname column to pending packets & context menu action to view details
...
Fixed ui layout.
2015-11-21 13:47:50 +01:00
defnax
2e76cc6267
Fixed DHT icon
2015-11-21 12:32:55 +01:00
electron128
4b84767250
hide network mode selection in quick start wizard if node is a hidden node
2015-11-21 11:57:50 +01:00
Jenster
1f9cb27bbd
other_osx_patch
2015-11-20 20:40:00 -08:00
Jenster
699299ae8a
latest OSX patches
2015-11-20 08:10:59 -08:00
csoler
3fbbc57a1f
added update of flags for contacts
2015-11-19 23:04:13 -05:00
csoler
1347ee4b37
added regular contacts list and method to move RsGxsIds from/into this list
2015-11-19 22:58:28 -05:00
csoler
1de55d8fc5
replaced the few bools in RsIdentityDetail by a set of flags
2015-11-19 21:14:32 -05:00
defnax
47328a4ec9
Merge branch 'master' of https://github.com/RetroShare/RetroShare
2015-11-19 19:11:02 +01:00
defnax
4dacd9a54d
Added Ban/Unban Context menu actions for People list.
2015-11-19 19:08:47 +01:00
Cyril Soler
df6abc88e5
merged before commit
2015-11-19 10:54:38 -05:00
Cyril Soler
fa4308e6e6
updated TODO list
2015-11-19 10:52:53 -05:00
defnax
5404cda302
Added Forum reply with plaintext quote (by anmo)
2015-11-19 12:05:52 +01:00
defnax
e3d12b8194
Disabled Fontmetrics on RemoteDirModel Columns, it causes unusable very small column height.
2015-11-18 21:24:38 +01:00
defnax
701f1ceb4a
Fixed counting thx to sehraf
2015-11-17 17:33:25 +01:00
defnax
01f3db70d3
Added to count identity items on People
2015-11-17 15:58:22 +01:00
Cyril Soler
17dc7c7dfc
Merge pull request #68 from chozabu/systray_tweaks
...
add option to disable updates to systray tooltip
2015-11-16 23:56:37 -05:00
Cyril Soler
0751876303
changed MAX_CACHE_SIZE to not use the default (fixes previous commit that was wrong)
2015-11-16 14:06:45 -05:00
csoler
b44d08ac4c
changed GXS id cache size to 5000 instead of 100. Should help a lot GXS id handling
2015-11-14 21:18:26 -05:00
csoler
e0e3621bb4
added missing wily for ubuntu packages
2015-11-14 21:16:30 -05:00
electron128
8238c822b4
fix integer size issue in ContentTypes.cpp which can lead to an infinite loop
2015-11-08 10:34:31 +01:00
electron128
0a21d92aca
Merge pull request #176 from hunbernd/feature/webui-download-enhancements
...
Webui download and media streaming enhancements
2015-11-08 10:23:45 +01:00
Cyril Soler
3991b6f213
Merge pull request #175 from sembrestels/patch-1
...
Adding libsqlcipher-dev package
2015-11-08 01:38:37 -05:00
hunbernd
0ef9b22a7e
Some fixes:
...
* using ContentTypes to resolve static files too
* added some default content types, in the case of mime.types file not present
* resolve extensions with upper case letters in them
2015-11-08 01:52:23 +01:00
defnax
c6ad0d4b5c
Merge pull request #122 from PhenomRetroShare/Fix_PrioritySpeedMenuForDownloadFiles
...
Fix priority Speed Menu for download file.
2015-11-08 01:07:59 +01:00
hunbernd
b847eea57e
Webui: Added video support into MediaPlayerWidget
2015-11-08 00:08:03 +01:00
Sem
37353e59d5
Adding libsqlcipher-dev package
...
It is needed for quick start in debian jessie.
2015-11-07 19:41:55 +01:00