Commit Graph

Select branches

Hide Pull Requests

813492291816/v0.6

Kleshni/POW

PeterSurda/cq101

PeterSurda/w64fix

akeelahmedqureshi/v0.6

anand-skss/test_case

bootstrap

cis-muzahid/test_refactor_sqlthread

coolguy-cell/CQfixes11

dependabot/pip/docutils-lt-0.20.0

dependabot/pip/kivymd-1.1.1

dependabot/pip/mistune-lt-2.0.6

dimyme/cherry

dimyme/patch-3

f97ada87/opmode-netcat-v2

g1itch/doc-python3

g1itch/knownnodes-opt

g1itch/qt5-wip

g1itch/refactoring-sql

g1itch/tests-screenshot

g1itch/ui-refactoring

g1itch/windows

gitea-117

gitea-125

gitea-128

gitea-63

kashikoibumi/binary

kashikoibumi/bytes-key

kashikoibumi/dark-theme

kashikoibumi/import-path

kashikoibumi/literal

kashikoibumi/memoryview

kashikoibumi/py3

kashikoibumi/py3qt

kashikoibumi/qt5-wip

kashikoibumi/six

kashikoibumi/strict-blob

kaue/patch-1

kdcis/mock-test

kdcis/v0.6-flatpak

kyucrane/mobileRecv

lakshyacis/graphicalqttest

master

navjotcis/bug-fixes18

navjotcis/bug-fixes4

navjotcis/telenium-test-cases

osamacis/Kivy-baseclass-localization

osamacis/kivy-transifex-config

python3

python3android

sgj3/attachments

sgj3/issue1538

shekhar-cis/test_sqlthread_refactor

shportix/sql-refactoring

teruteru128/refactor-swap64

test

test2

test3

test4

test5

v0.6

#1

#1

#10

#10

#100

#100

#1001

#1001

#1002

#1002

#1004

#1005

#1005

#1006

#1007

#1007

#101

#101

#1014

#1017

#1018

#102

#102

#1020

#1025

#1026

#1027

#1028

#1029

#103

#103

#1030

#1031

#1031

#1032

#1036

#1037

#1038

#1040

#1040

#1041

#1042

#1043

#1045

#1045

#1046

#1047

#1048

#1048

#1050

#1051

#1052

#1053

#1054

#1055

#1056

#1057

#1058

#1059

#106

#106

#1060

#1061

#1061

#1062

#1063

#1063

#1064

#1065

#1066

#1067

#1067

#1068

#107

#107

#1070

#1071

#1072

#1073

#1074

#1075

#1076

#1077

#1078

#1082

#1083

#1084

#1085

#1087

#1087

#1088

#1089

#1089

#109

#109

#1090

#1091

#1091

#1092

#1093

#1093

#1094

#1094

#1095

#1096

#1097

#1097

#1098

#1099

#1099

#11

#11

#1100

#1101

#1101

#1102

#1102

#1103

#1104

#1104

#1105

#1106

#1108

#1109

#1110

#1111

#1112

#1113

#1114

#1115

#1116

#1117

#1118

#1121

#1122

#1123

#1124

#1125

#1126

#1127

#1128

#113

#113

#1137

#1139

#1141

#1143

#1143

#1145

#1148

#1149

#1149

#1150

#1151

#1152

#1153

#1154

#1156

#1157

#1158

#1159

#1159

#116

#116

#1160

#1163

#1164

#1165

#1165

#1166

#1166

#1167

#1168

#1169

#117

#117

#1170

#1171

#1172

#1173

#1174

#1175

#1176

#1176

#1177

#1178

#1179

#118

#118

#1180

#1181

#1181

#1182

#1182

#1183

#1184

#1184

#1186

#1186

#1188

#1189

#1189

#119

#119

#1190

#1191

#1192

#1193

#1196

#1197

#1198

#1198

#1199

#1199

#12

#12

#120

#120

#1200

#1202

#1203

#1204

#1204

#1205

#1206

#1207

#1207

#1208

#1209

#1209

#1210

#1211

#1212

#1212

#1214

#1216

#1217

#1218

#1219

#1219

#122

#122

#1220

#1221

#1222

#1222

#1224

#1226

#1226

#1228

#123

#123

#1230

#1231

#1233

#1235

#1238

#1239

#124

#124

#1242

#1242

#1243

#1243

#1244

#1244

#1245

#1245

#1247

#1247

#1248

#1249

#1250

#1251

#1252

#1253

#1254

#1255

#1256

#1256

#1257

#1258

#1259

#126

#126

#1261

#1263

#1264

#1265

#1265

#1268

#127

#127

#1271

#1272

#1272

#1273

#1275

#1278

#1279

#1279

#128

#128

#1280

#1281

#1282

#1283

#1284

#1284

#1285

#1286

#1289

#129

#129

#1290

#1291

#1294

#1295

#1296

#1297

#1299

#13

#13

#130

#130

#1300

#1301

#1302

#1303

#1304

#1307

#1308

#1308

#1309

#1309

#1310

#1310

#1312

#1312

#1313

#1315

#1317

#1319

#1319

#132

#132

#1320

#1321

#1322

#1323

#1324

#1324

#1325

#1326

#1327

#1327

#1328

#1329

#133

#133

#1331

#1332

#1334

#1336

#1337

#1339

#134

#134

#1340

#1341

#1342

#1344

#1344

#1346

#1346

#1348

#1348

#1349

#1349

#1350

#1350

#1351

#1351

#1352

#1355

#1356

#1357

#1358

#1359

#1362

#1363

#1364

#1365

#1366

#1367

#1368

#1369

#137

#137

#1370

#1371

#1372

#1376

#1377

#138

#138

#1382

#1384

#1386

#1387

#1388

#1389

#1389

#1390

#1391

#1392

#1394

#1394

#1395

#1396

#1397

#1398

#1399

#14

#14

#140

#140

#1400

#1401

#1402

#1405

#1406

#141

#141

#1410

#1411

#1412

#1413

#1415

#1416

#1419

#1420

#1422

#1423

#1424

#1425

#1429

#1430

#1431

#1432

#1434

#1437

#1439

#1442

#1443

#1446

#1447

#1448

#1451

#1452

#1453

#1454

#1455

#1457

#146

#146

#1462

#1463

#1464

#1466

#1467

#1469

#1470

#1471

#1472

#1473

#1474

#1475

#1478

#148

#148

#1480

#1481

#1483

#1487

#1488

#1489

#149

#1490

#1491

#1492

#1493

#1494

#1495

#1496

#1498

#1499

#15

#15

#150

#150

#1500

#1501

#1502

#1506

#1507

#1509

#151

#151

#1510

#1511

#1512

#1513

#1514

#1515

#1516

#1517

#1518

#1519

#1520

#1521

#1522

#1523

#1525

#1526

#1527

#1528

#1529

#153

#153

#1530

#1531

#1533

#1534

#1534

#1536

#1537

#1539

#154

#154

#1540

#1541

#1542

#1543

#1544

#1544

#1545

#1546

#1547

#155

#155

#1550

#1552

#1554

#1556

#1559

#1561

#1562

#1563

#1564

#1565

#1566

#1567

#1568

#1569

#1569

#1570

#1570

#1573

#1576

#1577

#1579

#1579

#158

#158

#1580

#1581

#1582

#1584

#1585

#1586

#1587

#1588

#1589

#159

#159

#1590

#1591

#1592

#1593

#1594

#1595

#1596

#1599

#16

#16

#160

#160

#1600

#1602

#1603

#1603

#1605

#1606

#1608

#1609

#161

#161

#1613

#1613

#1614

#1615

#1617

#1618

#1619

#1620

#1621

#1621

#1623

#1624

#1625

#1628

#1629

#163

#163

#1630

#1632

#1634

#1635

#1636

#1637

#1638

#1639

#1642

#1643

#1645

#1646

#1647

#1648

#1649

#1650

#1650

#1651

#1652

#1653

#1654

#1655

#1657

#1659

#166

#166

#1661

#1663

#1664

#1665

#1666

#1667

#1668

#1669

#1670

#1671

#1671

#1672

#1673

#1674

#1675

#1676

#1677

#1678

#1679

#1680

#1681

#1682

#1683

#1684

#1685

#1686

#1688

#1689

#1691

#1693

#1694

#1694

#1697

#1698

#1699

#17

#17

#1701

#1704

#1707

#1708

#1709

#1713

#1715

#1715

#1716

#1717

#1718

#1719

#1721

#1722

#1722

#1723

#1725

#1726

#1727

#1728

#1729

#1730

#1731

#1732

#1733

#1734

#1736

#1737

#1738

#1738

#1739

#1740

#1742

#1743

#1743

#1745

#1746

#1747

#1748

#1749

#175

#175

#1750

#1751

#1755

#1756

#1757

#1759

#176

#176

#1760

#1761

#1762

#1764

#1766

#1767

#1768

#1768

#1769

#1770

#1771

#1772

#1773

#1773

#1774

#1775

#1776

#1777

#1778

#1779

#1780

#1781

#1782

#1783

#1784

#1785

#1786

#1787

#1788

#1789

#1790

#1791

#1792

#1793

#1794

#1794

#1795

#1796

#1797

#1798

#1799

#18

#18

#180

#180

#1800

#1801

#1802

#1803

#1804

#1805

#1806

#1807

#1808

#1809

#181

#181

#1810

#1811

#1812

#1813

#1814

#1815

#1816

#1817

#1818

#1819

#182

#182

#1820

#1821

#1822

#1823

#1824

#1825

#1826

#1827

#1828

#1829

#1830

#1831

#1832

#1833

#1835

#1836

#1837

#1838

#1839

#184

#184

#1840

#1842

#1843

#1844

#1846

#1847

#1848

#1849

#185

#185

#1850

#1851

#1852

#1853

#1854

#1856

#1858

#1859

#1860

#1861

#1862

#1863

#1864

#1865

#1866

#1867

#1868

#1869

#187

#187

#1870

#1871

#1872

#1873

#1874

#1875

#1876

#188

#188

#1881

#1882

#1883

#1883

#1884

#1885

#1885

#1886

#1887

#1888

#1890

#1891

#1893

#1894

#1895

#1897

#1899

#19

#19

#1900

#1904

#1905

#1906

#1907

#1908

#1909

#191

#191

#1910

#1911

#1912

#1913

#1914

#1915

#1916

#1917

#1918

#192

#192

#1920

#1921

#1922

#1925

#1926

#1927

#1928

#1929

#193

#193

#1931

#1932

#1933

#1934

#1935

#1936

#1937

#1939

#1942

#1943

#1944

#1945

#1947

#1948

#1950

#1951

#1952

#1954

#1955

#1956

#1957

#1958

#1959

#196

#196

#1960

#1961

#1962

#1963

#1964

#1965

#1966

#1967

#1968

#1969

#197

#197

#1970

#1971

#1972

#1973

#1974

#1975

#1976

#1977

#1978

#1979

#198

#198

#1980

#1981

#1982

#1983

#1985

#1986

#1987

#1988

#1989

#1990

#1992

#1993

#1994

#1995

#1996

#1997

#1998

#1999

#1999

#2

#2

#20

#20

#2000

#2001

#2002

#2003

#2004

#2005

#2006

#2007

#2008

#2009

#2010

#2011

#2012

#2013

#2014

#2015

#2016

#2017

#2018

#2019

#202

#202

#2020

#2021

#2022

#2023

#2024

#2025

#2026

#2027

#2028

#2029

#203

#203

#2030

#2031

#2032

#2033

#2034

#2035

#2036

#2037

#2038

#2039

#204

#204

#2041

#2042

#2043

#2044

#2045

#2046

#2047

#2048

#2049

#205

#205

#2050

#2051

#2052

#2053

#2054

#2055

#2056

#2057

#2058

#2059

#2060

#2061

#2062

#2063

#2064

#2065

#2066

#2067

#2068

#2069

#2070

#2071

#2072

#2073

#2074

#2075

#2075

#2076

#2077

#2077

#2078

#2079

#208

#208

#2080

#2081

#2082

#2083

#2084

#2085

#2087

#2087

#2088

#2090

#2091

#2092

#2093

#2094

#2095

#2096

#2097

#2098

#2099

#21

#21

#210

#210

#2100

#2101

#2102

#2103

#2104

#2104

#2105

#2106

#2106

#2107

#2108

#2109

#211

#211

#2111

#2112

#2113

#2114

#2115

#2116

#2117

#2118

#2119

#212

#212

#2120

#2121

#2122

#2123

#2124

#2125

#2126

#2127

#2128

#2129

#2130

#2131

#2132

#2133

#2134

#2135

#2136

#2136

#2137

#2138

#2138

#214

#214

#2140

#2142

#2142

#2143

#2144

#2146

#2146

#2147

#2147

#2149

#2150

#2150

#2151

#2152

#2153

#2154

#2155

#2156

#2157

#2159

#2160

#2161

#2162

#2163

#2165

#2166

#2167

#2168

#2169

#2170

#2171

#2172

#2173

#2175

#2176

#2177

#2178

#2179

#218

#218

#2180

#2181

#2182

#2183

#2184

#2185

#2186

#2187

#2188

#2189

#2190

#2191

#2192

#2193

#2194

#2195

#2196

#2197

#2198

#2199

#22

#22

#220

#220

#2200

#2201

#2202

#2203

#2204

#2205

#2206

#2207

#2208

#2209

#2210

#2211

#2212

#2213

#2214

#2215

#2216

#2217

#2218

#2219

#222

#222

#2220

#2221

#2222

#2223

#2224

#2225

#2226

#2227

#2228

#2228

#223

#223

#2234

#2235

#2236

#2236

#2237

#2237

#2238

#2238

#2239

#2239

#224

#224

#2240

#2240

#2241

#2241

#2242

#2242

#2243

#2243

#2244

#2245

#2245

#2246

#2248

#2248

#2249

#2249

#225

#225

#2250

#2250

#2251

#2252

#2253

#2254

#2255

#2255

#2256

#2257

#2258

#2258

#2259

#226

#226

#2260

#2260

#2261

#2262

#2263

#2265

#2266

#2267

#2268

#2269

#227

#227

#2270

#2272

#2272

#2273

#2274

#2275

#2276

#228

#228

#229

#23

#23

#230

#230

#231

#231

#232

#232

#234

#234

#236

#236

#237

#237

#238

#238

#24

#24

#240

#240

#241

#241

#242

#242

#245

#245

#247

#247

#249

#249

#25

#25

#251

#251

#252

#252

#253

#253

#254

#254

#257

#257

#259

#259

#26

#26

#261

#261

#262

#262

#265

#265

#266

#266

#269

#269

#27

#27

#271

#271

#272

#272

#273

#273

#275

#275

#276

#276

#277

#277

#28

#28

#280

#280

#281

#281

#285

#285

#287

#287

#29

#29

#290

#290

#291

#291

#294

#294

#295

#295

#296

#297

#297

#3

#3

#30

#30

#300

#300

#302

#302

#303

#303

#304

#304

#305

#305

#306

#306

#307

#307

#308

#308

#309

#309

#31

#31

#313

#313

#314

#314

#316

#316

#319

#319

#32

#32

#321

#321

#324

#324

#325

#325

#327

#327

#328

#328

#329

#329

#33

#33

#330

#330

#332

#332

#333

#333

#335

#335

#336

#336

#337

#337

#338

#338

#339

#339

#34

#34

#342

#342

#345

#345

#346

#346

#348

#348

#349

#349

#35

#35

#351

#351

#353

#353

#354

#354

#355

#355

#356

#356

#357

#357

#358

#358

#36

#36

#360

#360

#361

#361

#362

#362

#363

#363

#367

#367

#368

#368

#369

#369

#37

#37

#372

#372

#377

#377

#378

#378

#38

#38

#380

#380

#383

#383

#384

#384

#385

#385

#388

#388

#39

#39

#390

#390

#391

#391

#393

#393

#394

#394

#398

#398

#399

#399

#4

#4

#40

#40

#403

#403

#404

#404

#405

#405

#406

#406

#409

#409

#41

#41

#410

#410

#411

#411

#412

#412

#414

#414

#419

#419

#42

#42

#421

#421

#423

#423

#425

#425

#427

#427

#428

#428

#429

#429

#43

#43

#431

#431

#432

#432

#435

#435

#437

#437

#438

#438

#439

#439

#44

#44

#440

#440

#441

#441

#442

#442

#446

#446

#448

#448

#449

#449

#45

#45

#450

#450

#453

#453

#455

#455

#456

#456

#457

#457

#458

#458

#459

#459

#46

#46

#460

#460

#461

#461

#462

#462

#463

#463

#466

#466

#467

#467

#468

#468

#469

#469

#471

#471

#473

#473

#475

#475

#476

#476

#477

#477

#478

#478

#479

#479

#48

#48

#480

#480

#481

#481

#482

#482

#483

#483

#488

#488

#489

#489

#49

#49

#490

#490

#491

#491

#493

#493

#494

#494

#497

#497

#498

#498

#499

#499

#5

#5

#50

#50

#502

#502

#505

#505

#506

#506

#507

#507

#508

#508

#509

#509

#515

#515

#516

#516

#518

#518

#52

#52

#521

#521

#522

#522

#523

#523

#525

#525

#526

#526

#528

#528

#53

#53

#531

#531

#532

#534

#535

#537

#537

#54

#54

#542

#547

#548

#550

#551

#552

#552

#553

#554

#554

#555

#555

#557

#557

#560

#561

#562

#57

#57

#570

#570

#571

#573

#573

#574

#575

#576

#577

#577

#578

#579

#58

#58

#581

#581

#582

#585

#585

#586

#586

#587

#587

#588

#59

#59

#591

#593

#594

#595

#596

#596

#597

#597

#598

#599

#599

#6

#6

#60

#60

#600

#600

#601

#601

#602

#602

#604

#605

#606

#606

#608

#609

#61

#61

#610

#613

#614

#615

#616

#617

#618

#619

#620

#621

#622

#623

#624

#625

#626

#627

#627

#628

#629

#633

#634

#637

#638

#639

#64

#64

#641

#641

#642

#65

#65

#650

#650

#652

#652

#654

#657

#657

#658

#658

#66

#66

#661

#663

#664

#665

#666

#668

#67

#67

#670

#672

#674

#676

#676

#677

#677

#679

#68

#68

#681

#684

#685

#686

#686

#687

#688

#69

#69

#692

#694

#696

#697

#699

#7

#7

#70

#70

#700

#701

#702

#702

#703

#704

#705

#707

#709

#71

#71

#710

#712

#713

#713

#714

#714

#715

#718

#718

#719

#719

#72

#72

#721

#721

#722

#722

#726

#727

#73

#73

#730

#731

#733

#734

#735

#736

#738

#738

#740

#741

#741

#742

#749

#749

#750

#751

#752

#753

#754

#754

#755

#755

#756

#757

#759

#760

#762

#765

#766

#77

#77

#771

#773

#773

#774

#774

#778

#78

#78

#781

#781

#782

#783

#784

#784

#787

#788

#789

#790

#791

#791

#792

#796

#797

#797

#798

#798

#802

#805

#806

#807

#808

#808

#81

#81

#810

#810

#811

#811

#812

#812

#816

#817

#82

#82

#820

#820

#822

#822

#824

#824

#826

#826

#829

#829

#836

#836

#843

#844

#844

#845

#845

#85

#85

#852

#858

#859

#859

#868

#868

#869

#869

#871

#873

#879

#879

#88

#88

#880

#880

#882

#882

#888

#888

#89

#89

#891

#899

#9

#9

#90

#90

#902

#903

#904

#905

#907

#908

#909

#909

#910

#910

#911

#912

#913

#914

#915

#915

#916

#917

#918

#92

#92

#922

#924

#925

#926

#927

#927

#928

#93

#93

#930

#931

#932

#933

#934

#936

#937

#937

#938

#938

#939

#939

#940

#944

#945

#946

#947

#948

#949

#95

#95

#950

#950

#951

#952

#954

#955

#956

#957

#958

#959

#96

#96

#960

#961

#962

#963

#963

#965

#966

#967

#967

#968

#968

#969

#97

#97

#970

#971

#972

#973

#974

#975

#976

#976

#977

#98

#98

#981

#981

#984

#985

#987

#987

#988

#988

#989

#99

#99

#995

#995

#996

0.6.3.1

0.6.3.2

continuous

v0.3.5

v0.4.0

v0.4.1

v0.4.2

v0.4.3

v0.4.4

v0.4.5

v0.4.5.1

v0.4.5.2

v0.5.0

v0.5.1

v0.5.2

v0.5.3

v0.5.4

v0.5.5

v0.5.6

v0.5.7

v0.5.8

v0.6.0

v0.6.1

v0.6.2

v0.6.3

Mono Color

• b002a93102 Merge pull request #468 from Atheros1/master Jonathan Warren 2013-09-02 21:21:58 -0700
• 40e65d7216 Merge e214f0bb66 into 6039626450 Jonathan Warren 2013-09-02 21:21:42 -0700
• f4f859c417
  Added ability to set a message's read status using getInboxMessageID. This rather than #368 Jonathan Warren 2013-09-03 00:20:30 -0400
• e214f0bb66 Added ability to set a message's read status using getInboxMessageID. This rather than #368 Jonathan Warren 2013-09-03 00:20:30 -0400
• 16ce63d601
  Merge pull request #467 from Atheros1/master Jonathan Warren 2013-09-02 20:20:20 -0700
• 6039626450 Merge pull request #467 from Atheros1/master Jonathan Warren 2013-09-02 20:20:20 -0700
• f65fe90dc1 Merge f64461feb0 into 1554e17282 Jonathan Warren 2013-09-02 20:20:04 -0700
• 582f633562
  fixes to new SQL refactoring Jonathan Warren 2013-09-02 23:14:43 -0400
• f64461feb0 fixes to new SQL refactoring Jonathan Warren 2013-09-02 23:14:43 -0400
• 209a6186d7
  minor changes to previous commit Jonathan Warren 2013-09-02 18:24:22 -0400
• ea3cf9e00e minor changes to previous commit Jonathan Warren 2013-09-02 18:24:22 -0400
• a62d0b184f
  Merge branch 'sql_refactor' of git://github.com/grant-olson/PyBitmessage into grant-olson-sql_refactor Jonathan Warren 2013-09-02 17:30:06 -0400
• 95c1dbda5a Merge branch 'sql_refactor' of git://github.com/grant-olson/PyBitmessage into grant-olson-sql_refactor Jonathan Warren 2013-09-02 17:30:06 -0400
• 553b072c3a Merge 8d8e43b1fc into 1554e17282 Grant Olson 2013-09-02 14:13:51 -0700
• 1990c62ac8
  Merge pull request #466 from Atheros1/master Jonathan Warren 2013-09-02 14:09:03 -0700
• 1554e17282 Merge pull request #466 from Atheros1/master Jonathan Warren 2013-09-02 14:09:03 -0700
• 86b6a86b33 Merge 9774cd2a5c into 6f48d6738b Jonathan Warren 2013-09-02 14:08:25 -0700
• 3714f7752e
  fix #464 Jonathan Warren 2013-09-02 16:51:32 -0400
• 9774cd2a5c fix #464 Jonathan Warren 2013-09-02 16:51:32 -0400
• 21b2f89fb6 Added External IP Address to client Status merlink 2013-09-02 16:20:42 +0200
• ded6736e1b Added more infos to ClientStatus merlink 2013-09-01 22:34:20 +0200
• a7423a3ad5 Added unittests for markInboxMessageAsRead(msgid) and markInboxMessageAsUnread(msgid) merlink 2013-09-01 22:13:18 +0200
• dd3904059e Added functions: markInboxMessageAsRead(msgid) and markInboxMessageAsUnread(msgid) merlink 2013-09-01 18:07:26 +0200
• 71684a6c27 Recreated API and excluded it to a single class including unittests merlink 2013-09-01 13:30:12 +0200
• f2c0f598db
  Added SqlBulkExecute class so we can update inventory without a million commits Grant T. Olson 2013-08-31 10:40:11 -0400
• 8d8e43b1fc Added SqlBulkExecute class so we can update inventory without a million commits Grant T. Olson 2013-08-31 10:40:11 -0400
• 95a5c3840f
  Merge remote-tracking branch 'upstream/master' into sql_refactor Grant T. Olson 2013-08-30 17:59:35 -0400
• b83781cefb Merge remote-tracking branch 'upstream/master' into sql_refactor Grant T. Olson 2013-08-30 17:59:35 -0400
• ca6a765f50
  Merge pull request #462 from Atheros1/master Jonathan Warren 2013-08-30 10:54:41 -0700
• 6f48d6738b Merge pull request #462 from Atheros1/master Jonathan Warren 2013-08-30 10:54:41 -0700
• e9d50dbbe2 Merge 95cf453de4 into ae03a2c621 Jonathan Warren 2013-08-30 10:54:34 -0700
• a3d900af81
  resolve merge conflict Jonathan Warren 2013-08-30 13:26:55 -0400
• 95cf453de4 resolve merge conflict Jonathan Warren 2013-08-30 13:26:55 -0400
• fd35f4216c Merge 3697ba5d95 into ae03a2c621 Jonathan Warren 2013-08-30 09:24:40 -0700
• bf2392ea1d Merge a6615685aa into ae03a2c621 sendiulo 2013-08-30 09:22:34 -0700
• ba8efa4b20 Merge b80d9b13e8 into ae03a2c621 Grant Olson 2013-08-30 09:21:31 -0700
• 46498bf37f
  Merge pull request #461 from Atheros1/master Jonathan Warren 2013-08-30 08:56:57 -0700
• ae03a2c621 Merge pull request #461 from Atheros1/master Jonathan Warren 2013-08-30 08:56:57 -0700
• bd0f1053ac Merge 5eba4e6442 into da50d0c0d3 Jonathan Warren 2013-08-30 08:56:46 -0700
• 35deb254c5
  quoted out the BSD licensed code (as i didn't get it to work properly yet) sendiulo 2013-08-30 09:02:49 +0200
• 9b28e1932d quoted out the BSD licensed code (as i didn't get it to work properly yet) sendiulo 2013-08-30 09:02:49 +0200
• 7e169c267a
  Merge branch 'master' into Fast_PoW_unless_frozen Grant T. Olson 2013-08-29 11:42:10 -0400
• 5eba4e6442 Merge branch 'master' into Fast_PoW_unless_frozen Grant T. Olson 2013-08-29 11:42:10 -0400
• 72f9700382
  Fixed regression in adding to address book Grant T. Olson 2013-08-29 11:16:59 -0400
• 2165157c6e Fixed regression in adding to address book Grant T. Olson 2013-08-29 11:16:59 -0400
• b80d9b13e8 Use FastPoW on OSX Grant T. Olson 2013-08-29 11:04:51 -0400
• 025b5d24ab
  Fix regression where I couldn't add a subscription Grant T. Olson 2013-08-29 10:00:27 -0400
• 8a6d1d9cd5 Fix regression where I couldn't add a subscription Grant T. Olson 2013-08-29 10:00:27 -0400
• a6615685aa added settingsupdate of existing setting files. sendiulo 2013-08-29 15:49:28 +0200
• 0195f97789 Merge branch 'upstream/master' sendiulo 2013-08-29 15:35:06 +0200
• c400384be4 This feature adds a checkbox in the "Send" tab which needs to be unchecked ("removed" like a saftey badge) in order to enable the "Send" button. This shall prevent accidentally sending a messages without having checked the content, the sender and the recipient. sendiulo 2013-08-29 15:07:47 +0200
• acc34d62c6
  new API method needs to use helper_sql Grant T. Olson 2013-08-29 08:47:27 -0400
• 03ce8ba8fb new API method needs to use helper_sql Grant T. Olson 2013-08-29 08:47:27 -0400
• 20289c78a1
  Merge branch 'master' into sql_refactor Grant T. Olson 2013-08-29 08:45:45 -0400
• b5873187bf Merge branch 'master' into sql_refactor Grant T. Olson 2013-08-29 08:45:45 -0400
• 75c20b405d
  have shared.py use helper_sql and move the sql queues and locks to helper_sql Grant T. Olson 2013-08-29 08:03:45 -0400
• 7499de4e13 have shared.py use helper_sql and move the sql queues and locks to helper_sql Grant T. Olson 2013-08-29 08:03:45 -0400
• 91d9313666
  use helper_sql in class_receiveDataThread Grant T. Olson 2013-08-29 07:53:43 -0400
• 92c1368691 use helper_sql in class_receiveDataThread Grant T. Olson 2013-08-29 07:53:43 -0400
• 03e7725372
  use helper_sql in class_singleWorker Grant T. Olson 2013-08-29 07:27:30 -0400
• 1fb11495a6 use helper_sql in class_singleWorker Grant T. Olson 2013-08-29 07:27:30 -0400
• 135c16cf22
  use helper_sql for helper_sent Grant T. Olson 2013-08-29 07:27:09 -0400
• d879e35e26 use helper_sql for helper_sent Grant T. Olson 2013-08-29 07:27:09 -0400
• f013958619
  Merge pull request #453 from acejam/master Jonathan Warren 2013-08-28 19:10:14 -0700
• da50d0c0d3 Merge pull request #453 from acejam/master Jonathan Warren 2013-08-28 19:10:14 -0700
• 9530c529c5 Merge b5f42d7549 into b39db1ffb5 acejam 2013-08-28 19:07:38 -0700
• 457b350fdb
  Merge pull request #457 from akh81/update-russian-translation Jonathan Warren 2013-08-28 19:06:56 -0700
• b39db1ffb5 Merge pull request #457 from akh81/update-russian-translation Jonathan Warren 2013-08-28 19:06:56 -0700
• 691ce3e7e6
  Identicons now in new messages and in the From combobox. sendiulo 2013-08-28 16:50:46 +0200
• 07b67051c9 Identicons now in new messages and in the From combobox. sendiulo 2013-08-28 16:50:46 +0200
• 2554b7dd9a
  Merge branch 'master' into sql_refactor Grant T. Olson 2013-08-28 10:44:39 -0400
• 8b750be136 Merge branch 'master' into sql_refactor Grant T. Olson 2013-08-28 10:44:39 -0400
• 7f00fe8cb1 Merge 6b9914fe46 into ef43248752 akh81 2013-08-28 02:55:17 -0700
• 704e4ddbf3
  updated Russian translations akh81 2013-08-28 04:50:52 -0500
• 6b9914fe46 updated Russian translations akh81 2013-08-28 04:50:52 -0500
• b5585e442d
  updated Russian translations akh81 2013-08-28 04:45:35 -0500
• e8cd025b18 updated Russian translations akh81 2013-08-28 04:45:35 -0500
• b481212709
  Merge pull request #438 from rspeed/master Jonathan Warren 2013-08-27 19:48:18 -0700
• ef43248752 Merge pull request #438 from rspeed/master Jonathan Warren 2013-08-27 19:48:18 -0700
• e4fa528d81 Merge f0ba10e2b9 into c4e402b7f8 Rob Speed 2013-08-27 19:42:33 -0700
• ef6b752430
  Merge pull request #456 from Atheros1/master Jonathan Warren 2013-08-27 19:40:44 -0700
• c4e402b7f8 Merge pull request #456 from Atheros1/master Jonathan Warren 2013-08-27 19:40:44 -0700
• 6382b99c70 Merge 83ffab9e4a into f98761a5d1 Jonathan Warren 2013-08-27 19:39:44 -0700
• c3a304003f
  manually merge #431 Jonathan Warren 2013-08-27 22:38:32 -0400
• 83ffab9e4a manually merge #431 Jonathan Warren 2013-08-27 22:38:32 -0400
• 80ef2e5b56
  Merge pull request #455 from Atheros1/master Jonathan Warren 2013-08-27 19:32:35 -0700
• f98761a5d1 Merge pull request #455 from Atheros1/master Jonathan Warren 2013-08-27 19:32:35 -0700
• ced4a14913 Merge 0d5f2680d4 into 07a679bdd1 Jonathan Warren 2013-08-27 19:32:23 -0700
• e872cfa6f5
  various modifications to previous commit regarding ability to select language Jonathan Warren 2013-08-27 22:29:39 -0400
• 0d5f2680d4 various modifications to previous commit regarding ability to select language Jonathan Warren 2013-08-27 22:29:39 -0400
• 72c176ab0f
  Merge branch 'master' of git://github.com/sendiulo/PyBitmessage into sendiulo-master Jonathan Warren 2013-08-27 21:11:40 -0400
• aea1d41bf8 Merge branch 'master' of git://github.com/sendiulo/PyBitmessage into sendiulo-master Jonathan Warren 2013-08-27 21:11:40 -0400
• 4a41b407ad Merge 6c20d83edc into 07a679bdd1 sendiulo 2013-08-27 18:08:44 -0700
• 7d8bf087ec
  Merge pull request #421 from tvwerkhoven/master Jonathan Warren 2013-08-27 18:06:33 -0700
• 07a679bdd1 Merge pull request #421 from tvwerkhoven/master Jonathan Warren 2013-08-27 18:06:33 -0700
• c5dd54ee65 Merge 16ff6e883a into 4d2ab28b8d Tim van Werkhoven 2013-08-27 18:05:57 -0700
• e05b584342
  Merge pull request #411 from UnderSampled/master Jonathan Warren 2013-08-27 18:05:06 -0700
• 4d2ab28b8d Merge pull request #411 from UnderSampled/master Jonathan Warren 2013-08-27 18:05:06 -0700
• 27c3e2317d Merge 85fc2682f0 into 61c9251183 UnderSampled 2013-08-27 14:19:03 -0700
• fc080a55a0
  class_singleCleaner uses helper_sql Grant T. Olson 2013-08-27 08:46:57 -0400