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

• 889709a2a6 Show 'do not display in public timeline' when replying to self blackle 2017-01-16 10:23:45 -05:00
• c1db86003d Fix upload file input being re-rendered needlessly Eugen Rochko 2017-01-16 14:21:55 +01:00
• 1a33e4042e Fix upload file input being re-rendered needlessly Eugen Rochko 2017-01-16 14:21:55 +01:00
• 4bdaa234c1 Fix #238 - Add "favourites" column Eugen Rochko 2017-01-16 13:27:58 +01:00
• 7d53ee73f3 Fix #238 - Add "favourites" column Eugen Rochko 2017-01-16 13:27:58 +01:00
• 740851760d Fix #414 - Improve lightbox, add loading indicator Eugen Rochko 2017-01-16 12:04:02 +01:00
• da5d366230 Fix #414 - Improve lightbox, add loading indicator Eugen Rochko 2017-01-16 12:04:02 +01:00
• d2c2568bd4 Merge branch 'blackle-sensitive' Eugen Rochko 2017-01-16 11:37:35 +01:00
• a78148f763 Merge branch 'blackle-sensitive' Eugen Rochko 2017-01-16 11:37:35 +01:00
• 1660abf2f2 Merge branch 'sensitive' of https://github.com/blackle/mastodon into blackle-sensitive Eugen Rochko 2017-01-16 11:36:02 +01:00
• 2ae0fb4419 Merge branch 'sensitive' of https://github.com/blackle/mastodon into blackle-sensitive Eugen Rochko 2017-01-16 11:36:02 +01:00
• fcf56b5e88 Move follow requests link above logout link in getting started column Eugen Rochko 2017-01-16 11:35:32 +01:00
• 0439c7d58b Move follow requests link above logout link in getting started column Eugen Rochko 2017-01-16 11:35:32 +01:00
• 49a5f7ab99 Show visibility toggle on media gallery for sensitive images blackle 2017-01-15 20:26:03 -05:00
• 144402ec7e Show visibility toggle on media gallery for sensitive images blackle 2017-01-15 20:26:03 -05:00
• 978fdb30ad Merge pull request #478 from blackle/backflip Eugen 2017-01-15 18:45:53 +01:00
• 3778355454 Merge pull request #478 from blackle/backflip Eugen 2017-01-15 18:45:53 +01:00
• b71db66004 Change boost sprite to look like fa-retweet blackle 2017-01-15 10:55:31 -05:00
• 383114add3 Change boost sprite to look like fa-retweet blackle 2017-01-15 10:55:31 -05:00
• 9a031684c4 Fix typo introduced in #470 which made unlisted toggle only fade in/out and not also collapse Eugen Rochko 2017-01-15 14:59:25 +01:00
• 926459fc0a Fix typo introduced in #470 which made unlisted toggle only fade in/out and not also collapse Eugen Rochko 2017-01-15 14:59:25 +01:00
• d9294f74ba Fix #427 - don't suggest hashtag if the search value contains a space Eugen Rochko 2017-01-15 14:45:43 +01:00
• 7d7a11250c Fix #427 - don't suggest hashtag if the search value contains a space Eugen Rochko 2017-01-15 14:45:43 +01:00
• 6cdb8f7e84 Fix #449 - don't do relationships fetch for empty array of IDs Eugen Rochko 2017-01-15 14:41:49 +01:00
• 1d5cbfa356 Fix #449 - don't do relationships fetch for empty array of IDs Eugen Rochko 2017-01-15 14:41:49 +01:00
• 578328b23f Fix #466 - when logged in, make "get started" link to the frontpage instead of sign up Eugen Rochko 2017-01-15 14:38:59 +01:00
• cc1eccc8bc Fix #466 - when logged in, make "get started" link to the frontpage instead of sign up Eugen Rochko 2017-01-15 14:38:59 +01:00
• 20badcb602 Merge pull request #476 from ineffyble/fix-paperclip-s3-acl Eugen 2017-01-15 14:29:47 +01:00
• 16f9490d33 Merge pull request #476 from ineffyble/fix-paperclip-s3-acl Eugen 2017-01-15 14:29:47 +01:00
• 2d6e292444 Merge branch 'ineffyble-feature/toot-app-source' Eugen Rochko 2017-01-15 14:04:56 +01:00
• bfec9aaee0 Merge branch 'ineffyble-feature/toot-app-source' Eugen Rochko 2017-01-15 14:04:56 +01:00
• 36b3459b82 Fix tests, add applications to eager loading/cache for statuses, fix application website validation, don't link to app website if website isn't set, also comment out animated boost icon from #464 until it's consistent with non-animated version Eugen Rochko 2017-01-15 14:01:33 +01:00
• e9737c2235 Fix tests, add applications to eager loading/cache for statuses, fix application website validation, don't link to app website if website isn't set, also comment out animated boost icon from #464 until it's consistent with non-animated version Eugen Rochko 2017-01-15 14:01:33 +01:00
• 07a206ba5d Merge branch 'feature/toot-app-source' of https://github.com/ineffyble/mastodon into ineffyble-feature/toot-app-source Eugen Rochko 2017-01-15 13:23:47 +01:00
• ab165547fd Merge branch 'feature/toot-app-source' of https://github.com/ineffyble/mastodon into ineffyble-feature/toot-app-source Eugen Rochko 2017-01-15 13:23:47 +01:00
• 5c57beec58 Merge pull request #464 from blackle/backflip Eugen 2017-01-15 13:19:15 +01:00
• 1f7c0ad8d3 Merge pull request #464 from blackle/backflip Eugen 2017-01-15 13:19:15 +01:00
• 18dd2e02a1 Change default S3 ACL string used by Paperclip from 'public' (which is invalid) to 'public-read' Effy Elden 2017-01-15 20:58:46 +11:00
• a097dd489b Change default S3 ACL string used by Paperclip from 'public' (which is invalid) to 'public-read' Effy Elden 2017-01-15 20:58:46 +11:00
• 92b69e6d9e Merge pull request #474 from ineffyble/add-back-link-to-settings Eugen 2017-01-15 02:15:37 +01:00
• 777f527d86 Merge pull request #474 from ineffyble/add-back-link-to-settings Eugen 2017-01-15 02:15:37 +01:00
• 9c40102677 Add a textual 'Back to Mastodon' link in footer of settings pages Effy Elden 2017-01-15 11:03:35 +11:00
• e45fed58cb Add a textual 'Back to Mastodon' link in footer of settings pages Effy Elden 2017-01-15 11:03:35 +11:00
• 8e85ccbe4c Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether Effy Elden 2017-01-15 10:30:23 +11:00
• ed41f9f0b1 Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether Effy Elden 2017-01-15 10:30:23 +11:00
• 92786c97bf Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether Effy Elden 2017-01-15 10:27:54 +11:00
• 3f84816b24 Add nice error page for CSRF errors/cookie issue, and fix error page handling altogether Effy Elden 2017-01-15 10:27:54 +11:00
• 824d1e02ab Make boost button arrows spin around blackle 2017-01-13 23:32:27 -05:00
• a67ffcbf56 Make boost button arrows spin around blackle 2017-01-13 23:32:27 -05:00
• 9ab3a16e63 Merge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into feature/toot-app-source Effy Elden 2017-01-15 09:12:11 +11:00
• f81dc7a33a Merge branch 'feature/toot-app-source' of github.com:ineffyble/mastodon into feature/toot-app-source Effy Elden 2017-01-15 09:12:11 +11:00
• cbcc22ff8c Test for presence of Application in haml before trying to render details, to fix errors identified by CI Effy Elden 2017-01-15 09:10:44 +11:00
• 6c002cf615 Test for presence of Application in haml before trying to render details, to fix errors identified by CI Effy Elden 2017-01-15 09:10:44 +11:00
• 1a3766fc6c Fix typo in rel Effy Elden 2017-01-15 09:04:14 +11:00
• 65122798b2 Fix typo in rel Effy Elden 2017-01-15 09:04:14 +11:00
• 8f0b253bb8 Add tracking of OAuth app that posted a status, extend OAuth apps to have optional website field, add application details to API, show application name and website on detailed status views. Resolves #11 Effy Elden 2017-01-15 08:58:50 +11:00
• d6bc0e8db4 Add tracking of OAuth app that posted a status, extend OAuth apps to have optional website field, add application details to API, show application name and website on detailed status views. Resolves #11 Effy Elden 2017-01-15 08:58:50 +11:00
• 9362321d12 Merge pull request #470 from ineffyble/fix/412-hide-public-timeline-option-for-replies Eugen 2017-01-14 20:33:10 +01:00
• 88801f7554 Merge pull request #470 from ineffyble/fix/412-hide-public-timeline-option-for-replies Eugen 2017-01-14 20:33:10 +01:00
• 6df3470b7f Hide 'Do not display on public timeline' for reply toots. Fixes #412. Effy Elden 2017-01-15 06:10:23 +11:00
• 32d756fb22 Hide 'Do not display on public timeline' for reply toots. Fixes #412. Effy Elden 2017-01-15 06:10:23 +11:00
• aaf5dd2ef3 Fix too late return Eugen 2017-01-14 02:22:16 +01:00
• f63f0c4625 Fix too late return Eugen 2017-01-14 02:22:16 +01:00
• a62ade0da9 Improve extended about page layout Eugen Rochko 2017-01-13 20:27:02 +01:00
• 7cde08e30b Improve extended about page layout Eugen Rochko 2017-01-13 20:27:02 +01:00
• 2d5526233d Adding about/more page with extended information that can be set up by an admin Eugen Rochko 2017-01-13 20:14:21 +01:00
• c01dd089ff Adding about/more page with extended information that can be set up by an admin Eugen Rochko 2017-01-13 20:14:21 +01:00
• af25350778 Add extended about page stub Eugen Rochko 2017-01-13 03:24:41 +01:00
• e25170f960 Add extended about page stub Eugen Rochko 2017-01-13 03:24:41 +01:00
• 517638f6cc Extend rails-settings-cached to merge db-saved hash values with defaults Eugen Rochko 2017-01-13 02:42:22 +01:00
• 2939e9898b Extend rails-settings-cached to merge db-saved hash values with defaults Eugen Rochko 2017-01-13 02:42:22 +01:00
• a4686e166c Add settings for contact information Eugen Rochko 2017-01-12 20:54:14 +01:00
• ca50ceeaf0 Add settings for contact information Eugen Rochko 2017-01-12 20:54:14 +01:00
• 9043a27248 Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings with YAML-defined defaults. Add admin page for editing global settings. Add "site_description" setting that would show as a paragraph on the frontpage Eugen Rochko 2017-01-12 20:46:24 +01:00
• b11fdc3ae3 Migrate from ledermann/rails-settings to rails-settings-cached which allows global settings with YAML-defined defaults. Add admin page for editing global settings. Add "site_description" setting that would show as a paragraph on the frontpage Eugen Rochko 2017-01-12 20:46:24 +01:00
• 9f78fb2a77 Merge pull request #461 from vjackson725/master Eugen 2017-01-12 13:50:17 +01:00
• babc6a1528 Merge pull request #461 from vjackson725/master Eugen 2017-01-12 13:50:17 +01:00
• 81ab671804 fix Vagrantfile so that the correct ruby is installed vjackson725 2017-01-12 23:20:55 +11:00
• 91dc21c469 fix Vagrantfile so that the correct ruby is installed vjackson725 2017-01-12 23:20:55 +11:00
• ac95c2dbfe Add rake task for clearing out media from silenced accounts Eugen Rochko 2017-01-12 04:19:04 +01:00
• 8f54a8851a Add rake task for clearing out media from silenced accounts Eugen Rochko 2017-01-12 04:19:04 +01:00
• 1a77ccb668 Fix #457 - escape JSON in INITIAL_STATE (this bug only ever allowed a user to xss themselves rather than anyone else) Eugen Rochko 2017-01-12 03:54:50 +01:00
• 4a2ee43e80 Fix #457 - escape JSON in INITIAL_STATE (this bug only ever allowed a user to xss themselves rather than anyone else) Eugen Rochko 2017-01-12 03:54:50 +01:00
• 992c8d2c41 Add ruby version to Gemfile, move devDependencies in package.json to dependencies, fix bug in process feed service Eugen Rochko 2017-01-11 15:39:31 +01:00
• 7951e7ffd5 Add ruby version to Gemfile, move devDependencies in package.json to dependencies, fix bug in process feed service Eugen Rochko 2017-01-11 15:39:31 +01:00
• 9eb3f68499 Merge pull request #456 from ineffyble/fix-repo-url Eugen 2017-01-11 14:19:19 +01:00
• 10739df458 Merge pull request #456 from ineffyble/fix-repo-url Eugen 2017-01-11 14:19:19 +01:00
• efd8ce920f Better animations Eugen Rochko 2017-01-11 04:21:49 +01:00
• 3ad0496ccb Better animations Eugen Rochko 2017-01-11 04:21:49 +01:00
• ad61a21752 Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places Effy Elden 2017-01-11 13:24:14 +11:00
• f876a8681d Update the Mastodon repository URL from Gargron/ to tootsuite/ in various places Effy Elden 2017-01-11 13:24:14 +11:00
• 001a73c6fc Fix env variable name Eugen 2017-01-10 22:01:13 +01:00
• 4292cf60ae Fix env variable name Eugen 2017-01-10 22:01:13 +01:00
• bc17613e70 Fix issue when settings are not defined for column type Eugen Rochko 2017-01-10 17:33:32 +01:00
• 18b11100e7 Fix issue when settings are not defined for column type Eugen Rochko 2017-01-10 17:33:32 +01:00
• c8bcd413e2 Home column filters Eugen Rochko 2017-01-10 17:25:10 +01:00
• 312c51b5c8 Home column filters Eugen Rochko 2017-01-10 17:25:10 +01:00
• 15b183117c Add "not found" component to UI Eugen Rochko 2017-01-10 13:50:40 +01:00
• 1e9d2c4b1e Add "not found" component to UI Eugen Rochko 2017-01-10 13:50:40 +01:00
• 14a0bec2d8 Add link to list of apps Eugen 2017-01-10 12:23:30 +01:00
• a1db2a191b Add link to list of apps Eugen 2017-01-10 12:23:30 +01:00
• efd4565389 Merge pull request #450 from blackle/master Eugen 2017-01-10 12:21:06 +01:00
• 67a31454ad Merge pull request #450 from blackle/master Eugen 2017-01-10 12:21:06 +01:00
• 57e496e1bc simplify emojification on public pages with .emojify class blackle 2017-01-09 22:40:45 -05:00
• 917cf0bf5d simplify emojification on public pages with .emojify class blackle 2017-01-09 22:40:45 -05:00
• 0c0d4b7c92 Fix sandboxed iOS login again Eugen Rochko 2017-01-09 19:43:53 +01:00
• 205ba00017 Fix sandboxed iOS login again Eugen Rochko 2017-01-09 19:43:53 +01:00
• ee6b885468 Merge branch 'blackle-master' Eugen Rochko 2017-01-09 14:13:46 +01:00
• 5d558c14b4 Merge branch 'blackle-master' Eugen Rochko 2017-01-09 14:13:46 +01:00
• 394f185e91 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master Eugen Rochko 2017-01-09 14:12:40 +01:00
• def1f8c5b3 Merge branch 'master' of https://github.com/blackle/mastodon into blackle-master Eugen Rochko 2017-01-09 14:12:40 +01:00
• 609748016f Merge branch 'blackle-dropdown' Eugen Rochko 2017-01-09 14:12:00 +01:00
• d6a456dc71 Merge branch 'blackle-dropdown' Eugen Rochko 2017-01-09 14:12:00 +01:00
• a1783b80b2 Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown Eugen Rochko 2017-01-09 14:10:32 +01:00
• 3bddd647e0 Merge branch 'dropdown' of https://github.com/blackle/mastodon into blackle-dropdown Eugen Rochko 2017-01-09 14:10:32 +01:00
• 4293e132d1 Persist UI settings, add missing localizations for German Eugen Rochko 2017-01-09 14:00:55 +01:00
• 75f80bef10 Persist UI settings, add missing localizations for German Eugen Rochko 2017-01-09 14:00:55 +01:00
• c1c814e6a1 Improve initialState loading Eugen Rochko 2017-01-09 12:37:15 +01:00
• 23ebf60b95 Improve initialState loading Eugen Rochko 2017-01-09 12:37:15 +01:00
• 62167338b8 Generate key for each input so we can upload the same file even after deleting blackle 2017-01-08 21:00:13 -05:00
• 131bae89fd Generate key for each input so we can upload the same file even after deleting blackle 2017-01-08 21:00:13 -05:00
• a697b5473a Switch to compose view when tapping 'mention' in dropdown on mobile blackle 2017-01-08 05:04:01 -05:00
• d64c454cfe Switch to compose view when tapping 'mention' in dropdown on mobile blackle 2017-01-08 05:04:01 -05:00
• f29df16eea Fix Paperclip timeout setting. Fix bug introduced in #437 Eugen Rochko 2017-01-08 19:12:54 +01:00
• 2e71bb031b Fix Paperclip timeout setting. Fix bug introduced in #437 Eugen Rochko 2017-01-08 19:12:54 +01:00
• 9f3e2737e9 Merge pull request #443 from blackle/master Eugen 2017-01-08 13:36:02 +01:00
• 38bc85e695 Merge pull request #443 from blackle/master Eugen 2017-01-08 13:36:02 +01:00
• 2ee3e2f4a4 Merge pull request #446 from blackle/dropdown2 Eugen 2017-01-08 13:34:27 +01:00
• a8e30060ae Merge pull request #446 from blackle/dropdown2 Eugen 2017-01-08 13:34:27 +01:00
• 9d66dfecf6 Expand dropdown leftways on status view blackle 2017-01-08 06:32:37 -05:00
• 05e964688d Expand dropdown leftways on status view blackle 2017-01-08 06:32:37 -05:00
• 1adfe59c14 Add call-to developers on getting started page blackle 2017-01-08 00:23:22 -05:00
• b4f09bae1d Add call-to developers on getting started page blackle 2017-01-08 00:23:22 -05:00
• 72843ea705 Merge pull request #437 from krainboltgreene/patch-1 Eugen 2017-01-08 04:14:54 +01:00
• 69643338f6 Merge pull request #437 from krainboltgreene/patch-1 Eugen 2017-01-08 04:14:54 +01:00
• c65508da26 Merge pull request #436 from krainboltgreene/patch-2 Eugen 2017-01-08 04:00:22 +01:00
• e8d6f6c8c1 Merge pull request #436 from krainboltgreene/patch-2 Eugen 2017-01-08 04:00:22 +01:00
• 5bbd50e180 Update badges Eugen 2017-01-08 03:47:33 +01:00
• db8a088502 Update badges Eugen 2017-01-08 03:47:33 +01:00
• 5cecff7f2a Simplifying followers mappings Kurtis Rainbolt-Greene 2017-01-07 18:09:00 -08:00
• abe3ae1cc2 Simplifying followers mappings Kurtis Rainbolt-Greene 2017-01-07 18:09:00 -08:00
• ff835f3377 Less complicated determination Kurtis Rainbolt-Greene 2017-01-07 17:59:51 -08:00
• 4a7e3e5082 Less complicated determination Kurtis Rainbolt-Greene 2017-01-07 17:59:51 -08:00
• e715e3e009 Merge pull request #434 from vjackson725/fix_vagrantfile Eugen 2017-01-08 02:58:43 +01:00
• 6d097d559b Merge pull request #434 from vjackson725/fix_vagrantfile Eugen 2017-01-08 02:58:43 +01:00
• e7132be958 Merge pull request #435 from krainboltgreene/patch-1 Eugen 2017-01-08 02:58:19 +01:00
• 4447c4c7c8 Merge pull request #435 from krainboltgreene/patch-1 Eugen 2017-01-08 02:58:19 +01:00
• 82b0eb2ae4 Using "rails style" order arguments Kurtis Rainbolt-Greene 2017-01-07 17:55:40 -08:00
• e5d9009d71 Using "rails style" order arguments Kurtis Rainbolt-Greene 2017-01-07 17:55:40 -08:00
• 4f9cc841b2 Fix Vagrantfile to include yarn vjackson725 2017-01-08 12:38:04 +11:00
• db3d5d811c Fix Vagrantfile to include yarn vjackson725 2017-01-08 12:38:04 +11:00
• 3f639be601 Merge pull request #432 from blackle/volume-icon Eugen 2017-01-08 02:36:12 +01:00
• 7a0a13ab53 Merge pull request #432 from blackle/volume-icon Eugen 2017-01-08 02:36:12 +01:00
• 85cc2dd826 Show correct volume icons on video player blackle 2017-01-07 20:21:50 -05:00
• 8a571158c9 Show correct volume icons on video player blackle 2017-01-07 20:21:50 -05:00
• 00c9ce1eff Merge pull request #430 from blackle/logout_mobile Eugen 2017-01-08 01:24:06 +01:00
• cec7e69827 Merge pull request #430 from blackle/logout_mobile Eugen 2017-01-08 01:24:06 +01:00
• 8ceae22535 Show logout button on getting started so it's available on mobile blackle 2017-01-07 18:41:57 -05:00
• e1ca354956 Show logout button on getting started so it's available on mobile blackle 2017-01-07 18:41:57 -05:00
• 177d9cd8fe Merge pull request #429 from blackle/emojify_usernames Eugen 2017-01-08 00:19:24 +01:00
• 679aa35e15 Merge pull request #429 from blackle/emojify_usernames Eugen 2017-01-08 00:19:24 +01:00
• 75c2397ed1 Emojify display names in notifcations blackle 2017-01-07 18:16:14 -05:00
• 57ff221c0f Emojify display names in notifcations blackle 2017-01-07 18:16:14 -05:00
• 94d1457cd7 Merge pull request #428 from blackle/contrast Eugen 2017-01-07 22:51:15 +01:00
• 165df323ae Merge pull request #428 from blackle/contrast Eugen 2017-01-07 22:51:15 +01:00
• a914180df6 Improve contrast of bio and username text in account info blackle 2017-01-07 16:39:30 -05:00
• 61211b509c Improve contrast of bio and username text in account info blackle 2017-01-07 16:39:30 -05:00
• c398d2d82b Merge pull request #425 from ineffyble/vagrant Eugen 2017-01-07 18:31:59 +01:00
• 2fbb38e4b2 Merge pull request #425 from ineffyble/vagrant Eugen 2017-01-07 18:31:59 +01:00
• d019f1632c Replace getting started icon on desktop nav bar with asterisk instead of hamburger Eugen Rochko 2017-01-07 15:46:39 +01:00
• be6ae3546f Replace getting started icon on desktop nav bar with asterisk instead of hamburger Eugen Rochko 2017-01-07 15:46:39 +01:00
• 126aba0e13 Fix #147 - Unreblogging will leave original status in feeds Eugen Rochko 2017-01-07 15:44:22 +01:00
• 5c7add2176 Fix #147 - Unreblogging will leave original status in feeds Eugen Rochko 2017-01-07 15:44:22 +01:00
• 438446b397 Add read timeout to paperclip when it's downloading remote images Eugen Rochko 2017-01-07 15:43:56 +01:00
• 7ddec6e7c3 Add read timeout to paperclip when it's downloading remote images Eugen Rochko 2017-01-07 15:43:56 +01:00
• 7afe78b1d6 Tweak Vagrant info in README Effy Elden 2017-01-08 01:30:48 +11:00
• 11ea7336e9 Tweak Vagrant info in README Effy Elden 2017-01-08 01:30:48 +11:00
• 6ef79c6948 Improve Vagrantfile, load environment variables from .env.vagrant, always forward localhost:3000 Effy Elden 2017-01-08 01:28:49 +11:00
• 46fb634c79 Improve Vagrantfile, load environment variables from .env.vagrant, always forward localhost:3000 Effy Elden 2017-01-08 01:28:49 +11:00
• 2b92e4a37a Add Vagrant development environment support Effy Elden 2017-01-07 23:22:24 +11:00
• f1289ca3c0 Add Vagrant development environment support Effy Elden 2017-01-07 23:22:24 +11:00
• 0dac73b5cc Add tab bar alternative to desktop UI, upgrade react & react-redux Eugen Rochko 2017-01-06 22:09:55 +01:00
• 989c3f4002 Add tab bar alternative to desktop UI, upgrade react & react-redux Eugen Rochko 2017-01-06 22:09:55 +01:00
• 26390b1997 Clean up h-card mess of divs Eugen Rochko 2017-01-06 20:24:51 +01:00
• 1bfbce7b45 Clean up h-card mess of divs Eugen Rochko 2017-01-06 20:24:51 +01:00
• ecd7a46f98 Fix h-card classes and remote follow button appearing when it shouldn't Eugen Rochko 2017-01-06 20:15:24 +01:00
• 72c3a41bef Fix h-card classes and remote follow button appearing when it shouldn't Eugen Rochko 2017-01-06 20:15:24 +01:00
• 9b5dabfa90 Merge branch 'myfreeweb-master' Eugen Rochko 2017-01-06 20:09:34 +01:00
• 8b28b82141 Merge branch 'myfreeweb-master' Eugen Rochko 2017-01-06 20:09:34 +01:00
• 8d6361b40b Add Microformats2 markup Greg V 2017-01-06 18:08:40 +03:00
• 18deeb9db5 Add Microformats2 markup Greg V 2017-01-06 18:08:40 +03:00
• 2804ccc958 Merge pull request #417 from ineffyble/twitter-card-metadata Eugen 2017-01-06 01:16:45 +01:00
• 92bd5f62f6 Merge pull request #417 from ineffyble/twitter-card-metadata Eugen 2017-01-06 01:16:45 +01:00
• c517908c5b Merge pull request #418 from ticky/upgrade-emojione Eugen 2017-01-06 01:13:34 +01:00
• 6917099a6a Merge pull request #418 from ticky/upgrade-emojione Eugen 2017-01-06 01:13:34 +01:00
• 0df070596e Fix #416 - Generate random unique 14-byte (19 characters) shortcodes for local attachments, use them in URLs. Check status privacy before redirecting to actual file. Eugen Rochko 2017-01-06 00:21:12 +01:00
• 7b9f8766e8 Fix #416 - Generate random unique 14-byte (19 characters) shortcodes for local attachments, use them in URLs. Check status privacy before redirecting to actual file. Eugen Rochko 2017-01-06 00:21:12 +01:00
• 73ce525d4b Upgrade EmojiOne to 2.2.7 Jessica Stokes 2017-01-05 15:16:13 -08:00
• 28a2f79dff
  Upgrade EmojiOne to 2.2.7 Jessica Stokes 2017-01-05 15:16:13 -08:00
• fe31b43b75 Add twitter:card metatag to enable Twitter Cards support Effy Elden 2017-01-06 09:47:40 +11:00