obscuren
a56243075a
removed double flag. Closes #421
2015-03-04 10:51:17 +01:00
obscuren
08fd0715f9
updated genesis
2015-03-03 21:09:29 +01:00
obscuren
e9f1e868e2
Merge branch 'develop' into poc-9
2015-03-03 20:38:46 +01:00
obscuren
827ea43478
removed all old filters
2015-03-03 20:38:28 +01:00
obscuren
bb152612e0
Merge branch 'develop' into poc-9
...
Conflicts:
cmd/utils/cmd.go
2015-03-03 20:34:48 +01:00
Jeffrey Wilcke
253eb778d1
Merge pull request #411 from ethersphere/readme
...
[WIP] Update Readme
2015-03-03 20:17:51 +01:00
obscuren
8e995b97cc
Fixes and debug added
2015-03-03 20:13:11 +01:00
Alexandre Van de Sande
8c2940a98b
updating to new network health page
2015-03-03 15:00:34 -03:00
obscuren
40ff3cac39
merge
2015-03-03 17:56:36 +01:00
obscuren
313fe3861b
fixed pow stuff
2015-03-03 17:55:23 +01:00
Alexandre Van de Sande
21c373b55d
Network Health Panel with mining
2015-03-02 18:39:07 -03:00
zelig
deb2e50296
minor cleanup
2015-03-03 01:45:50 +07:00
Taylor Gerring
4cb0bfe939
Merge branch 'develop' of github.com:ethereum/go-ethereum into removews
...
Conflicts:
cmd/ethereum/flags.go
cmd/mist/flags.go
2015-03-02 07:06:08 -06:00
Taylor Gerring
cfe0370280
Remove Websockets RPC transport
2015-03-01 16:19:06 +01:00
obscuren
fdf939a6f9
Fixed miner threads for ethereum CLI
2015-02-28 23:01:41 +01:00
Jeffrey Wilcke
cdb77f0ecd
Merge pull request #402 from tgerring/rpcupdates
...
Set RPC listening address via param
2015-02-28 21:07:46 +01:00
obscuren
ae45a39dc1
Secure trie
2015-02-28 20:52:29 +01:00
obscuren
7ab13e0f17
Unused variable
2015-02-28 20:24:20 +01:00
obscuren
6ea7aae29c
Removed some methods from the JS REPL
2015-02-28 19:15:57 +01:00
Taylor Gerring
f6e821fd33
Add flag to set RPC port
2015-02-28 01:00:42 +01:00
obscuren
3ab05ddd25
Bump
2015-02-26 20:26:37 +01:00
obscuren
a1c830cd3c
Defautl block
2015-02-26 12:06:10 +01:00
Taylor Gerring
739b7cc2ac
Cleanup imports
2015-02-26 02:36:06 +01:00
Taylor Gerring
d5aed82b11
DRY DefaultAssetPath()
2015-02-26 02:32:27 +01:00
Taylor Gerring
8eeab7ea3f
Update osext import path
2015-02-26 02:24:20 +01:00
Jeffrey Wilcke
91a8c08f03
Merge pull request #368 from maran/feature/changeDataDir
...
Implement OS sensitive dataDirs
2015-02-24 17:30:44 +01:00
obscuren
b2a225a52e
Properly uninstall filters. Mining issue fixed #closes #365
...
* Added an additional tx state which is used to get the current nonce
* Refresh transient state each time a new canonical block is found
* Properly uninstall filters. Fixes a possible crash in RPC
2015-02-23 15:43:41 +01:00
Alexandre Van de Sande
dea6584018
Merge branch 'develop' into ui
2015-02-23 09:05:15 -03:00
Alexandre Van de Sande
bb3338df63
changes to sidebar sizes
2015-02-23 08:52:50 -03:00
Maran
40adb7feb6
Implement OS sensitive dataDirs
2015-02-23 11:28:20 +01:00
obscuren
321dce1f47
Bump
2015-02-22 13:26:10 +01:00
obscuren
483d96a89d
Added eth_logs & fixed issue with manual log filtering
...
* Implemented `eth_logs`
* Fixed issue with `filter.Find()` where logs were appended to an
incorrect, non-returned slice resulting in no logs found
2015-02-22 13:12:01 +01:00
obscuren
92337baa5a
reverted back to proper version number
2015-02-21 00:42:57 +01:00
obscuren
cc43ab9a81
Minor updates for release
2015-02-20 18:05:46 +01:00
obscuren
ea9a549bbd
Removed exported fields from state object and added proper set/getters
2015-02-20 14:19:34 +01:00
obscuren
0006585391
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
2015-02-19 22:46:15 +01:00
Jeffrey Wilcke
639ac5c3da
Merge pull request #352 from fjl/no-enc-handshake
...
p2p: disable encryption handshake, enable log events
2015-02-19 22:46:07 +01:00
Jeffrey Wilcke
765740b829
Merge pull request #345 from maran/feature/minerthreads
...
Implement command line argument to set the amount miner threads
2015-02-19 22:37:13 +01:00
Jeffrey Wilcke
07c34751da
Merge pull request #335 from alexvandesande/ui
...
Cut, Copy, Undo and Redo working in webview
2015-02-19 22:36:35 +01:00
obscuren
fa4cbad315
Optimisations and fixed a couple of DDOS issues in the miner
2015-02-19 22:33:22 +01:00
Felix Lange
1ec6190e86
cmd/mist: show peer names in peers window
2015-02-19 16:54:53 +01:00
Taylor Gerring
4322632c59
Merge pull request #339 from tgerring/jsonlog
...
JSON log updates
2015-02-19 12:25:45 +01:00
obscuren
0057bb4ef6
WIP QT Clipboard
2015-02-19 11:51:38 +01:00
Maran
5aff8bfb59
Implement command line argument to set the amount of agents created by the miner
...
Defaults to the amount of cores available on the CPU
2015-02-19 10:38:36 +01:00
obscuren
05b1ec008b
Disabled ability to disable whisper. Closes #334
2015-02-18 11:42:01 +01:00
Taylor Gerring
07bdba687f
Re-add LogFormat to Config
2015-02-18 10:52:36 +01:00
Alexandre Van de Sande
acd93c2971
Removed console logs from mist.js
...
also fixed an issue where it would force reloads unnecessarily
2015-02-18 10:25:40 +01:00
obscuren
60318c96d0
removed old wallet
2015-02-17 23:22:42 +01:00
obscuren
c1474e1877
Removed mined transactions from pending view. Closes #321
2015-02-17 23:10:37 +01:00
obscuren
7fc9b5b3f9
Changed to ChainEvent and fixed a nil pointer in transact
2015-02-17 22:20:47 +01:00
Alexandre Van de Sande
0e2f6691bf
Cut, Copy, Undo and Redo working in webview
2015-02-17 17:37:26 +01:00
obscuren
13c00afc68
Implement register and watchTx
2015-02-17 16:54:52 +01:00
obscuren
5238b9439e
Merge branch 'alexvandesande-ui' into develop
2015-02-17 16:18:40 +01:00
obscuren
9a2be227a6
commented peer count out
2015-02-17 16:18:29 +01:00
obscuren
fe94622ea3
Merge branch 'ui' of https://github.com/alexvandesande/go-ethereum into develop
2015-02-17 16:13:06 +01:00
obscuren
567428fb34
Filter and mutex locks added
2015-02-17 16:12:55 +01:00
Alexandre Van de Sande
abb9b7f46f
Merge branch 'develop' into ui
2015-02-17 12:29:10 +01:00
obscuren
8135752a32
"centralised" mining to backend. Closes #323
2015-02-17 12:24:58 +01:00
Alexandre Van de Sande
fbd5e4d5af
Updated icons
2015-02-17 11:52:22 +01:00
Alexandre Van de Sande
0de1d1dd58
removed status bar code
2015-02-17 11:23:28 +01:00
Alexandre Van de Sande
a22711a7b5
badge support
2015-02-17 11:22:52 +01:00
Alexandre Van de Sande
c4b8c11529
side icons
2015-02-17 00:52:40 +01:00
Alexandre Van de Sande
666ef48239
SideIcons work. Copy paste still doesn't.
2015-02-16 20:55:14 +01:00
Alexandre Van de Sande
3068e2688d
merge conflicts
2015-02-16 14:43:30 +01:00
Alexandre Van de Sande
1878630b59
Solved Issue #318 and added states to back button
2015-02-16 14:34:47 +01:00
obscuren
164de5e22b
Changed default denominators
2015-02-16 13:20:16 +01:00
Alexandre Van de Sande
05f2808849
Add http when not present on browser
2015-02-16 11:17:31 +01:00
obscuren
2c3a014f03
Resolved some bugs in the miner
...
* TODO nonce error sometimes persists
* Fixed mining on wrong blocks
* Fixed state error & receipt fail
2015-02-15 16:16:27 +01:00
obscuren
12fc590b34
removed some old menu items
2015-02-15 01:58:15 +01:00
obscuren
c29b01ce75
Reset URL bar
2015-02-14 17:18:28 +01:00
obscuren
befb4bc1c1
Fixed a few errors in the browser special meta tags objects
2015-02-14 17:13:21 +01:00
obscuren
65159d65c8
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
2015-02-14 00:27:46 +01:00
obscuren
84f7c966f7
Moved ECIES to repo & added secondary title for webview
...
* ECIES moved from obscuren to ethereum
* Added html META[name=badge] to reflect menuItem.secondaryTitle
2015-02-14 00:25:47 +01:00
Felix Lange
8464e43eaf
cmd/mist: fix peer window
2015-02-14 00:12:37 +01:00
obscuren
384305f4aa
Fixed QML errors
2015-02-13 18:33:08 +01:00
Alexandre Van de Sande
7aef0fed29
changed url bar behaviour. Failed attempt at icon
2015-02-13 18:32:15 +01:00
obscuren
6a7b0ef904
Updated coin.js abi
2015-02-13 18:17:17 +01:00
obscuren
ce239333d5
Update balance label when mining
2015-02-13 18:15:23 +01:00
obscuren
0f3c25b265
Propagate blocks
2015-02-13 18:03:16 +01:00
obscuren
790de35e7f
Fixed issue in peer window
...
* Fixed issues where new peer window could cause a crash when entering
an empty string
2015-02-13 17:57:46 +01:00
obscuren
218f437b0c
Updated window
2015-02-13 17:30:37 +01:00
obscuren
8a0f23915e
Fixed a few issues in the miner and updated hash rate title
...
* Sometimes old nonces were set by "old" agents
* Added the hash rate to the miner
2015-02-13 17:23:09 +01:00
obscuren
8305d409d2
Merge branch 'develop' into miner
2015-02-13 17:00:15 +01:00
obscuren
bde3ff16ad
merge
2015-02-13 16:02:37 +01:00
obscuren
76fa75b394
wip
2015-02-13 15:35:54 +01:00
obscuren
a5ea21cd85
merge
2015-02-13 15:05:56 +01:00
Felix Lange
170eb3ac68
p2p/discover: map listening port using configured mechanism
2015-02-13 11:39:32 +01:00
Felix Lange
d0a2e655c9
cmd/ethereum, cmd/mist, eth, p2p: use package p2p/nat
...
This deletes the old NAT implementation.
2015-02-13 11:39:31 +01:00
obscuren
38faf2c51a
removed messages
2015-02-12 17:06:15 +01:00
obscuren
31fdc645ed
cmd + t switches to new dapp window
2015-02-12 15:03:53 +01:00
obscuren
b64ad7a2a6
Merge branch 'develop' into miner
2015-02-11 23:46:54 +01:00
obscuren
3f6baa45a7
Documented methods & removed old manifest
2015-02-11 23:46:45 +01:00
obscuren
1fc3524e40
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
2015-02-11 19:22:38 +01:00
Alexandre Van de Sande
6221b282d4
Catalog Page Behaviour
2015-02-11 19:16:35 +01:00
obscuren
df49c609a0
updated coin
2015-02-11 13:26:44 +01:00
Alexandre Van de Sande
80890cd9dd
removed icomoon
2015-02-10 16:16:17 +01:00
Alexandre Van de Sande
6b5f4ed244
Recreated the changes on a new branch
2015-02-10 16:14:07 +01:00
Felix Lange
4242b05462
cmd/bootnode: new command (replaces cmd/peerserver)
2015-02-10 14:26:54 +01:00
obscuren
da2fae0e43
Basic structure miner
2015-02-10 13:04:38 +01:00
Felix Lange
a3cd218719
cmd/mist, cmd/ethereum: add CLI arguments for node key
2015-02-10 12:30:09 +01:00
obscuren
b22f0f2ef5
merged
2015-02-09 00:06:24 +01:00
obscuren
16a04e64f2
Updated coin
2015-02-07 17:04:19 +01:00
Felix Lange
028775a086
cmd/ethereum, cmd/mist: add flag for discovery bootstrap nodes
2015-02-07 00:52:49 +01:00
Felix Lange
2cf4fed11b
cmd/mist, eth, javascript, p2p: use Node URLs for peer suggestions
2015-02-07 00:46:56 +01:00
Felix Lange
56f777b2fc
cmd/ethereum, cmd/mist, core, eth, javascript, xeth: fixes for new p2p API
2015-02-06 00:03:59 +01:00
obscuren
e40c1c62ce
API changed to use Pubkey only. Reflected that change in the rest of the api
2015-02-05 15:00:59 -08:00
Felix Lange
8e8ec8f5f8
cmd/peerserver: is gone
...
Will be back soon. Maybe.
2015-02-06 00:00:36 +01:00
obscuren
2f30a27b2b
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
2015-02-05 12:22:44 -08:00
obscuren
8be1d134aa
updated home
2015-02-05 12:22:35 -08:00
obscuren
7e0799ff21
Merge commit '9d84609b3faf797f4a611587abdda3d6b3b07917' into develop
2015-02-05 12:07:36 -08:00
obscuren
c64852dbcc
pending / chain event
2015-02-05 11:55:03 -08:00
obscuren
d00e2731e5
Merge branch 'develop' of https://github.com/tgerring/go-ethereum into tgerring-develop
...
Conflicts:
rpc/http/server.go
2015-02-05 11:44:30 -08:00
Jeffrey Wilcke
99a1551b20
Merge pull request #287 from ethereum/system-testing
...
Seednode CLI param updates
2015-02-05 11:09:13 -08:00
obscuren
ac69538707
Merge branch 'develop' into miner
2015-02-05 10:58:43 -08:00
obscuren
9d2166a964
wip
2015-02-05 09:13:02 -08:00
obscuren
db7c34a9df
Default gas price and default gas for rpc
2015-02-04 18:34:29 -08:00
obscuren
57f95c1dc7
fixed test
2015-02-04 17:35:49 -08:00
obscuren
1d519854e2
Propagate known transactions to new peers on connect
2015-02-04 17:28:54 -08:00
obscuren
292f7ada8e
Merge branch 'develop' into miner
2015-02-04 15:05:49 -08:00
obscuren
65158d39b0
Filtering
2015-02-04 15:05:47 -08:00
obscuren
7c278d6ac2
updated tests
2015-02-04 12:52:34 -08:00
Taylor Gerring
429077a5a0
Merge branch 'develop' of github.com:tgerring/go-ethereum into develop
2015-02-04 10:58:18 -06:00
Taylor Gerring
2656a2d038
Use different default RPC port per #186
2015-02-04 10:57:47 -06:00
Taylor Gerring
07590196a5
Merge branch 'develop' of github.com:tgerring/go-ethereum into develop
2015-02-03 17:18:20 -06:00
obscuren
4dc283c0fb
Removed minimum height. Closes #282
2015-02-03 07:54:50 -08:00
obscuren
7bd2fbe2b1
Fixed whisper "to" filtering. Closes #283
2015-02-03 07:16:05 -08:00
obscuren
663d725026
Added a different default home page
2015-02-03 06:54:41 -08:00
obscuren
93ae7bb0d2
Raw data for existing blocks
2015-02-02 19:58:58 -08:00
Taylor Gerring
1f4ed49b4c
Move hardcoded seed node address to app flag
...
Replaces functionality `-seed=true` with `-seed="ip:port"`
2015-02-02 13:04:00 -06:00
Taylor Gerring
b2b42f759c
Update signature for rpc websockets
2015-02-02 07:37:44 -06:00
obscuren
d52878c744
Removed some VMEnv & Added VmType() to vm.Environment
2015-02-01 15:29:57 +01:00
obscuren
8e14545282
added new default favicon
2015-01-30 15:54:43 +01:00
obscuren
0ed3edc99e
"fixed" transaction view
2015-01-30 14:49:45 +01:00
obscuren
3847e248df
Bumped version number
2015-01-30 14:37:07 +01:00
obscuren
af927ffdaf
Added whisper messages
...
* have identity & get messages
2015-01-30 13:47:18 +01:00
obscuren
c03d403437
Added whisper interface for xeth, added examples, updated RPC
...
* Added RPC methods for whisper
* Added whisper example
2015-01-30 13:25:12 +01:00
obscuren
54927dc0e0
Fixed issue with Storage()
...
* Storage() returned encoded values. They are now decode prior to hexing
* Removed old code from state object
* Updated coin
2015-01-29 23:58:43 +01:00
obscuren
9022f5034f
default values removed
2015-01-29 23:17:43 +01:00
obscuren
bd992e7baf
Merge branch 'qt5.4' of github.com-obscure:ethereum/go-ethereum into qt5.4
...
Conflicts:
rpc/message.go
2015-01-29 20:41:10 +01:00
obscuren
0031f388ac
More dapp samples
...
* Info DApp, coin DApp
* Additional rpc methods
2015-01-29 20:39:26 +01:00
Taylor Gerring
1cfea1113a
Merge branch 'qt5.4' of github.com:ethereum/go-ethereum into qt5.4
2015-01-29 11:28:55 -06:00
obscuren
6488a392a3
Reimplemented message filters for rpc calls
2015-01-29 16:52:00 +01:00
obscuren
ddf17d93ac
Samples and disams cmd for evm code
2015-01-29 14:46:59 +01:00
obscuren
84adf77bf3
Added RPC "Call" for JS calls to contracts
2015-01-29 13:10:34 +01:00
obscuren
f75dcc7f4c
Added abi example
2015-01-29 13:10:04 +01:00
obscuren
6d012f628b
implement transact
2015-01-29 12:01:51 +01:00
Taylor Gerring
726852e3d3
Remove old websocket implementation
2015-01-28 21:39:49 -06:00
obscuren
ec85458612
updated ethereum.js and moved to subfolder
...
* Previous subtree caused a lot of trouble
* Implemented sha3 in our shiny new http JSON RPC
2015-01-29 00:24:18 +01:00
obscuren
73dcbf7ba2
Add 'cmd/mist/assets/ext/ethereum.js/' from commit '63d9c070ef7637a3d570a5a45ea931c1680ebc02'
...
git-subtree-dir: cmd/mist/assets/ext/ethereum.js
git-subtree-mainline: f80fe97763
git-subtree-split: 63d9c070ef
2015-01-28 23:33:24 +01:00
obscuren
f80fe97763
removed old js yet again
2015-01-28 23:33:20 +01:00
obscuren
cbf1d07073
default http rpc on
2015-01-28 23:23:33 +01:00
obscuren
adda54ac55
Added webengine initializer
2015-01-28 20:50:20 +01:00
obscuren
cebb149f5c
removed key while in the process of moving to the new key storage
2015-01-28 20:50:09 +01:00
obscuren
1c51e12c18
Merge branch 'jsonrpc' into qt5.4
2015-01-28 18:36:41 +01:00
obscuren
872b249711
further cleaned up xeth interface
2015-01-28 18:36:23 +01:00
obscuren
45e15f62f5
merge jsonrpc
2015-01-28 18:22:53 +01:00
obscuren
7f638f0b2d
moving to a better xeth
2015-01-28 18:14:28 +01:00
obscuren
fb7c03ff4d
switched to obscuren/qml
2015-01-28 14:51:54 +01:00
obscuren
9a11a94894
Updated assets & moved messages
2015-01-28 14:02:36 +01:00
obscuren
85d20cd61b
Added big numbers
2015-01-28 14:02:03 +01:00
obscuren
94976d63ca
Merge branch 'develop' into qt5.4
2015-01-28 10:58:56 +01:00
obscuren
cb47a9e97f
new ethereum.js
2015-01-28 10:58:43 +01:00
obscuren
ad5894e486
removed old ethereum.js
2015-01-28 10:54:06 +01:00
obscuren
4c5968097d
Merge branch 'jsonrpc' into qt5.4
2015-01-28 10:29:29 +01:00
Taylor Gerring
dd3f38fe5b
Rename transport to ws
...
Cleanup object naming for clarity
2015-01-27 14:16:34 -06:00
Taylor Gerring
a38bca3438
Add wsport flag to Mist
2015-01-27 12:40:52 -06:00
Taylor Gerring
5f50fe7a4a
Update CLI to use new Websocket RPC
...
Use “wsport” flag to change default port
2015-01-27 12:29:08 -06:00
Taylor Gerring
d790229a33
Move HTTP transport to sub package of RPC
2015-01-27 12:29:07 -06:00
obscuren
c54a85ee64
Reworking browser
2015-01-25 00:55:33 +01:00
obscuren
7a894e3738
Merge branch 'develop' into jsonrpc
2015-01-23 14:29:01 +01:00
obscuren
b777d6aa3f
UI Updates
...
* Browser now has tabs
* Fixed a callback issue
2015-01-22 12:35:31 +01:00
obscuren
465b0a79d8
Updated browser & pass view to callback function
2015-01-22 00:24:20 +01:00
Taylor Gerring
bdf99e0981
Add LogFormat flag
2015-01-21 10:17:07 -06:00
Taylor Gerring
0c77a96249
Move websockets out of cmd/util
2015-01-20 13:40:24 -06:00
obscuren
87f50659db
fixed url bug in browser
2015-01-20 18:42:29 +01:00
obscuren
9845029a75
StdVm by default
2015-01-20 15:49:12 +01:00
obscuren
375cc67ba6
Hide browser bar when coming from a DApp url
2015-01-20 15:48:38 +01:00
obscuren
f34838688e
Minor browser improvements
2015-01-19 11:23:17 +01:00
obscuren
acc8f7fadc
Add defer rescued back in
2015-01-16 14:51:38 +01:00
obscuren
d5d9746ca3
updated tests
2015-01-15 10:46:42 +01:00
obscuren
62e0e18030
Changed public whisper api not to reveal temporary private keys
2015-01-14 18:12:18 +01:00
obscuren
8f733461b3
Default datadir for mist is now shared with CLI (.ethereum)
2015-01-13 14:58:12 +01:00
obscuren
e3cad04dec
Fixed whisper messages
...
* Whisper protocol wasn't properly suppling envelope slices
* Message history wasn't properly propagated
* Added 'Messages' method, filtering any current envelope with the
supplied filter.
2015-01-13 13:36:44 +01:00
obscuren
34689cb3f3
Added manual triggering of filters
2015-01-12 20:36:45 +01:00
obscuren
7e6b72cb5c
removed accidental qt dep
2015-01-10 18:09:57 +01:00
obscuren
e3da85faed
Implemented filter for ws + fixes
...
* proper 0xhex
* filters fixed
* start of filter manager
* accounts for ws. Closes #246
2015-01-10 00:51:56 +01:00
obscuren
f9b0d1a8e7
Updated to new ethereum.js api
2015-01-09 13:36:47 +01:00
obscuren
c9f566269b
merged
2015-01-09 13:28:48 +01:00
obscuren
bfa12d75f8
new switch
2015-01-09 13:26:49 +01:00
obscuren
18d8bf4b9c
updated ethereum.js
2015-01-09 13:01:21 +01:00
obscuren
aee82d3196
removed
2015-01-09 13:00:37 +01:00
obscuren
012a1c2533
Updated ethereum.js
2015-01-09 12:45:09 +01:00
obscuren
585f259b63
Support input from args
2015-01-09 12:04:54 +01:00
obscuren
4a0ade4788
Fixed some whisper issues
2015-01-08 21:41:32 +01:00
obscuren
ee84b20247
Reworking GUI interaction. Fixed javascript inject. Closes #132
2015-01-08 16:38:24 +01:00
obscuren
982c812e81
Read directly from stdin
2015-01-07 13:38:28 +01:00
obscuren
fed3e6a808
Refactored ethutil.Config.Db out
2015-01-07 13:17:48 +01:00
obscuren
032ab66529
Added version flag
2015-01-07 01:21:55 +01:00
Felix Lange
36e1e5f151
cmd/peerserver: add some command line switches
2015-01-06 12:23:37 +01:00
Felix Lange
4c8c115a76
cmd/peerserver: use NoDial, don't use seed peers
2015-01-06 12:23:37 +01:00