Commit graph

Select branches

Hide pull requests

199-add-remove-keyword-mutes-should-remove-add-statuses-to-the-feeds

450-make-non-whole-word-mutes-case-insensitive

454-allow-keyword-mutes-to-skip-mentions

541-emojo-picker-completion-broken-for-custom-emojos

ThibG-patch-1

autocollapse-boost

compose-redesign

compose-refactor

dependabot/npm_and_yarn/eventsource-1.1.1

dont-show-solo-skins

feature-private-federation

feature/193-mute-and-block-notes

feature/extensions-endpoint

feature/keyword-mutes/modify-home-feed

fix-async

fix-column-headers-accessibility

fix-imports

fix-mute-mentions

fix-null-status

fix-thread-inheritance

fix-uploadarea-keyup-for-upstream

flavour-urls

for-upstream/optional-notification-muting

garglamel-yaml

glitch-favicon

glitch-soc/main

glitch-soc/tests/optimiri

hotkeys-glitch

images-in-cws

list-filtering

load-public-on-admin

local-only-in-api

main

merge-upstream

more-frontends--easy-mode--win

new-theme-ux

no-dm-option

no-spin

restructure-kw-as-word-lists

skylight

split-components

status-style-improves

tag-sensitive-imgs

theme-intl8n

themed-prefetching

thread-mode

tootbutton-title

tree-based-adv-formatting

tweak-491

unify-timeline-code

update-mastodongo

wide-tootbox-panel

with-mastodon-go

#1

#100

#1001

#1002

#1003

#1004

#1007

#1008

#1009

#1010

#1011

#1012

#1013

#1016

#1017

#1018

#1019

#1020

#1022

#1025

#1028

#1029

#1030

#1031

#1032

#1033

#1034

#1036

#1038

#1041

#1042

#1043

#1044

#1045

#1046

#1047

#1048

#1048

#1049

#1053

#1054

#1055

#1056

#1057

#1058

#1060

#1061

#1063

#1064

#1065

#1067

#1068

#107

#1070

#1071

#1072

#1073

#1074

#1075

#1076

#1078

#1079

#108

#108

#1081

#1082

#1083

#1086

#1087

#1088

#109

#1090

#1093

#1094

#1095

#1096

#1097

#1098

#110

#1100

#1101

#1102

#1105

#1107

#1108

#1109

#111

#1110

#1111

#1112

#1115

#1116

#1117

#1119

#1120

#1121

#1122

#1126

#1127

#1128

#1129

#1133

#1134

#1138

#1140

#1141

#1142

#1143

#1145

#1146

#1147

#1148

#1150

#1151

#1152

#1154

#1156

#1157

#1158

#1159

#1160

#1161

#1163

#1164

#1165

#1166

#1167

#1168

#1169

#117

#1170

#1171

#1174

#1175

#1176

#1177

#1178

#1179

#1182

#1183

#1185

#1187

#1189

#1190

#1191

#1193

#1194

#1195

#1196

#1198

#1199

#1200

#1201

#1205

#1206

#1207

#1208

#1209

#1210

#1211

#1213

#1214

#1215

#1216

#1217

#1219

#1220

#1221

#1222

#1224

#1225

#1228

#1229

#1231

#1232

#1233

#1235

#1236

#1237

#1238

#1239

#124

#1240

#1241

#1242

#1243

#1245

#1246

#1247

#1248

#1248

#1249

#125

#1250

#1251

#1252

#1253

#1254

#1255

#1256

#1257

#1259

#1261

#1262

#1263

#1264

#1265

#1266

#1267

#1268

#1269

#127

#1270

#1271

#1272

#1273

#1274

#1275

#1277

#1278

#1279

#1280

#1282

#1283

#1284

#1285

#1287

#1288

#1289

#129

#1290

#1291

#1292

#1293

#1293

#1295

#1297

#1299

#1300

#1301

#1305

#1306

#1308

#1310

#1311

#1312

#1314

#1315

#1316

#1317

#1318

#1319

#1320

#1321

#1323

#1324

#1326

#1327

#1329

#1331

#1332

#1334

#1335

#1337

#1338

#1339

#1341

#1342

#1344

#1345

#1346

#1347

#1350

#1351

#1352

#1353

#1354

#1355

#1356

#1358

#1360

#1361

#1363

#1364

#1366

#1368

#1369

#137

#137

#1370

#1371

#1372

#1373

#1374

#1375

#1376

#1377

#1378

#1379

#1380

#1381

#1382

#1383

#1385

#1386

#1387

#1388

#1390

#1391

#1392

#1393

#1394

#1395

#1397

#1398

#1399

#140

#1400

#1401

#1402

#1403

#1404

#1407

#1408

#1409

#141

#1410

#1411

#1412

#1415

#1416

#1417

#1418

#1419

#142

#1421

#1423

#1424

#1426

#1427

#1428

#143

#1430

#1433

#1434

#1435

#1436

#1437

#1438

#1438

#1439

#1441

#1442

#1443

#1444

#1445

#1446

#1447

#1449

#1450

#1451

#1452

#1453

#1454

#1457

#1458

#1459

#1460

#1462

#1465

#1467

#1468

#1469

#147

#1470

#1472

#1473

#1474

#1475

#1476

#1477

#1478

#148

#1480

#1481

#1482

#1483

#1484

#1485

#1486

#1487

#1488

#149

#1491

#1494

#1496

#1498

#1499

#15

#15

#1500

#1501

#1502

#1504

#1505

#1506

#1507

#1508

#1509

#1510

#1511

#1512

#1513

#1514

#1515

#1516

#1517

#1518

#1519

#152

#152

#1520

#1521

#1522

#1523

#1525

#1526

#1529

#153

#1530

#1531

#1532

#1533

#1534

#1535

#1536

#1539

#1540

#1541

#1542

#1543

#1544

#1545

#1546

#1547

#155

#1550

#1551

#1552

#1553

#1554

#1555

#1556

#1557

#1558

#1559

#1560

#1562

#1563

#1564

#1565

#1566

#1567

#1569

#157

#1570

#1572

#1573

#1574

#1575

#1575

#1576

#1577

#1578

#1579

#1580

#1581

#1583

#1585

#1586

#1588

#1589

#159

#1591

#1593

#1594

#1597

#1598

#1599

#160

#1601

#1602

#1603

#1603

#1604

#1605

#1606

#1608

#1609

#161

#1610

#1611

#1612

#1613

#1614

#1616

#1617

#1619

#1620

#1622

#1623

#1624

#1625

#1628

#163

#1630

#1631

#1632

#1634

#1635

#1636

#1637

#1638

#164

#164

#1640

#1643

#1646

#1648

#165

#165

#1650

#1651

#1653

#1655

#1656

#1657

#1657

#1658

#1659

#1660

#1661

#1662

#1663

#1664

#1665

#1666

#1667

#1668

#1670

#1673

#1674

#1675

#1676

#1678

#1679

#168

#1680

#1681

#1682

#1683

#1684

#1685

#1686

#1687

#1688

#1689

#1690

#1691

#1692

#1693

#1694

#1695

#1698

#1699

#17

#17

#1700

#1701

#1704

#1705

#1706

#1707

#1708

#1709

#1710

#1712

#1713

#1715

#1716

#1717

#1718

#1719

#172

#1720

#1721

#1723

#1724

#1725

#1726

#1728

#1729

#173

#1731

#1732

#1733

#1734

#1736

#1737

#1738

#1740

#1741

#1742

#1743

#1744

#1747

#1748

#1749

#1750

#1752

#1754

#1755

#1756

#1757

#1758

#176

#1760

#1761

#1762

#1763

#1765

#1766

#1767

#1770

#1771

#1772

#1773

#1774

#1774

#1775

#1778

#1779

#1780

#1782

#1783

#1784

#1785

#1786

#1787

#1788

#1789

#179

#1790

#1791

#1792

#1792

#1793

#1795

#1797

#1798

#1799

#18

#18

#180

#1800

#1801

#1802

#1803

#1804

#1806

#1807

#1809

#181

#1810

#1811

#1813

#1815

#1816

#1818

#1819

#182

#1822

#1825

#1826

#1827

#1829

#1830

#1832

#1833

#1834

#1835

#1836

#1837

#1838

#1839

#184

#1840

#1843

#1846

#1846

#1848

#1849

#185

#1851

#1853

#1856

#1857

#1859

#1860

#1861

#1862

#1863

#1864

#1867

#1868

#1870

#1871

#1872

#1874

#1875

#1876

#1879

#188

#1880

#1883

#1884

#1886

#1886

#1888

#1889

#189

#1892

#1897

#1899

#190

#1902

#1903

#1904

#1905

#1906

#1907

#191

#1910

#1911

#1916

#1917

#1918

#1919

#1920

#1923

#1924

#1927

#1928

#1929

#1931

#1932

#1933

#1933

#1935

#1939

#194

#1940

#1941

#1942

#1944

#1945

#1945

#1948

#1949

#195

#1950

#1951

#1953

#1954

#1955

#1959

#1959

#196

#1966

#1967

#197

#1972

#1976

#1979

#1979

#198

#1980

#1980

#1982

#1983

#1984

#1986

#1989

#1991

#1993

#1994

#1995

#1996

#1996

#1997

#1999

#20

#20

#2000

#2001

#2002

#2002

#2004

#2004

#2005

#2006

#2007

#201

#201

#2010

#2010

#2012

#2012

#2014

#204

#206

#208

#209

#212

#214

#215

#216

#217

#218

#219

#221

#222

#223

#224

#226

#228

#228

#229

#230

#231

#232

#236

#237

#238

#240

#241

#242

#242

#243

#246

#248

#250

#252

#253

#254

#255

#257

#257

#259

#26

#262

#263

#264

#266

#269

#27

#27

#270

#272

#274

#276

#277

#278

#279

#279

#280

#283

#283

#285

#286

#288

#29

#29

#290

#291

#293

#295

#296

#302

#303

#308

#310

#311

#312

#314

#316

#319

#320

#321

#322

#324

#328

#329

#332

#333

#334

#335

#335

#336

#339

#342

#343

#344

#346

#347

#347

#349

#357

#361

#361

#362

#365

#365

#369

#37

#370

#371

#371

#372

#374

#374

#377

#379

#380

#384

#385

#386

#388

#389

#391

#394

#396

#398

#399

#400

#401

#402

#403

#404

#405

#406

#407

#408

#410

#412

#413

#414

#415

#416

#418

#419

#420

#421

#422

#424

#425

#426

#427

#429

#430

#431

#431

#432

#433

#434

#435

#436

#438

#439

#44

#440

#442

#443

#447

#448

#449

#451

#453

#456

#457

#458

#459

#460

#461

#462

#464

#465

#467

#468

#469

#470

#471

#472

#474

#475

#476

#477

#479

#480

#481

#483

#485

#486

#487

#488

#489

#490

#492

#494

#495

#499

#50

#501

#502

#502

#503

#504

#505

#506

#508

#509

#510

#512

#513

#514

#515

#517

#518

#519

#52

#520

#521

#522

#523

#524

#525

#526

#527

#528

#529

#53

#530

#531

#534

#535

#538

#539

#540

#542

#543

#544

#545

#546

#549

#55

#550

#551

#552

#553

#554

#554

#556

#557

#558

#56

#560

#562

#563

#565

#567

#568

#569

#57

#571

#573

#574

#574

#575

#577

#578

#580

#581

#582

#585

#586

#587

#587

#588

#588

#589

#590

#591

#593

#596

#598

#599

#6

#60

#600

#601

#602

#603

#604

#605

#606

#606

#607

#608

#609

#61

#611

#612

#613

#614

#615

#616

#617

#618

#619

#62

#620

#621

#622

#623

#624

#626

#627

#629

#63

#630

#631

#632

#633

#635

#636

#637

#64

#640

#641

#642

#643

#644

#646

#648

#649

#650

#652

#653

#654

#655

#656

#657

#658

#659

#660

#661

#663

#664

#665

#668

#669

#67

#670

#671

#674

#675

#676

#677

#679

#680

#681

#682

#683

#684

#685

#686

#687

#687

#688

#690

#691

#692

#693

#694

#695

#697

#697

#698

#699

#701

#702

#703

#704

#705

#706

#707

#708

#709

#710

#711

#712

#713

#714

#716

#717

#718

#719

#721

#722

#723

#724

#725

#726

#727

#728

#729

#730

#731

#732

#732

#733

#734

#736

#737

#738

#738

#739

#740

#740

#741

#742

#743

#745

#746

#747

#749

#752

#753

#754

#755

#757

#758

#759

#76

#761

#762

#763

#764

#765

#765

#766

#768

#769

#770

#771

#772

#773

#774

#775

#776

#779

#782

#784

#785

#786

#787

#788

#790

#791

#792

#793

#794

#795

#796

#797

#798

#799

#801

#802

#803

#804

#805

#806

#807

#808

#809

#81

#810

#810

#811

#812

#813

#814

#816

#817

#818

#82

#820

#821

#822

#823

#824

#825

#826

#828

#829

#830

#831

#833

#834

#835

#836

#837

#838

#839

#84

#84

#840

#841

#841

#842

#843

#845

#848

#849

#85

#850

#851

#852

#853

#854

#856

#857

#859

#860

#861

#862

#863

#864

#865

#866

#867

#868

#869

#87

#870

#871

#872

#874

#876

#877

#878

#879

#880

#881

#882

#883

#884

#885

#886

#887

#888

#889

#89

#890

#893

#896

#897

#898

#899

#900

#901

#902

#903

#904

#907

#908

#91

#910

#911

#912

#913

#914

#915

#916

#917

#918

#919

#92

#920

#921

#922

#923

#924

#925

#927

#928

#929

#93

#930

#931

#932

#934

#935

#936

#937

#938

#939

#94

#94

#940

#941

#942

#943

#944

#945

#947

#948

#949

#950

#951

#952

#953

#954

#955

#957

#958

#960

#961

#962

#963

#964

#965

#966

#968

#969

#97

#970

#971

#972

#973

#974

#975

#976

#978

#979

#980

#981

#982

#983

#984

#985

#986

#987

#990

#991

#992

#994

#995

#996

#997

#998

#999

v0.1.0

v0.1.1

v0.1.2

v0.6

v0.7

v0.8

v0.9

v0.9.9

v1.0

v1.1

v1.1.1

v1.1.2

v1.2

v1.2.1

v1.2.2

Mono Color

• 8232f76c48 Add check for visibility.nil? even though it can't ever be, to check for race conditions Eugen Rochko 2017-04-03 22:54:46 +02:00
• 22900fd579 accessibility fix halna_Tanaguru 2017-04-03 22:45:29 +02:00
• 3f30ae1f97 accessibility fix halna_Tanaguru 2017-04-03 22:45:29 +02:00
• 8750489ad4 Add fern.surgeplay.com to the instances list Aesen 2017-04-03 15:52:33 -04:00
• 1ed37fae9b Add fern.surgeplay.com to the instances list Aesen 2017-04-03 15:52:33 -04:00
• 4980641a53 update social.targaryen.house info Wonderfall 2017-04-03 21:36:28 +02:00
• cc451e1fcb update social.targaryen.house info Wonderfall 2017-04-03 21:36:28 +02:00
• f3b53cac06 added Esperanto (eo) axolotl 2017-04-03 20:22:50 +02:00
• 0700521ef3 added Esperanto (eo) axolotl 2017-04-03 20:22:50 +02:00
• c3e9029af1 Fix norwegian translation being malformed Eugen Rochko 2017-04-03 19:50:55 +02:00
• 98a93aa07e Fix norwegian translation being malformed Eugen Rochko 2017-04-03 19:50:55 +02:00
• d10dfaeb5d Add basic logging of who resolved report Eugen Rochko 2017-04-03 19:27:30 +02:00
• 68f829e11c Add basic logging of who resolved report Eugen Rochko 2017-04-03 19:27:30 +02:00
• 6cd90d8648 When taking action on a report (silence/suspend), it dismisses all other reports for that user automatically Eugen Rochko 2017-04-03 19:17:56 +02:00
• 71458dc6df When taking action on a report (silence/suspend), it dismisses all other reports for that user automatically Eugen Rochko 2017-04-03 19:17:56 +02:00
• 08895c3c9e Updated and fixed orthography Korbinian 2017-04-03 19:10:48 +02:00
• ec8029a955 Updated and fixed orthography Korbinian 2017-04-03 19:10:48 +02:00
• cd8e38d7c7 Updated and fixed german orthography Korbinian 2017-04-03 19:01:17 +02:00
• 7dd5ba42a3 Updated and fixed german orthography Korbinian 2017-04-03 19:01:17 +02:00
• be523603eb Make default admin UI page reports. Add admin UI for creating a domain block Eugen Rochko 2017-04-03 18:55:06 +02:00
• b7c1b12367 Make default admin UI page reports. Add admin UI for creating a domain block Eugen Rochko 2017-04-03 18:55:06 +02:00
• 19c282c567 Add instances from instances.mastodon.xyz shel 2017-04-03 12:28:36 -04:00
• 8a45a97e2e Add instances from instances.mastodon.xyz shel 2017-04-03 12:28:36 -04:00
• 653309e892 Merge pull request #777 from chriswk/master Eugen 2017-04-03 18:06:37 +02:00
• f6e9251054 Merge pull request #777 from chriswk/master Eugen 2017-04-03 18:06:37 +02:00
• f546a7c508 Merge pull request #782 from wxcafe/patch-1 Eugen 2017-04-03 18:06:16 +02:00
• 9738aaf5fb Merge pull request #782 from wxcafe/patch-1 Eugen 2017-04-03 18:06:16 +02:00
• dcae913843 Merge pull request #784 from singingwolfboy/github-capitalized Eugen 2017-04-03 18:06:02 +02:00
• ce433e22f6 Merge pull request #784 from singingwolfboy/github-capitalized Eugen 2017-04-03 18:06:02 +02:00
• 00c96df761 GitHub should be capitalized David Baumgold 2017-04-03 11:44:11 -04:00
• 5652f00d81 GitHub should be capitalized David Baumgold 2017-04-03 11:44:11 -04:00
• 804d079892 Adds social.wxcafe.net wxcafé 2017-04-03 17:32:25 +02:00
• d06c810b16 Adds social.wxcafe.net wxcafé 2017-04-03 17:32:25 +02:00
• 2e6a2e85c3 Add Norwegian locale Christopher Kolstad 2017-04-03 15:44:05 +02:00
• 5cb011b66b Add Norwegian locale Christopher Kolstad 2017-04-03 15:44:05 +02:00
• 60b1349f3a Merge pull request #775 from JantsoP/master Eugen 2017-04-03 15:04:51 +02:00
• 663e5378c0 Merge pull request #775 from JantsoP/master Eugen 2017-04-03 15:04:51 +02:00
• b7daa4896e another typo. fuck me JantsoP 2017-04-03 14:56:13 +02:00
• 65d667dc6c another typo. fuck me JantsoP 2017-04-03 14:56:13 +02:00
• afb868fcf1 fixed an sneaky peaky tpy JantsoP 2017-04-03 14:54:53 +02:00
• d3fde60297 fixed an sneaky peaky tpy JantsoP 2017-04-03 14:54:53 +02:00
• 85fe3760da add finnish translation JantsoP 2017-04-03 14:43:07 +02:00
• 85a8b62ca2 add finnish translation JantsoP 2017-04-03 14:43:07 +02:00
• e55bbbfc5e add finnish translation JantsoP 2017-04-03 14:20:50 +02:00
• 97803600ed add finnish translation JantsoP 2017-04-03 14:20:50 +02:00
• 7b4aff9f33 fixed typo JantsoP 2017-04-03 14:16:03 +02:00
• a229840ffe fixed typo JantsoP 2017-04-03 14:16:03 +02:00
• 83cad37b81 Merge branch 'master' into master JantsoP 2017-04-03 13:50:57 +02:00
• bfa99981e5 Merge branch 'master' into master JantsoP 2017-04-03 13:50:57 +02:00
• bb0fc927c3 add finnish translation JantsoP 2017-04-03 13:35:12 +02:00
• 6501ffdadc add finnish translation JantsoP 2017-04-03 13:35:12 +02:00
• fcdc35168a add finnish translation JantsoP 2017-04-03 13:34:26 +02:00
• ae95f35fe6 add finnish translation JantsoP 2017-04-03 13:34:26 +02:00
• 60f3aab712 add finnish translation JantsoP 2017-04-03 13:33:43 +02:00
• 22f88b845a add finnish translation JantsoP 2017-04-03 13:33:43 +02:00
• cb3e81cb26 add finnish language JantsoP 2017-04-03 13:32:10 +02:00
• eabb86b124 add finnish language JantsoP 2017-04-03 13:32:10 +02:00
• bcb435ff4b finnish translation JantsoP 2017-04-03 13:25:46 +02:00
• b0f4c9b91f finnish translation JantsoP 2017-04-03 13:25:46 +02:00
• 3ead1c905c updated final translation JantsoP 2017-04-03 13:07:09 +02:00
• f9b4f30de6 updated final translation JantsoP 2017-04-03 13:07:09 +02:00
• 6966104913 Merge pull request #769 from Angristan/patch-1 Eugen 2017-04-03 12:59:41 +02:00
• 01b79beca4 Merge pull request #769 from Angristan/patch-1 Eugen 2017-04-03 12:59:41 +02:00
• 5132b7a819 Merge pull request #764 from ticky/tweak-quick-start-area Eugen 2017-04-03 12:59:16 +02:00
• 5d854f37b4 Merge pull request #764 from ticky/tweak-quick-start-area Eugen 2017-04-03 12:59:16 +02:00
• 032d8b2ad9 Merge pull request #765 from marrus-sh/mastodon-API-update Eugen 2017-04-03 12:58:38 +02:00
• 92a0b3d73a Merge pull request #765 from marrus-sh/mastodon-API-update Eugen 2017-04-03 12:58:38 +02:00
• fb5d094c28 Merge pull request #768 from marvinkopf/mutedropdown Eugen 2017-04-03 12:53:49 +02:00
• 2f7139c6b5 Merge pull request #768 from marvinkopf/mutedropdown Eugen 2017-04-03 12:53:49 +02:00
• 92204061b9 Create new translation file JantsoP 2017-04-03 12:42:09 +02:00
• 87854745e9 Create new translation file JantsoP 2017-04-03 12:42:09 +02:00
• 5c6aad9e67 Create Finnish translation for Mastodon JantsoP 2017-04-03 12:09:33 +02:00
• 69fc95a2f5 Create Finnish translation for Mastodon JantsoP 2017-04-03 12:09:33 +02:00
• f0c8de8954 Improve french translation Angristan 2017-04-03 11:04:00 +02:00
• c97fc5c1f4 Improve french translation Angristan 2017-04-03 11:04:00 +02:00
• adb5332119 add mute option in status dropdown Marvin Kopf 2017-04-03 09:56:01 +02:00
• 1236a12cae add mute option in status dropdown Marvin Kopf 2017-04-03 09:56:01 +02:00
• 90bddbadeb "direct" in statuses#create Kibigo! 2017-04-03 01:23:37 -07:00
• b455cbc6d3 "direct" in statuses#create Kibigo! 2017-04-03 01:23:37 -07:00
• b9c9f30e10 Forgot direct statuses :P Kibigo! 2017-04-02 22:46:10 -07:00
• a9db64cf26 Forgot direct statuses :P Kibigo! 2017-04-02 22:46:10 -07:00
• 4df2bde8cf Typofixes Kibigo! 2017-04-02 21:17:07 -07:00
• 5d2f1d600d Typofixes Kibigo! 2017-04-02 21:17:07 -07:00
• 035a0a8031 Code now code Kibigo! 2017-04-02 21:13:15 -07:00
• 5d65aa3bf9 Code now code Kibigo! 2017-04-02 21:13:15 -07:00
• 953d58a485 Merging 'upstream' updates Kibigo! 2017-04-02 21:07:07 -07:00
• 565568dd9c Merging 'upstream' updates Kibigo! 2017-04-02 21:07:07 -07:00
• babeae9aa4 Updated API docs Kibigo! 2017-04-02 21:03:49 -07:00
• 6e41ef55ed Updated API docs Kibigo! 2017-04-02 21:03:49 -07:00
• 958077fcda Fix the position of the Mastodon mascot in the UI Jessica Stokes 2017-04-03 13:16:14 +10:00
• 2d384850cb Fix the position of the Mastodon mascot in the UI Jessica Stokes 2017-04-03 13:16:14 +10:00
• 7e86ed76dc Merge pull request #760 from ProgVal/patch-2 Eugen 2017-04-03 03:40:34 +02:00
• 1a5ab538de Merge pull request #760 from ProgVal/patch-2 Eugen 2017-04-03 03:40:34 +02:00
• 6cce6b896a Merge pull request #757 from yiskah/patch-4 Eugen 2017-04-03 03:40:20 +02:00
• 3f650c06b6 Merge pull request #757 from yiskah/patch-4 Eugen 2017-04-03 03:40:20 +02:00
• 68937b1960 Merge pull request #759 from Wonderfall/master Eugen 2017-04-03 03:40:00 +02:00
• 71b9205679 Merge pull request #759 from Wonderfall/master Eugen 2017-04-03 03:40:00 +02:00
• 17a6175732 Merge pull request #748 from ProgVal/patch-1 Eugen 2017-04-03 03:39:35 +02:00
• 6b9c50117f Merge pull request #748 from ProgVal/patch-1 Eugen 2017-04-03 03:39:35 +02:00
• 1b7829dbc2 Improve French translation Valentin Lorentz 2017-04-03 03:16:37 +02:00
• fbcba65f81 Improve French translation Valentin Lorentz 2017-04-03 03:16:37 +02:00
• 854dcadf6a use alpine-based official images Wonderfall 2017-04-03 03:09:56 +02:00
• b7beb4368c
  use alpine-based official images Wonderfall 2017-04-03 03:09:56 +02:00
• 6164cab0ce Add social.imirhil.fr shel 2017-04-02 20:11:28 -04:00
• e2526a62e7 Add social.imirhil.fr shel 2017-04-02 20:11:28 -04:00
• 1d4148eee1 Merge pull request #743 from Kazhnuz/master Eugen 2017-04-03 01:10:36 +02:00
• 61f90f15b0 Merge pull request #743 from Kazhnuz/master Eugen 2017-04-03 01:10:36 +02:00
• 774d88f406 Merge branch 'master' into master Eugen 2017-04-03 01:07:53 +02:00
• d2358aefec Merge branch 'master' into master Eugen 2017-04-03 01:07:53 +02:00
• 805413d6a3 Merge pull request #751 from Wonderfall/master Eugen 2017-04-03 01:03:42 +02:00
• 30df1c8476 Merge pull request #751 from Wonderfall/master Eugen 2017-04-03 01:03:42 +02:00
• abc04b9bb5 Update Dockerfile Wonderfall 2017-04-03 00:56:05 +02:00
• b8d2373e0b Update Dockerfile Wonderfall 2017-04-03 00:56:05 +02:00
• eb6935a1fe update Dockerfile Wonderfall 2017-04-03 00:46:44 +02:00
• 92d35c52d9 update Dockerfile Wonderfall 2017-04-03 00:46:44 +02:00
• 6c44b7d1b8 Merge pull request #744 from fpiesche/master Eugen 2017-04-03 00:26:24 +02:00
• d7d60073f9 Merge pull request #744 from fpiesche/master Eugen 2017-04-03 00:26:24 +02:00
• 6bfeac3d44 Merge pull request #746 from eramdam/feature/improve-french-locales Eugen 2017-04-03 00:25:56 +02:00
• 61894582b8 Merge pull request #746 from eramdam/feature/improve-french-locales Eugen 2017-04-03 00:25:56 +02:00
• b2b8c3bc50 Merge pull request #747 from Themimitoof/patch-1 Eugen 2017-04-03 00:25:37 +02:00
• ce495138ac Merge pull request #747 from Themimitoof/patch-1 Eugen 2017-04-03 00:25:37 +02:00
• 57f87e8f17 Also fix the start command. Valentin Lorentz 2017-04-03 00:10:51 +02:00
• 9ca548c17e Also fix the start command. Valentin Lorentz 2017-04-03 00:10:51 +02:00
• f7101403ec Fix install instructions. Valentin Lorentz 2017-04-03 00:08:40 +02:00
• 82ae07e48b Fix install instructions. Valentin Lorentz 2017-04-03 00:08:40 +02:00
• a61e7e64f5 add link to another mastodon instance. Michael Vieira 2017-04-03 00:04:54 +02:00
• b69e97c40b add link to another mastodon instance. Michael Vieira 2017-04-03 00:04:54 +02:00
• 38ea271dbe Add forgotten comma Kazhnuz 2017-04-02 23:39:41 +02:00
• c76d20c2a0 Add forgotten comma Kazhnuz 2017-04-02 23:39:41 +02:00
• 2eafac453d Update images to standard sizes. Write up Federated/Local timelines and rename relevant image. Florian Piesche 2017-04-02 22:31:43 +01:00
• 590558d52c Update images to standard sizes. Write up Federated/Local timelines and rename relevant image. Florian Piesche 2017-04-02 22:31:43 +01:00
• 8b487e3fd8 Add more lcoales in fr.jsx Damien Erambert 2017-04-02 14:23:40 -07:00
• 4f7cce25ac Add more lcoales in fr.jsx Damien Erambert 2017-04-02 14:23:40 -07:00
• 1f4c337389 Update French Translation Kazhnuz 2017-04-02 23:18:01 +02:00
• 633e5ec6f6 Update French Translation Kazhnuz 2017-04-02 23:18:01 +02:00
• 504b5944b2 Add info on CW tags not automatically hiding images. Florian Piesche 2017-04-02 22:07:23 +01:00
• e92796b49c Add info on CW tags not automatically hiding images. Florian Piesche 2017-04-02 22:07:23 +01:00
• a003790080 Add user guide to README toc Florian Piesche 2017-04-02 22:05:21 +01:00
• a729d0c2b1 Add user guide to README toc Florian Piesche 2017-04-02 22:05:21 +01:00
• 005d13c5e1 Fix typo in simple_form.fr.yml Damien Erambert 2017-04-02 14:04:06 -07:00
• 71cf9d0608 Fix typo in simple_form.fr.yml Damien Erambert 2017-04-02 14:04:06 -07:00
• 761040e154 Improve translation of data import in fr.yml Damien Erambert 2017-04-02 14:03:57 -07:00
• 5e45982ed9 Improve translation of data import in fr.yml Damien Erambert 2017-04-02 14:03:57 -07:00
• 7b8f79fe28 Better translation for revoked token in doorkeeper.fr.yml Damien Erambert 2017-04-02 14:03:41 -07:00
• b829460b4a Better translation for revoked token in doorkeeper.fr.yml Damien Erambert 2017-04-02 14:03:41 -07:00
• 1c6de47d6b Fix date format in doorkeeper.fr.yml Damien Erambert 2017-04-02 14:03:31 -07:00
• 65e6a00817 Fix date format in doorkeeper.fr.yml Damien Erambert 2017-04-02 14:03:31 -07:00
• 33d540d388 Update to catch up with new features and add missing images. Florian Piesche 2017-04-02 22:03:00 +01:00
• 60a82c9022 Update to catch up with new features and add missing images. Florian Piesche 2017-04-02 22:03:00 +01:00
• 912011dee1 Write up reporting. Florian Piesche 2017-04-02 21:45:51 +01:00
• b277e88aae Write up reporting. Florian Piesche 2017-04-02 21:45:51 +01:00
• 7bb02387b7 Add information about the Direct privacy setting. Florian Piesche 2017-04-02 21:39:05 +01:00
• 03b2f37b46 Add information about the Direct privacy setting. Florian Piesche 2017-04-02 21:39:05 +01:00
• 062566bbf2 Add information on following remote users or using the Search box to find them. Florian Piesche 2017-04-02 21:33:39 +01:00
• 0f274589dd Add information on following remote users or using the Search box to find them. Florian Piesche 2017-04-02 21:33:39 +01:00
• 4398aec0ca Merge pull request #737 from nevillepark/patch-2 Eugen 2017-04-02 22:23:11 +02:00
• 2cd792fc3d Merge pull request #737 from nevillepark/patch-2 Eugen 2017-04-02 22:23:11 +02:00
• 426f231a36 Merge pull request #740 from 0x70b1a5/master Eugen 2017-04-02 22:22:56 +02:00
• 09b4b65fde Merge pull request #740 from 0x70b1a5/master Eugen 2017-04-02 22:22:56 +02:00
• b1c8300ef1 Merge pull request #741 from eramdam/feature/improve-french-locales Eugen 2017-04-02 22:22:44 +02:00
• 48cb2dccd2 Merge pull request #741 from eramdam/feature/improve-french-locales Eugen 2017-04-02 22:22:44 +02:00
• 7a28ced1f6 Avoid re-loading already loaded relationships. Also fixes issue where wrong button would be displayed in account lists for unloaded relationships Eugen Rochko 2017-04-02 22:02:38 +02:00
• a23e4380b2 Avoid re-loading already loaded relationships. Also fixes issue where wrong button would be displayed in account lists for unloaded relationships Eugen Rochko 2017-04-02 22:02:38 +02:00
• 7fe6bb3d98 Keep track of which timelines are connected live to avoid redundant refreshes on navigation Eugen Rochko 2017-04-02 21:44:06 +02:00
• aaa4d1b0fb Keep track of which timelines are connected live to avoid redundant refreshes on navigation Eugen Rochko 2017-04-02 21:44:06 +02:00
• d2dbeae6a6 Add heartbeat to websockets streaming API connections Eugen Rochko 2017-04-02 21:27:14 +02:00
• 3618cc04ff Add heartbeat to websockets streaming API connections Eugen Rochko 2017-04-02 21:27:14 +02:00
• ef699bcb80 Catching rack timeout from rails doesn't work Eugen Rochko 2017-04-02 21:12:18 +02:00
• 2d07cb5771 Catching rack timeout from rails doesn't work Eugen Rochko 2017-04-02 21:12:18 +02:00
• 32d4c01414 single-quotes Tobias Merkle 2017-04-02 14:55:13 -04:00
• f25fc04ea1 single-quotes Tobias Merkle 2017-04-02 14:55:13 -04:00
• 78c541170a remove black border on buttons Tobias Merkle 2017-04-02 14:54:24 -04:00
• ca21be3e16 remove black border on buttons Tobias Merkle 2017-04-02 14:54:24 -04:00
• 628833b2fb Add proper error page for request timeouts Eugen Rochko 2017-04-02 19:43:09 +02:00
• 5b12624847 Add proper error page for request timeouts Eugen Rochko 2017-04-02 19:43:09 +02:00
• dd3aef4974 Corrected spelling mistake Neville Park 2017-04-02 13:01:55 -04:00
• 54c796c8df Corrected spelling mistake Neville Park 2017-04-02 13:01:55 -04:00
• ecf50b54d0 Merge pull request #729 from Abzol/master Eugen 2017-04-02 17:53:00 +02:00
• 34ff11c496 Merge pull request #729 from Abzol/master Eugen 2017-04-02 17:53:00 +02:00
• 5a5116b12c Merge pull request #735 from TheKinrar/patch-3 Eugen 2017-04-02 17:50:15 +02:00
• 25ed563cdb Merge pull request #735 from TheKinrar/patch-3 Eugen 2017-04-02 17:50:15 +02:00
• 4699f91000 Add link to instances.mastodon.xyz TheKinrar 2017-04-02 17:48:25 +02:00
• 9f219d8968 Add link to instances.mastodon.xyz TheKinrar 2017-04-02 17:48:25 +02:00
• 9ac51fb479 Merge branch 'master' of github.com:tootsuite/mastodon Olivia Mossberg 2017-04-02 17:04:31 +02:00
• 30da6440d0 Merge branch 'master' of github.com:tootsuite/mastodon Olivia Mossberg 2017-04-02 17:04:31 +02:00
• 80b76f4b55 Fix word-break in account profiles Olivia Mossberg 2017-04-02 16:54:24 +02:00
• f4b5fe9caf Fix word-break in account profiles Olivia Mossberg 2017-04-02 16:54:24 +02:00
• eda3a50d1d Fix wording "show reblogs" -> "show boosts", order reports chronologically in admin UI Eugen Rochko 2017-04-02 16:45:49 +02:00
• 4b7dca4713 Fix wording "show reblogs" -> "show boosts", order reports chronologically in admin UI Eugen Rochko 2017-04-02 16:45:49 +02:00
• 05059e3eb1 Merge pull request #728 from bottitytto/add-mashek Eugen 2017-04-02 16:30:30 +02:00
• 3a62721e54 Merge pull request #728 from bottitytto/add-mashek Eugen 2017-04-02 16:30:30 +02:00
• 06f2a71193 Fix issue with feed merge-in code as well Eugen Rochko 2017-04-02 15:58:25 +02:00
• d6b965cf08 Fix issue with feed merge-in code as well Eugen Rochko 2017-04-02 15:58:25 +02:00
• 076a68720b Fix feed regeneration bug Eugen Rochko 2017-04-02 15:46:31 +02:00
• e809caa0e1 Fix feed regeneration bug Eugen Rochko 2017-04-02 15:46:31 +02:00
• 430a408706 Adding social.mashek.net Sina Mashek 2017-04-02 16:22:13 +03:00
• aaea7e1e7c Adding social.mashek.net Sina Mashek 2017-04-02 16:22:13 +03:00
• b2234c09a8 Merge branch 'maximeborges-master' Eugen Rochko 2017-04-02 12:38:11 +02:00
• 750662d9e2 Merge branch 'maximeborges-master' Eugen Rochko 2017-04-02 12:38:11 +02:00
• be45959a72 Merge branch 'master' of https://github.com/maximeborges/mastodon into maximeborges-master Eugen Rochko 2017-04-02 12:36:26 +02:00