Commit Graph

930 Commits (1b22a993a0e669a67f2e2b020ab585fb59e4d3e4)

Author SHA1 Message Date
Kevin Froman c1d4040807 better catch tkinter import 2018-09-03 22:38:08 -05:00
Kevin Froman 0050b60f1a better catch tkinter import 2018-09-03 22:30:15 -05:00
Kevin Froman da3e0fdc4e better catch tkinter import 2018-09-03 22:28:56 -05:00
Kevin Froman 0106721cd0 Merge branch 'user-abstraction' of ssh://192.168.1.101:/home/beardog/onionr into user-abstraction 2018-09-03 22:26:57 -05:00
Kevin Froman 389b1a10ce
merge user-abstraction into webui work 2018-09-03 14:10:59 -05:00
Kevin Froman ccdf0801a8 Merge branch 'master' into user-abstraction 2018-09-03 10:29:36 -05:00
Kevin Froman 1318bb3ea6
use new gevent version to support python 3.7 2018-09-03 10:28:08 -05:00
Arinerron ecefa41792 Complete first part of work on onionrui 2018-09-02 22:08:12 -07:00
Arinerron b01184d151 add logos 2018-09-02 15:44:23 -07:00
Kevin Froman 6b33749b37
adding board plugin 2018-09-02 15:19:27 -05:00
Kevin Froman 8cbc16224d work on cliui 2018-09-02 15:18:53 -05:00
Kevin Froman 083003191f work on cliui 2018-09-01 23:55:24 -05:00
Kevin Froman c142ab770a work on cliui 2018-09-01 21:59:03 -05:00
Kevin 9fd985ea49 work on the cliui 2018-09-01 15:38:44 -05:00
Kevin 1203bb2b7a * Adjusted connect configuration
* work on cli-ui
2018-08-31 22:29:57 -05:00
Kevin bed6475e1b use secrets from dependencies 2018-08-31 19:51:14 -05:00
Kevin Froman 1b16c809fd work on user connections 2018-08-31 17:53:48 -05:00
Kevin Froman 716fb7335c
removed debug statements 2018-08-29 23:49:28 -05:00
Kevin Froman 6ecb1fa75d merged config to get up to date 2018-08-29 23:07:11 -05:00
Kevin Froman 53505832cc preparing for config merge 2018-08-29 23:05:38 -05:00
Kevin Froman f4cc1a6f8f
updated dockerfile, fixed bug in showing name in mail 2018-08-28 22:02:32 -05:00
Kevin Froman c0c0f838b6 better user info syncing and show names in mail 2018-08-28 20:09:27 -05:00
Kevin Froman c907558dd1
more work on user info 2018-08-27 23:45:31 -05:00
Kevin Froman 7a0cfe34f3
work on adding/removing friends, user info 2018-08-26 22:44:32 -05:00
Kevin f15d00f61f Merge branch 'config-all-the-things' into 'master'
Configuration for more things

See merge request beardog/Onionr!8
2018-08-25 14:57:12 +00:00
Kevin Froman 7a7b627259 use config for some timers 2018-08-25 09:33:38 -05:00
Kevin Froman b6c015255d
do not use self in peercleanup 2018-08-24 18:57:53 -05:00
Kevin Froman b46bd42d9e fixed invalid argument call 2018-08-24 17:42:09 -05:00
Kevin Froman e346c09228
bug fixes 2018-08-23 14:46:23 -05:00
Kevin Froman 1faae80aaf sync improvements, bug fixes, config changes 2018-08-23 13:24:32 -05:00
Kevin Froman 638436ee10 sync improvements, bug fixes, config changes 2018-08-23 13:02:48 -05:00
Kevin Froman e34c08b036 sync improvements, bug fixes, config changes 2018-08-23 12:48:49 -05:00
Kevin Froman 6d31fa4229 fix peer amount check not calling method 2018-08-23 09:59:00 -05:00
Kevin Froman 25e4444bda fix comparison error in storagecounter 2018-08-23 09:54:37 -05:00
Kevin Froman cd39ae68b6 r not w 2018-08-23 09:51:53 -05:00
Kevin Froman 1217e4a83c removed bad argument in storagecounter 2018-08-23 09:45:51 -05:00
Kevin Froman a6719abed7
added storagecounter.py 2018-08-23 09:01:17 -05:00
Kevin Froman dd5cb99155
* do not save blocks if disk allocation reached
* improved some commenting
* bug fixes
2018-08-22 23:59:41 -05:00
Kevin 53577a4c10 work on netcheck and configuration 2018-08-21 15:01:50 -05:00
Kevin 823bcc48b9 Merge branch 'master' of github.com:beardog108/onionr 2018-08-20 14:26:48 -05:00
Kevin 1db4d48fb5 Merge branch 'test' into 'master'
fix address merge

See merge request beardog/Onionr!7
2018-08-20 01:37:56 +00:00
Kevin Froman a33d45f430
fixed broken address merge 2018-08-19 20:32:21 -05:00
Kevin e27265f2fc Merge branch 'v3' into 'master'
V3 onion config

See merge request beardog/Onionr!6
2018-08-19 04:09:53 +00:00
Kevin Froman 9d827493e4
+ v3 onion config
+ use newer ubuntu
2018-08-18 23:07:09 -05:00
Kevin Froman 0f8581b399
fixed crash in mail 2018-08-18 14:38:15 -05:00
Kevin Froman 953b9f2190 Merge branch 'master' of gitlab.com:beardog/Onionr 2018-08-18 13:52:43 -05:00
Kevin 0f89cda911 Merge branch 'peer-blacklist' into 'master'
Lots of work

See merge request beardog/Onionr!5
2018-08-18 18:04:52 +00:00
Kevin Froman 23f6b475f4 Merge branch 'peer-blacklist' of gitlab.com:beardog/Onionr into peer-blacklist 2018-08-18 10:10:19 -05:00
Kevin Froman 3a666d23e7
disabled site viewer 2018-08-18 10:09:55 -05:00
Kevin a0fa52056e Merge branch 'master' into 'peer-blacklist'
# Conflicts:
#   Makefile
2018-08-18 14:59:25 +00:00