Commit graph

Select branches

Hide pull requests

add-user-route

backup/mailboxer

develop

feature/better.select

feature/browser-support

feature/convo.algo

feature/copy-paste

feature/emoji-fixes

feature/export.streaming

feature/extract.front.end

feature/flex.permission.styling

feature/import.export.more.parsers

feature/jit.react

feature/json

feature/latest.viewed

feature/limit.delete

feature/new.home

feature/overhaul-synapse-creation

feature/pan-zoom-in-url

feature/particles

feature/reconstruct

feature/refactor.jit

feature/thinner-topic-titles

feature/topic-card-uploads

feature/update-backbone-and-socket.io

feature/update-windows-docs

feature/uploads-api

feature/xml-schema-import

fix-null-pointer

frontendonly

homepage.good

instance/metamapscc

instance/synbioleap

instance/thevalueweb

instance/uts

master

rails-5.1

rubocop-fixes

stub-import-for-tests

test-codeclimate

#1010

#1011

#1013

#1019

#1021

#1022

#1025

#1026

#1027

#1028

#1029

#1030

#1031

#1036

#1037

#1038

#1039

#1040

#1040

#1042

#1043

#1044

#1045

#1045

#1046

#1047

#1048

#1050

#1051

#1053

#1054

#1058

#1059

#1060

#1060

#1063

#1064

#1065

#1066

#1069

#1070

#1071

#1072

#1073

#1074

#1078

#1080

#1081

#1083

#1084

#1086

#1088

#1089

#1090

#1091

#1099

#1101

#1102

#1103

#1106

#1109

#1112

#1112

#1115

#1116

#1117

#1117

#1119

#1121

#1127

#1128

#1129

#1130

#1131

#1132

#1133

#1137

#1139

#1142

#1144

#1145

#1148

#1149

#1150

#1151

#1152

#1153

#1154

#1154

#1155

#1156

#1157

#1158

#1158

#1159

#1159

#1160

#1161

#1161

#1162

#1163

#1164

#1165

#1166

#1167

#1168

#1169

#1170

#1172

#1173

#1173

#1174

#1175

#1175

#1178

#1178

#303

#317

#319

#342

#361

#362

#364

#364

#365

#370

#371

#376

#377

#378

#380

#381

#382

#383

#397

#397

#400

#400

#402

#402

#404

#406

#407

#407

#408

#408

#411

#412

#414

#414

#415

#416

#416

#417

#418

#419

#419

#420

#421

#440

#442

#442

#443

#443

#446

#446

#447

#448

#449

#449

#450

#451

#455

#456

#459

#460

#460

#461

#470

#472

#473

#474

#476

#477

#478

#480

#480

#481

#482

#483

#484

#487

#488

#489

#490

#491

#493

#496

#496

#497

#497

#498

#499

#500

#505

#506

#509

#519

#520

#522

#523

#526

#528

#529

#530

#533

#535

#536

#542

#542

#543

#544

#545

#546

#547

#548

#549

#550

#551

#552

#553

#556

#557

#558

#559

#562

#563

#564

#564

#565

#568

#572

#573

#574

#575

#576

#577

#578

#582

#583

#586

#587

#588

#589

#591

#591

#592

#593

#594

#597

#598

#599

#601

#603

#605

#606

#607

#608

#609

#610

#611

#615

#617

#618

#618

#620

#621

#626

#628

#628

#630

#633

#634

#636

#637

#639

#640

#641

#642

#643

#644

#644

#648

#649

#650

#651

#652

#653

#654

#655

#656

#659

#660

#661

#662

#663

#665

#667

#668

#669

#670

#672

#673

#674

#675

#676

#677

#678

#679

#681

#682

#683

#685

#687

#688

#689

#690

#691

#693

#695

#696

#697

#698

#699

#702

#707

#708

#709

#710

#714

#715

#716

#717

#718

#719

#724

#729

#730

#731

#732

#733

#734

#738

#739

#739

#740

#744

#747

#748

#751

#752

#753

#756

#757

#758

#760

#762

#764

#767

#768

#769

#770

#771

#772

#773

#774

#775

#777

#778

#779

#780

#781

#786

#787

#791

#792

#793

#795

#796

#804

#813

#814

#815

#816

#820

#825

#828

#839

#840

#841

#842

#844

#850

#851

#852

#854

#854

#858

#859

#860

#862

#863

#869

#870

#872

#874

#878

#879

#880

#883

#883

#884

#885

#893

#894

#897

#898

#899

#901

#902

#906

#910

#911

#913

#915

#916

#916

#919

#921

#922

#923

#926

#928

#928

#929

#930

#931

#932

#933

#934

#937

#941

#944

#946

#947

#950

#956

#956

#968

#970

#971

#971

#973

#984

#985

#985

#989

#991

#991

#994

#997

#999

#999

3.0.3

3.4

v2.6

v2.7

v2.7.1

v2.7.2

v2.8

v2.8.1

v2.8.2

v2.8.3

v2.8.4

v2.8.5

v2.8.6

v2.9.0

v2.9.1

v3.0

v3.0.1

v3.0.3

v3.0.4

v3.1

v3.2

v3.3

v3.4

v3.4.1

v3.5

v3.6

v3.6.1

Mono Color

• 8e23a0f1bd move metacode and permissions into subcomponents Connor Turland 2017-01-26 07:15:24 +00:00
• c33c60d118 fix metacode selection Devin Howard 2017-01-25 17:10:17 -05:00
• f14970a77d fix positioning on metacode selector Devin Howard 2017-01-25 17:06:15 -05:00
• dbd69d11be slightly wider metacodeTitle Devin Howard 2017-01-25 17:04:17 -05:00
• 51b80b994a move listeners into Links.js Devin Howard 2017-01-25 17:03:30 -05:00
• ff16d14f59 attachments split out, but it's pretty buggy Devin Howard 2017-01-25 16:54:28 -05:00
• 88a971de77 shift enter is linebreak, enter is save Devin Howard 2017-01-25 16:37:35 -05:00
• 5af79e405d disallow images in topic card markdown Devin Howard 2017-01-25 16:29:53 -05:00
• a81c5a71e3 textarea min height for desc Devin Howard 2017-01-25 15:57:07 -05:00
• 3a8b13c42f styling is much better now Devin Howard 2017-01-25 15:52:07 -05:00
• 6338d78a28 create working Desc editor Devin Howard 2017-01-25 15:49:11 -05:00
• 7c31876cb1 factor out Title and Links from Topic Card component, but not the listeners Devin Howard 2017-01-25 14:03:20 -05:00
• 5a706e1e9d riek submit on enter Devin Howard 2017-01-24 18:26:42 -05:00
• afcd145fad riek editing for name field on topic card Devin Howard 2017-01-24 18:17:42 -05:00
• 19e775bca0 metacode selector in react topic card Devin Howard 2017-01-24 17:59:27 -05:00
• 35f5a7a7c2 metacode image working a bit better Devin Howard 2017-01-24 17:55:01 -05:00
• fa283ea484 scssify a bunch Devin Howard 2017-01-24 17:25:28 -05:00
• b9e95355e3 links bar Devin Howard 2017-01-24 12:17:34 -05:00
• aa84ce812f its coming along Connor Turland 2017-01-13 00:45:21 -05:00
• 19a75f6d67 Update package.json feature/new.home Connor Turland 2017-02-25 16:36:27 -05:00
• e72c437964 Merge f49a674566 into 47d0faadf2 Connor Turland 2017-02-25 21:04:43 +00:00
• 47d0faadf2 prevent double prompt on file drop import Devin Howard 2017-02-25 13:04:00 -08:00
• 9800cc27c6 even better import csv regexes Devin Howard 2017-02-25 12:15:19 -08:00
• 7840e09e5f topicsRegex and synapsesRegex should allow commas (#1073) Devin Howard 2017-02-25 12:05:56 -08:00
• 4750179d61 topicsRegex and synapsesRegex should allow commas Devin Howard 2017-02-25 12:02:22 -08:00
• 687b957737 Update _cheatsheet.html.erb ben, bro 2017-02-23 22:03:33 -08:00
• 9ce989eba5 add unfollow_from_email to the policies Connor Turland 2017-02-16 14:01:22 +00:00
• 2c85590d65 fixup templates Connor Turland 2017-02-16 13:55:19 +00:00
• 2b34d84715 include ability to unfollow from email Connor Turland 2017-02-16 13:42:35 +00:00
• 013e3c7f21 follows for maps in the ui for internal testing only still (#1072) Connor Turland 2017-02-15 23:01:53 -05:00
• 91f3ec5e0a match how map follow works Connor Turland 2017-02-15 22:59:23 -05:00
• df943f31b9 require user for these actions Connor Turland 2017-02-15 22:57:19 -05:00
• 3b90c375e3 follows for maps in the ui for testers Connor Turland 2017-02-16 03:55:01 +00:00
• 8d771543d8 Merge branch 'fix/rspec' into develop Devin Howard 2017-02-12 15:29:40 -08:00
• 50639e8a0a Merge branch 'develop' Devin Howard 2017-02-12 15:11:19 -08:00
• 9d52aa9c74 tag v3.3 Devin Howard 2017-02-12 15:08:42 -08:00
• bb256577e3 tag v3.3 v3.3 Devin Howard 2017-02-12 15:08:42 -08:00
• 545706e17a disable cookie based auth on the API - mostly (#1070) Devin Howard 2017-02-12 09:54:54 -08:00
• 95901e17e8 fix travis (#1071) Devin Howard 2017-02-12 09:53:04 -08:00
• 9dbbdf1150 brakeman csrf warning suppressed :| Devin Howard 2017-02-11 20:00:42 -08:00
• 4ee4aeaad2 fix synapse/mapping spec Devin Howard 2017-02-11 19:56:07 -08:00
• bfdce21a66 fix topic spec Devin Howard 2017-02-11 19:54:09 -08:00
• 35fe02176f disable cookie based auth on the API - mostly Devin Howard 2017-02-11 19:49:29 -08:00
• 53d4beddec move hr tag in notification emails Devin Howard 2017-02-11 19:35:23 -08:00
• d455ced683 send mail by default is false in message from devs. also fixes a bug where the option didn't do anything Devin Howard 2017-02-11 19:30:58 -08:00
• d8698ef6f2 api stuffs (#1069) Connor Turland 2017-02-11 19:29:03 -05:00
• ecdce92958 thats all Connor Turland 2017-02-12 00:27:57 +00:00
• f9f1598529 /tokens/new form Devin Howard 2017-02-11 15:44:37 -08:00
• ad7830805f Update tokens_controller.rb Connor Turland 2017-02-11 18:21:09 -05:00
• c38afbbeb0 Update restful_controller.rb Connor Turland 2017-02-11 18:19:02 -05:00
• 1374da35da Update notification_service.rb Connor Turland 2017-02-11 15:29:31 -05:00
• 2d0d0403b1 little fixes for deploy Connor Turland 2017-02-11 19:50:59 +00:00
• 2d50f24be6 var misnamed Connor Turland 2017-02-11 14:21:47 +00:00
• 876c61a18e Better experience of notifications. (#1066) Connor Turland 2017-02-11 09:06:01 -05:00
• 014aaac307 bad merge Connor Turland 2017-02-11 14:02:19 +00:00
• b11a4c71d1 merge develop Connor Turland 2017-02-11 13:59:08 +00:00
• 2a0a1ccc8c notifications improvements Connor Turland 2017-02-11 13:54:38 +00:00
• b0deafc53e Follows and some new notifications (#1063) Connor Turland 2017-02-11 00:20:42 -05:00
• 350e2550e8 Update mailboxer.rb Connor Turland 2017-02-11 00:18:05 -05:00
• 6c3c9f8c7a Update mapping.rb Connor Turland 2017-02-11 00:14:00 -05:00
• 8333d7343c Update schema.rb Connor Turland 2017-02-11 00:03:17 -05:00
• de53e19d08 Update 20170209215819_create_follows.rb Connor Turland 2017-02-11 00:01:20 -05:00
• fd8b21ace0 Delete activity.text.erb Connor Turland 2017-02-10 23:59:28 -05:00
• b9426974e8 Delete activity.html.erb Connor Turland 2017-02-10 23:59:19 -05:00
• b34264b138 lots of fixes Connor Turland 2017-02-11 04:47:21 +00:00
• ce843c7ba0 refactor Connor Turland 2017-02-11 01:54:27 +00:00
• 5f97261641 dont add all the extra stuff we're not implementing yet Connor Turland 2017-02-11 00:32:42 +00:00
• 323f0b5071 remove follow_type for now Connor Turland 2017-02-10 23:50:20 +00:00
• a647d80efa third try to fix this little bug Connor Turland 2017-02-10 12:02:05 -05:00
• 559ad230ce actually this fixes it Connor Turland 2017-02-10 11:52:58 -05:00
• 26dfcbf823 edge case where realtime server is passing empty object Connor Turland 2017-02-10 11:45:05 -05:00
• 8e9fde5504 dont send duplicates Connor Turland 2017-02-10 01:11:21 +00:00
• 713f731aaf follows Connor Turland 2017-02-09 22:01:09 +00:00
• de0100a0b9 all the good changes Connor Turland 2017-02-09 21:47:41 +00:00
• 915defcd1b little fixes Connor Turland 2017-02-10 00:32:15 +00:00
• dde097ea75 all the good changes (#1065) Connor Turland 2017-02-09 16:53:19 -05:00
• 7e1a20ab83 all the good changes Connor Turland 2017-02-09 21:47:41 +00:00
• 3706cd83e7 helper function and notification setup for messages from the devs to be sent to all users (#1064) Devin Howard 2017-02-09 07:37:35 -08:00
• 147fe6d566 temporary fix Connor Turland 2017-02-09 15:36:54 +00:00
• 14cd1f95d0 don't use find_by_email Devin Howard 2017-02-08 20:43:55 -08:00
• 53a5ea76c1 helper function for messages from devs Devin Howard 2017-02-08 20:16:43 -08:00
• e5846abf01 message from devs notification type Devin Howard 2017-02-08 20:10:31 -08:00
• f49a674566 tweaks for developing on this branch feature/convo.algo Connor Turland 2017-02-06 03:41:28 +00:00
• 7951f08e45 Merge branch 'develop' into feature/convo.algo Connor Turland 2017-02-06 03:36:26 +00:00
• 575a3ec8bf Rename user_not_present_on_map.rB to user_not_present_on_map.rb Connor Turland 2017-02-05 22:09:51 -05:00
• b2bf9978aa Update ISSUE_TEMPLATE.md Connor Turland 2017-02-05 14:34:47 -05:00
• 0441850504 Secret.convo (#1059) Connor Turland 2017-02-05 14:30:23 -05:00
• 38e818bd52 fix syntax issue Connor Turland 2017-02-05 19:27:42 +00:00
• a3788377d8 no longer validate presence of xloc/yloc Connor Turland 2017-02-05 19:23:02 +00:00
• 9470a23929 only us for now Connor Turland 2017-02-05 14:19:48 -05:00
• 3c7c3f6857 minor touch ups Connor Turland 2017-02-05 08:32:18 +00:00
• 2f4fa7e64e realized this change is just good all around Connor Turland 2017-02-05 08:22:35 +00:00
• a3813aabb8 Merge 17adf5a6c5 into 3ae4072b5d Connor Turland 2017-02-05 08:18:57 +00:00
• 308659291b looks like its all working Connor Turland 2017-02-05 08:09:06 +00:00
• 9c65d2df09 for special conversation url Connor Turland 2017-02-05 07:05:25 +00:00
• 616e59174a final tweak for secret convos Connor Turland 2017-02-05 07:02:31 +00:00
• 88547dac99 Merge branch 'develop' into secret.convo Connor Turland 2017-02-05 06:55:43 +00:00
• 9c644afa2c add stuff Connor Turland 2017-02-05 06:55:38 +00:00
• a84815aaed tiny merge with develop Connor Turland 2017-02-05 06:39:55 +00:00
• 9b0ead24a3 more merges with develop Connor Turland 2017-02-05 06:37:37 +00:00