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

• ffdf0f2ff6 Fix Catalan translation of remote_follow acct (#6476) Simó Albert i Beltran 2018-02-16 19:15:56 +01:00
• ae39bbf3d6 [Nanobox] Fix backups for file storage (#6483) Daniel Hunsaker 2018-02-16 09:10:01 -07:00
• eb3262b941 [Nanobox] Fix backups for file storage (#6483) Daniel Hunsaker 2018-02-16 09:10:01 -07:00
• 60a0ab5c4f Save video metadata and improve video OpenGraph tags (#6481) Eugen Rochko 2018-02-16 07:22:20 +01:00
• 9dbae6e8a1
  Save video metadata and improve video OpenGraph tags (#6481) Eugen Rochko 2018-02-16 07:22:20 +01:00
• 7fee831d63 Do not hide NSFW media/CW'd text in OpenGraph tags (#6479) Eugen Rochko 2018-02-16 04:40:53 +01:00
• 1122579216
  Do not hide NSFW media/CW'd text in OpenGraph tags (#6479) Eugen Rochko 2018-02-16 04:40:53 +01:00
• 4a47b37b77 After click to embed video, autoplay it (#6480) Eugen Rochko 2018-02-15 23:05:12 +01:00
• 478ca39e5e
  After click to embed video, autoplay it (#6480) Eugen Rochko 2018-02-15 23:05:12 +01:00
• c56009ba4a Fix #5173: Click card to embed external content (#6471) Eugen Rochko 2018-02-15 07:04:28 +01:00
• f7765acf9d
  Fix #5173: Click card to embed external content (#6471) Eugen Rochko 2018-02-15 07:04:28 +01:00
• 259a724cec Fix media button type (#6478) abcang 2018-02-15 12:40:42 +09:00
• ecdac9017e Fix media button type (#6478) abcang 2018-02-15 12:40:42 +09:00
• 57a06947b2
  Merge d99d1a7dda into 5ffa6f0fa1 NCLS 2018-02-14 05:03:44 +00:00
• d99d1a7dda
  Add search results style ncls7615 2018-02-14 14:02:11 +09:00
• 6d6935c46b i18n: Update Polish translation (#6470) Marcin Mikołajczak 2018-02-13 23:55:45 +01:00
• ba8ec4eed6 i18n: Update Polish translation (#6470) Marcin Mikołajczak 2018-02-13 23:55:45 +01:00
• cd4ad18cf0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-02-11 23:17:11 +00:00
• e9052ceaaf Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-02-11 23:17:11 +00:00
• 09f555dec8 Fix URLs incorrectly having trailing hyphen removed (#6465) Daniel King 2018-02-11 22:49:18 +00:00
• 6ef3874b2e Fix URLs incorrectly having trailing hyphen removed (#6465) Daniel King 2018-02-11 22:49:18 +00:00
• 4d2fa2bb65 Fix Chewy trying to update index with the wrong strategy (#6464) Eugen Rochko 2018-02-11 22:59:44 +01:00
• e20700fe8f
  Fix Chewy trying to update index with the wrong strategy (#6464) Eugen Rochko 2018-02-11 22:59:44 +01:00
• 0258d5cb5d Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-02-11 18:17:11 +00:00
• 5ffa6f0fa1 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-02-11 18:17:11 +00:00
• eb32babf51 Interactive rake mastodon:setup task (#6451) Eugen Rochko 2018-02-11 18:40:57 +01:00
• cf36d184f4
  Interactive rake mastodon:setup task (#6451) Eugen Rochko 2018-02-11 18:40:57 +01:00
• 819a2285b2 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-02-11 04:10:16 +00:00
• efc9ffcb80 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-02-11 04:10:16 +00:00
• 9a97a98805 Merge remote-tracking branch 'origin/merge-upstream' David Yip 2018-02-10 22:08:45 -06:00
• b6159bcb0a
  Merge remote-tracking branch 'origin/merge-upstream' David Yip 2018-02-10 22:08:45 -06:00
• 33128780ad Merge pull request #362 from ThibG/glitch-soc/fix-notifications-clearing beatrix 2018-02-10 21:47:27 -05:00
• 136458eaf4
  Merge pull request #362 from ThibG/glitch-soc/fix-notifications-clearing beatrix 2018-02-10 21:47:27 -05:00
• f79182176d Merge pull request #236 from glitch-soc/plaintext-mutes beatrix 2018-02-10 21:46:19 -05:00
• 20b519f0fc
  Merge pull request #236 from glitch-soc/plaintext-mutes beatrix 2018-02-10 21:46:19 -05:00
• 5a752914ab Remove NOKOGIRI_USE_SYSTEM_LIBRARIES from Travis. #236. David Yip 2018-02-10 11:01:49 -06:00
• 380989def8
  Remove NOKOGIRI_USE_SYSTEM_LIBRARIES from Travis. #236. David Yip 2018-02-10 11:01:49 -06:00
• 48acc92a21 Revert 245816ab27 (fixes #348) Thibaut Girka 2018-02-10 20:56:48 +01:00
• fb6f131fa1 Revert 245816ab27 (fixes #348) Thibaut Girka 2018-02-10 20:56:48 +01:00
• cefcbc2fc5 Use Html2Text to generate plaintext for keyword mutes. #236. David Yip 2018-02-10 10:32:14 -06:00
• f1f67c46c5
  Use Html2Text to generate plaintext for keyword mutes. #236. David Yip 2018-02-10 10:32:14 -06:00
• b58e00bde7 Introduce html2text for extracting plaintext from statuses. #236. David Yip 2018-02-10 02:32:39 -06:00
• 9105b0c954
  Introduce html2text for extracting plaintext from statuses. #236. David Yip 2018-02-10 02:32:39 -06:00
• a25d3a48b0 Glitch::FilterHelper -> Glitch::KeywordMuteHelper. #234. David Yip 2017-12-03 21:49:55 -06:00
• 53c86b29f0
  Glitch::FilterHelper -> Glitch::KeywordMuteHelper. #234. David Yip 2017-12-03 21:49:55 -06:00
• 1b60d8c9a5 Added FetchRemoteAccountService spec (#6456) Kazushige Tominaga 2018-02-11 01:10:58 +09:00
• 718802a05d Added FetchRemoteAccountService spec (#6456) Kazushige Tominaga 2018-02-11 01:10:58 +09:00
• d527c3b2ea Fix password recovery (#6459) ThibG 2018-02-10 17:09:44 +01:00
• 411c9ecb4b Fix password recovery (#6459) ThibG 2018-02-10 17:09:44 +01:00
• 8bc0bec970 Fill out some examples for Glitch::FilterHelper. #234. David Yip 2017-12-03 21:40:28 -06:00
• d263e3bc2d
  Fill out some examples for Glitch::FilterHelper. #234. David Yip 2017-12-03 21:40:28 -06:00
• 711e58b362 Strip HTML from keyword mute input. #234. David Yip 2017-12-03 17:28:30 -06:00
• 29b5b46c87
  Strip HTML from keyword mute input. #234. David Yip 2017-12-03 17:28:30 -06:00
• 4e97d481fa Added #call spec (#6455) Kazushige Tominaga 2018-02-10 11:31:38 +09:00
• cbe8743e47 Added #call spec (#6455) Kazushige Tominaga 2018-02-10 11:31:38 +09:00
• 30b767ef03 Full-text search for authorized statuses (#6423) Eugen Rochko 2018-02-09 23:04:47 +01:00
• 3ebc0ad4d3
  Full-text search for authorized statuses (#6423) Eugen Rochko 2018-02-09 23:04:47 +01:00
• 6ecbf6ec3a Normalize simple_form.en.yml. David Yip 2018-02-09 09:41:57 -06:00
• b8efc3fc0b
  Normalize simple_form.en.yml. David Yip 2018-02-09 09:41:57 -06:00
• 06ce12f38f Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-02-09 09:25:53 -06:00
• 020b40efdb
  Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-02-09 09:25:53 -06:00
• 26212ec739
  Merge 99b68bbfb6 into 3405ea6dd9 Marcin Mikołajczak 2018-02-09 15:08:56 +00:00
• 99b68bbfb6 Update Polish translation Marcin Mikołajczak 2018-02-09 16:06:29 +01:00
• 971ea2b650 fix-indent (#6453) masarakki 2018-02-09 23:29:48 +09:00
• 235c14c79d fix-indent (#6453) masarakki 2018-02-09 23:29:48 +09:00
• f4f903e7b5 Change web UI "posts" to "toots" on profile for consistency (#6447) Eugen Rochko 2018-02-09 00:27:18 +01:00
• 2ef9d0e101
  Change web UI "posts" to "toots" on profile for consistency (#6447) Eugen Rochko 2018-02-09 00:27:18 +01:00
• cdf9d92b87 Add preference to always display sensitive media (#6448) Eugen Rochko 2018-02-09 00:26:57 +01:00
• 76f3d5d16b
  Add preference to always display sensitive media (#6448) Eugen Rochko 2018-02-09 00:26:57 +01:00
• e81f517243 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-02-08 23:17:14 +00:00
• 5ba2c300d8 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-02-08 23:17:14 +00:00
• c6cc16255f Perform request spec (#6446) Kazushige Tominaga 2018-02-09 08:12:35 +09:00
• 1167c6dbf8 Perform request spec (#6446) Kazushige Tominaga 2018-02-09 08:12:35 +09:00
• ea41f0641d Clear account cache of notification target_status (#6442) abcang 2018-02-08 23:33:23 +09:00
• 298c81c00f Clear account cache of notification target_status (#6442) abcang 2018-02-08 23:33:23 +09:00
• 1d21008909 Fix response of signature_verification_failure_reason (#6441) abcang 2018-02-08 13:00:45 +09:00
• cf32f7da5c Fix response of signature_verification_failure_reason (#6441) abcang 2018-02-08 13:00:45 +09:00
• 55ff620016 Added #link_header spec (#6439) Kazushige Tominaga 2018-02-08 08:17:53 +09:00
• 2bb393684b Added #link_header spec (#6439) Kazushige Tominaga 2018-02-08 08:17:53 +09:00
• 1374eedad2 Change user_id column non-nullable (#6435) Akihiko Odaki 2018-02-08 00:35:44 +09:00
• 67f7ffa792 Change user_id column non-nullable (#6435) Akihiko Odaki 2018-02-08 00:35:44 +09:00
• 1fab1714c3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-02-05 02:17:12 +00:00
• 3405ea6dd9 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-02-05 02:17:12 +00:00
• 262871b3e6 match hashtag regex in js client with server (#6431) Daniel King 2018-02-05 01:44:13 +00:00
• 95c8232109 match hashtag regex in js client with server (#6431) Daniel King 2018-02-05 01:44:13 +00:00
• 4f4a3c1817 db/schema.rb: resolve erroneously-unresolved conflict David Yip 2018-02-04 17:04:22 -06:00
• e815d6803d
  db/schema.rb: resolve erroneously-unresolved conflict David Yip 2018-02-04 17:04:22 -06:00
• b9840e0f65 Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-02-04 16:36:19 -06:00
• a6fb1c58ee
  Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-02-04 16:36:19 -06:00
• b95231b081 Make PAM gem optional, allow configuration over environment (#6415) Eugen Rochko 2018-02-04 15:05:53 +01:00
• 38e0133e1b
  Make PAM gem optional, allow configuration over environment (#6415) Eugen Rochko 2018-02-04 15:05:53 +01:00
• 9168cf8034 Validation of count works even when text of status is nil (#6429) abcang 2018-02-04 20:32:41 +09:00
• 9b6223f5e2 Validation of count works even when text of status is nil (#6429) abcang 2018-02-04 20:32:41 +09:00
• 3076493883 Exclude nil from relationships array (#6427) abcang 2018-02-04 20:32:10 +09:00
• 3f35d43222 Exclude nil from relationships array (#6427) abcang 2018-02-04 20:32:10 +09:00
• 910b32156d Make sure status is not nil (#6428) abcang 2018-02-04 20:31:46 +09:00
• c156a83e7d Make sure status is not nil (#6428) abcang 2018-02-04 20:31:46 +09:00
• c0a24fc4ce Upgrade Vagrant box to Xenial (#6421) Daniel King 2018-02-04 05:03:01 +00:00
• 258dcb849f Upgrade Vagrant box to Xenial (#6421) Daniel King 2018-02-04 05:03:01 +00:00
• 91ca5d3d3b Add option to show only local toots in timeline preview (#6292) Renato "Lond" Cerqueira 2018-02-04 06:00:10 +01:00
• 4e4f1b0dcb Add option to show only local toots in timeline preview (#6292) Renato "Lond" Cerqueira 2018-02-04 06:00:10 +01:00
• 942229df90 CAS + SAML authentication feature (#6425) Eugen Rochko 2018-02-04 05:42:13 +01:00
• 26f21fd5a0
  CAS + SAML authentication feature (#6425) Eugen Rochko 2018-02-04 05:42:13 +01:00
• 34536369d0 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-02-04 03:17:11 +00:00
• 530fcc1c14 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-02-04 03:17:11 +00:00
• 7a7ac63334 Merge pull request #357 from KnzkDev/fix/detail-style David Yip 2018-02-03 20:20:58 -06:00
• c14f59c542
  Merge pull request #357 from KnzkDev/fix/detail-style David Yip 2018-02-03 20:20:58 -06:00
• 0d8d4fa1d2
  Merge branch 'master' into fix/assets-cdn NCLS 2018-02-04 10:50:06 +09:00
• 6c6c0afbef Fix detailed-status ncls7615 2018-02-04 10:35:09 +09:00
• 15a5b3372a
  Fix detailed-status ncls7615 2018-02-04 10:35:09 +09:00
• 31e4679001 change referrer policy to same-origin beatrix 2018-02-03 14:49:00 -05:00
• fa361ccc5e
  change referrer policy to same-origin beatrix 2018-02-03 14:49:00 -05:00
• 5e3e03a88b Isolate internal services from external networks in Docker configuration (#6369) Akihiko Odaki 2018-02-04 02:44:22 +09:00
• 9da81a1639 Isolate internal services from external networks in Docker configuration (#6369) Akihiko Odaki 2018-02-04 02:44:22 +09:00
• 4fa894652d fix ColumnBackButtonSlim should extended from ColumnBackButton (#6417) takayamaki 2018-02-04 02:41:51 +09:00
• d75d2a9f99 fix ColumnBackButtonSlim should extended from ColumnBackButton (#6417) takayamaki 2018-02-04 02:41:51 +09:00
• 6901bb6750 Require environment for generate_static_pages (#6420) Akihiko Odaki 2018-02-04 02:41:01 +09:00
• f7bf36d8fc Require environment for generate_static_pages (#6420) Akihiko Odaki 2018-02-04 02:41:01 +09:00
• e2fa39196d Merge remote-tracking branch 'tootsuite/master' into merge-upstream David Yip 2018-02-02 08:39:52 -06:00
• 4c1fd9a19c
  Merge remote-tracking branch 'tootsuite/master' into merge-upstream David Yip 2018-02-02 08:39:52 -06:00
• ef2c0e7c88 Fix column header button (#6411) abcang 2018-02-02 21:31:28 +09:00
• 33f56811e3 Fix column header button (#6411) abcang 2018-02-02 21:31:28 +09:00
• b0f1cf991a Fix saving of oEmbed image (#6409) abcang 2018-02-02 19:57:59 +09:00
• 7e5c433dfc Fix saving of oEmbed image (#6409) abcang 2018-02-02 19:57:59 +09:00
• 4d93e11af2 Set minimum height for mastodon on drawer (#6142) Akihiko Odaki 2018-02-02 19:56:50 +09:00
• c1efe0aa1d Set minimum height for mastodon on drawer (#6142) Akihiko Odaki 2018-02-02 19:56:50 +09:00
• 6575be87ab Allow HTTP caching of atom-rendered public toots (OStatus compatibility) (#6207) ThibG 2018-02-02 10:54:04 +01:00
• ac1093256c Allow HTTP caching of atom-rendered public toots (OStatus compatibility) (#6207) ThibG 2018-02-02 10:54:04 +01:00
• 59add13358 moved save button (#3792) Charlotte Fields 2018-02-02 20:45:43 +11:00
• af40824998 moved save button (#3792) Charlotte Fields 2018-02-02 20:45:43 +11:00
• 183eb8dd88 Remove wave from list drawer (#6381) Akihiko Odaki 2018-02-02 18:32:41 +09:00
• 77dd9e7d27 Remove wave from list drawer (#6381) Akihiko Odaki 2018-02-02 18:32:41 +09:00
• 35d49a11bd Unify links container implementation in about pages (#6382) Akihiko Odaki 2018-02-02 18:32:21 +09:00
• 5da5c65db8 Unify links container implementation in about pages (#6382) Akihiko Odaki 2018-02-02 18:32:21 +09:00
• 9cd1e1936a Accept ActivityPub announce from the author of the original note (#6236) Akihiko Odaki 2018-02-02 18:22:15 +09:00
• 0be9a1e321 Accept ActivityPub announce from the author of the original note (#6236) Akihiko Odaki 2018-02-02 18:22:15 +09:00
• a74ea1796e Allow retrieval of private statuses (single or in outbox) using HTTP signatures (#6225) puckipedia 2018-02-02 10:19:59 +01:00
• 8e4cf6282b Allow retrieval of private statuses (single or in outbox) using HTTP signatures (#6225) puckipedia 2018-02-02 10:19:59 +01:00
• dc2de76298 pam authentication (#5303) Alexander 2018-02-02 10:18:55 +01:00
• 04fef7b888 pam authentication (#5303) Alexander 2018-02-02 10:18:55 +01:00
• f1d479870f Fix mistake in cache deletion (#6408) abcang 2018-02-02 18:10:18 +09:00
• 1afc70c990 Fix mistake in cache deletion (#6408) abcang 2018-02-02 18:10:18 +09:00
• 8b1da19815 Upgrade Paperclip > 5.2.1 (#6404) Rob Watson 2018-02-01 16:54:22 +00:00
• f4bd51da1e Upgrade Paperclip > 5.2.1 (#6404) Rob Watson 2018-02-01 16:54:22 +00:00
• 18e88833d5 Fix button hiding when header title is too long (#6406) abcang 2018-02-02 01:17:17 +09:00
• ffb2b8ef8c Fix button hiding when header title is too long (#6406) abcang 2018-02-02 01:17:17 +09:00
• 678c6f30a3 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-01-31 23:17:13 +00:00
• ad3a2dfb66 Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-01-31 23:17:13 +00:00
• c754bf1277 Russian language updated (#6397) Evgeny Petrov 2018-02-01 01:33:54 +03:00
• 3ed194b67d Russian language updated (#6397) Evgeny Petrov 2018-02-01 01:33:54 +03:00
• 500a09441b fix ruby 2.5 rvm install in vagrant (#6396) Daniel King 2018-01-31 20:52:58 +00:00
• 2cff744cdf fix ruby 2.5 rvm install in vagrant (#6396) Daniel King 2018-01-31 20:52:58 +00:00
• 2e1902d269 give back its colors to the donphan friend Alexis Viguié 2018-01-30 14:40:27 +00:00
• 7fd737112f donphan.social branding Alexis Viguié 2018-01-30 13:25:41 +00:00
• bc2a92210b Merge 1b3ff6a92f into f4b2478af1 David Yip 2018-01-29 10:17:42 +00:00
• 457ed69456 Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-01-28 22:45:17 -06:00
• f4b2478af1
  Merge remote-tracking branch 'origin/master' into merge-upstream David Yip 2018-01-28 22:45:17 -06:00
• ccc8f7b5f2 Bump version to 2.2.0 Eugen Rochko 2018-01-29 01:12:36 +01:00
• e14c20582f
  Bump version to 2.2.0 Eugen Rochko 2018-01-29 01:12:36 +01:00
• 83eb7a4e31 Fix padding bug in landing page column header (#6374) Eugen Rochko 2018-01-29 01:10:59 +01:00
• 47eda1e5fb
  Fix padding bug in landing page column header (#6374) Eugen Rochko 2018-01-29 01:10:59 +01:00
• 5e2f4c08da ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372) Eugen Rochko 2018-01-29 01:06:39 +01:00
• 97dcfb0f50
  ASSET_HOST is wrong env variable. Fix to CDN_HOST (#6372) Eugen Rochko 2018-01-29 01:06:39 +01:00
• 11dd2fa289 Add direction tags to HTML e-mails for RTL languages (#6373) Eugen Rochko 2018-01-29 00:22:20 +01:00
• 79bc3d5845
  Add direction tags to HTML e-mails for RTL languages (#6373) Eugen Rochko 2018-01-29 00:22:20 +01:00
• 0aff5dde9a Weblate translations (#6370) Renato "Lond" Cerqueira 2018-01-28 14:48:09 +01:00
• 106efba800 Weblate translations (#6370) Renato "Lond" Cerqueira 2018-01-28 14:48:09 +01:00
• 1b3ff6a92f
  Cascade mute/block destruction to notes (#193) feature/193-mute-and-block-notes David Yip 2018-01-27 01:31:22 -06:00
• 2ce4af84e9
  Put the less-specific column on the left-hand side (#193) David Yip 2018-01-27 01:25:22 -06:00
• c17c07158a
  Introduce Glitch::AccountRelationships (#193) David Yip 2018-01-27 01:23:14 -06:00
• e4f4ebe267 l10n Occitan update (#6367) Quenty31 2018-01-27 00:51:03 +01:00
• bd8d8ad894 l10n Occitan update (#6367) Quenty31 2018-01-27 00:51:03 +01:00
• 8f476ee39e
  Do not render note in RelationshipSerializer (#193) David Yip 2018-01-26 10:13:17 -06:00
• 041168df31
  Make Account#mute! spec expect returned Mute (#193) David Yip 2018-01-26 10:09:20 -06:00
• 5e6a09498a
  Add notes to blocks (#193) David Yip 2018-01-26 04:03:02 -06:00
• 84d748d179
  Improve code style ncls7615 2018-01-26 17:29:01 +09:00
• 1704e0066a
  Don't save mute notes if the note is blank (#193) David Yip 2018-01-25 22:42:19 -06:00
• 27f8d2c739
  Add notes to /api/v1/accounts/:id/mute (#193) David Yip 2018-01-25 22:38:02 -06:00
• 47ec2eff65
  Add notes to domain blocks and mutes (#193) David Yip 2018-01-18 13:35:00 -06:00
• a37753179d
  Introduce Glitch::Note (#193) David Yip 2018-01-18 13:34:01 -06:00
• e14db1477f Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-01-24 23:10:19 -06:00
• 00ce2be148
  Merge remote-tracking branch 'origin/master' into gs-master David Yip 2018-01-24 23:10:19 -06:00
• d1d2c83b80 Do not manually update system RubyGems (#6355) Akihiko Odaki 2018-01-25 12:23:29 +09:00
• 7e07e61a30 Do not manually update system RubyGems (#6355) Akihiko Odaki 2018-01-25 12:23:29 +09:00
• d6a27cc2de Do not require sudo on Travis CI (#6356) Akihiko Odaki 2018-01-25 12:23:09 +09:00
• 4a974c6db1 Do not require sudo on Travis CI (#6356) Akihiko Odaki 2018-01-25 12:23:09 +09:00
• 9c6d94142e Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-01-24 19:17:11 +00:00
• 0e10667fbe Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master Jenkins 2018-01-24 19:17:11 +00:00
• d0f03948fa Merge pull request #346 from KnzkDev/fix/travis David Yip 2018-01-24 13:09:13 -06:00
• 1b4d79acf8
  Merge pull request #346 from KnzkDev/fix/travis David Yip 2018-01-24 13:09:13 -06:00
• a4d0895129 Merge pull request #349 from codl/patch-1 beatrix 2018-01-24 08:56:38 -05:00
• 5a4de1cf0f
  Merge pull request #349 from codl/patch-1 beatrix 2018-01-24 08:56:38 -05:00
• 9bb74e37ed Fix initial_state me in push_notification_register (#6349) abcang 2018-01-24 22:37:46 +09:00
• a3c0a20373 Fix initial_state me in push_notification_register (#6349) abcang 2018-01-24 22:37:46 +09:00
• 3d9745fcbb remove escapes from server-side γaml handler codl 2018-01-24 14:23:25 +01:00
• 9abb5becf4
  remove escapes from server-side γaml handler codl 2018-01-24 14:23:25 +01:00
• e4d3650b52 Fix hide and show media button on admin page (#6347) abcang 2018-01-24 21:29:46 +09:00
• 8cd2828e91 Fix hide and show media button on admin page (#6347) abcang 2018-01-24 21:29:46 +09:00
• ce8bd47f3c Add packs volume to docker-compose.yml (#6348) Yamagishi Kazutoshi 2018-01-24 21:29:32 +09:00
• 3d881eed27 Add packs volume to docker-compose.yml (#6348) Yamagishi Kazutoshi 2018-01-24 21:29:32 +09:00