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

• edce66c44d new react tests with enzyme library (#1116) Devin Howard 2017-05-13 10:50:52 -0700
• 74df2559a4 try to fix fatal on notifications index when a topic is invalid (#1115) Devin Howard 2017-05-13 10:49:46 -0700
• 7e0ad0e459 Update index.html.erb Connor Turland 2017-05-13 13:49:26 -0400
• 39d28ee136 alert user if map deletion fails because it's been forked Devin Howard 2017-05-10 19:36:54 -0700
• 8d5eeb9d6d try to suppress 2 warnings Devin Howard 2017-05-06 19:29:33 -0700
• 198af3e6cc fix Devin Howard 2017-05-06 18:55:36 -0700
• 4abdc74750 remove duplicated code Devin Howard 2017-05-06 18:53:36 -0700
• e37079c079 eslintrc for test dir Devin Howard 2017-05-06 18:40:57 -0700
• 75611ed187 try to fix travis by adding react-addons-test-utils again Devin Howard 2017-05-06 18:31:41 -0700
• 0fac315d5e eslint Devin Howard 2017-05-06 18:24:41 -0700
• 4acfe495c0 tests pass again Devin Howard 2017-05-06 18:21:51 -0700
• 6eccfe05ef make npm run test work Devin Howard 2017-05-06 18:08:56 -0700
• b1c6aec050 switch ImportDialogBox to using enzyme but tests are still failing Devin Howard 2017-05-06 18:08:48 -0700
• 84e268be2d add star logic to tests Devin Howard 2017-05-06 17:32:27 -0700
• 64871956b3 start testing InfoAndHelp component Devin Howard 2017-05-06 17:22:52 -0700
• ac2077d89b install enzyme Devin Howard 2017-05-06 15:56:47 -0700
• 667c0d6265 move ImportDialogBox into a folder Devin Howard 2017-05-06 15:56:38 -0700
• 4bd5be2154 try to fix fatal on notifications index when a topic is invalid Devin Howard 2017-05-06 14:27:23 -0700
• ec65eb3eff Merge d28bd1b62d into a6694a3f72 Devin Howard 2017-04-21 00:35:45 +0000
• 5cb28637c9 Merge 0e6e90759c into a6694a3f72 Robert Best 2017-04-20 19:13:29 +0000
• a6694a3f72 Improvements to Import (#1109) Robert Best 2017-04-11 11:51:22 -0400
• 36d4f626e3 handleTEXT => handleText Devin Howard 2017-04-11 08:18:55 -0700
• 6975b16c1c fix a bug with event/e and eslint Devin Howard 2017-04-11 08:16:56 -0700
• bb04117ce7 check for TSV only at start of string Devin Howard 2017-04-11 08:14:48 -0700
• a16d2882f9 don't eslint 3rd party lib Devin Howard 2017-04-11 08:14:11 -0700
• 512def3944 add url regex with full documentation Devin Howard 2017-04-11 08:07:21 -0700
• ae7dc7f455 Removed console logs Robert Best 2017-04-10 22:33:04 +0000
• 0823d7d338 Changed URL Regex to make more links importable, also removed need for special text formatting in order to paste or drop new topic labels. (Didn't break TSV import mode) Robert Best 2017-04-10 21:25:11 +0000
• 8c7a657499 update vimeo url, use asset path + erb for poster path (#1106) Devin Howard 2017-03-26 13:53:59 -0700
• 847d35e372 update vimeo url, use asset path + erb for poster path Devin Howard 2017-03-26 09:14:04 -0700
• 619673a2d7 browser-support.md feature/browser-support Devin Howard 2017-01-23 15:10:19 -0500
• 79839a4b48 more crazy refactoring Connor Turland 2017-03-22 22:36:59 -0400
• b7a6e615a0 try to fix everything by changing references Connor Turland 2017-03-22 20:54:40 -0400
• 7fe26ea022 completely broke everything by moving it Connor Turland 2017-03-22 19:39:44 -0400
• 90f77cd4f7 simplify views/topiccard (#1102) Connor Turland 2017-03-22 19:22:38 -0400
• 1650026b6f Update Links.js Connor Turland 2017-03-22 19:22:21 -0400
• f07b97d573 trying to scope all the modules per map or topic Connor Turland 2017-03-22 19:20:10 -0400
• 663706b1f7 temp Connor Turland 2017-03-22 19:26:28 +0000
• ec2d00e26d simplify views/topiccard Connor Turland 2017-03-22 17:20:50 +0000
• af4dc869c0 devins right shouldnt push straight to develop Connor Turland 2017-03-22 17:04:18 +0000
• 2cae12e1ab found a better way to handle junto chat panel Connor Turland 2017-03-22 16:35:28 +0000
• 49102ea474 only toggle if authorized Connor Turland 2017-03-22 16:13:59 +0000
• f2a7cc1f19 stop using jquery ui for topic card dragging Connor Turland 2017-03-22 16:09:47 +0000
• a5d5cd6000 fix editing synapse desc (#1101) Devin Howard 2017-03-20 19:32:54 -0700
• 2b8410040b fix editing synapse desc Devin Howard 2017-03-20 19:30:22 -0700
• 391a1d8b24 link feedback directly to a hylo feedback tag (#1099) Devin Howard 2017-03-20 12:48:30 -0700
• be20b82934 link feedback directly to a hylo feedback tag Devin Howard 2017-03-19 14:48:14 -0700
• cc17c1ed38 add tiny divider between global and map items Connor Turland 2017-03-17 12:54:18 -0400
• eee1febbf9 clean up unused vars and logs Connor Turland 2017-03-17 10:25:08 -0400
• c8f6374ac8 remove no longer needed comments Connor Turland 2017-03-17 09:32:52 -0400
• ed76162b63 added icons to mobile menu fixes #1095 Connor Turland 2017-03-17 01:32:01 -0400
• 1eb4187691 broken import Connor Turland 2017-03-17 00:11:57 -0400
• 4a7dd54aca remove unused vars Connor Turland 2017-03-17 00:48:28 +0000
• efd6258c7e mobile.js was already removed but not deleted Connor Turland 2017-03-17 00:29:24 +0000
• f4d1b8ba35 ensure node is defined before calling function on it Connor Turland 2017-03-17 00:10:32 +0000
• 47a74dd77b react-router and rebuild app structure in react (#1091) Connor Turland 2017-03-16 17:58:56 -0400
• 3daf5a0b2c tiimeout not needed Connor Turland 2017-03-16 12:12:38 -0400
• fe8d2c1ff9 turns out chatview was heavily hogging memory Connor Turland 2017-03-16 12:02:51 -0400
• 4882e9dac3 add some logging to see whether this is source of many renders Connor Turland 2017-03-16 11:41:18 -0400
• 2bd27d7ee5 use onclickoutside for account/sign in box Connor Turland 2017-03-16 11:38:29 -0400
• c97b769a1a renaming for clarity Connor Turland 2017-03-16 11:17:25 -0400
• 43ffbbca82 eslint helps Connor Turland 2017-03-16 11:12:36 -0400
• 806c276616 make filter map function names more readable Connor Turland 2017-03-16 11:05:17 -0400
• eadf9c3309 fixup filters Connor Turland 2017-03-16 02:44:04 -0400
• b21250db28 little fixes Connor Turland 2017-03-16 02:27:21 -0400
• 77297f9f17 installing render log to count Connor Turland 2017-03-16 01:13:20 -0400
• 04a0b177e0 try putting preparevizdata in a timeout Connor Turland 2017-03-16 01:06:37 -0400
• a41fd05a1b fix little homepage styling issue Connor Turland 2017-03-16 00:27:03 -0400
• 6fdd6acc11 fix csrf auth token Connor Turland 2017-03-16 00:17:30 -0400
• 20c9f989e1 reenable topic view in react Connor Turland 2017-03-16 00:02:54 -0400
• 38baeee994 make filterbox use onclickoutside Connor Turland 2017-03-15 22:48:03 -0400
• d76433d550 reenable google analytics Connor Turland 2017-03-15 22:05:14 -0400
• 4d3741c3b4 handle page title and mobile title updates Connor Turland 2017-03-15 22:02:58 -0400
• bc67644ba9 remove extra comments Connor Turland 2017-03-15 21:12:34 -0400
• 6cb78672c8 forgot to add one proptype Connor Turland 2017-03-15 21:10:43 -0400
• 40c92cd8dc filter box in react Connor Turland 2017-03-15 20:59:10 -0400
• 9789e9966b made our request invite page look nice Connor Turland 2017-03-13 13:30:12 -0400
• 598d1192e3 fix apps pages and missing routes Connor Turland 2017-03-13 12:55:59 -0400
• 4a3d78816e fix toast (and sign out bug) Connor Turland 2017-03-13 12:22:52 -0400
• ac87fc0ed5 rewrite map instructions Connor Turland 2017-03-13 10:04:44 -0400
• dc33d5f687 add frame for topic view Connor Turland 2017-03-13 09:34:34 -0400
• 9a8370d573 this shouldn't have been removed Connor Turland 2017-03-13 09:30:17 -0400
• 44d72200d4 handle case where user hasn't loaded yet Connor Turland 2017-03-13 09:29:57 -0400
• 714e76e89e jquery no longer handling access requests Connor Turland 2017-03-13 09:22:48 -0400
• 4c1646fdef fix up navigation to use react-router Connor Turland 2017-03-13 09:21:16 -0400
• 8010e7d497 fixup mapchat stuff Connor Turland 2017-03-13 08:50:04 -0400
• ea82a9df27 improve topic card readability and fix dragging bug Connor Turland 2017-03-13 07:36:27 -0400
• b09c876ea3 fix map chat layout and tab bug Connor Turland 2017-03-13 07:18:51 -0400
• 959a6837d8 lots of fixes Connor Turland 2017-03-12 22:14:44 -0400
• 743e3371eb add metacode edit routes Connor Turland 2017-03-12 14:49:12 -0400
• fb094c3392 fix accountbox toggling Connor Turland 2017-03-12 12:47:47 -0400
• 9f2a61ce32 fix signed out home page Connor Turland 2017-03-12 12:35:52 -0400
• 0741743660 make other routes work Connor Turland 2017-03-12 12:26:49 -0400
• 96c202c7bf fixed maps scrolling Connor Turland 2017-03-12 11:31:19 -0400
• e4e062b76e get account menu and invite lightbox working Connor Turland 2017-03-12 03:49:34 -0400
• 871c491097 redo the mobile menu in react Connor Turland 2017-03-12 03:26:00 -0400
• 780217490b remove filterBoxOpen for now Connor Turland 2017-03-12 01:00:37 -0500
• 032d0d8f4b make mapsWidth work and add mobile Connor Turland 2017-03-12 00:56:59 -0500
• 9013d49ca1 fix map upperRightUI layout Connor Turland 2017-03-11 21:24:43 -0500
• d2d35c9a3d just keep using current mapinfobox Connor Turland 2017-03-11 21:13:58 -0500