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

• b396b94477 re-enable Ctrl+/ search box focus shortcut Devin Howard 2016-09-30 11:33:39 +08:00
• e916ea32dc Merge pull request #690 from metamaps/feature/globalui-lint Devin Howard 2016-09-30 11:54:40 +08:00
• 816d5adf94 remove old code from GlobalUI.Search Devin Howard 2016-09-30 11:32:58 +08:00
• 8864dbbdcf Merge pull request #691 from metamaps/feature/better.zoom Robert Best 2016-09-29 18:26:02 -04:00
• 44a183ed7b I changed how zoom by mouse-wheel works so that it zooms based on where your mouse pointer is Robert Best 2016-09-29 21:32:55 +00:00
• e4e6043ded split GlobalUI into files Devin Howard 2016-09-30 00:20:16 +08:00
• 24caafba74 move GlobalUI into a folder Devin Howard 2016-09-30 00:08:45 +08:00
• 3b8199aac6 eslint updates for GlobalUI.js Devin Howard 2016-09-30 00:05:49 +08:00
• 2f0b0f39e5 Merge pull request #688 from metamaps/fix/searchsynapses-undefined-topic Devin Howard 2016-09-29 23:56:16 +08:00
• 1d4d7f07e2 fix error when searching for synapse with undefined topic1id Devin Howard 2016-09-29 18:38:54 +08:00
• 9af3f04f4d Merge pull request #685 from metamaps/feature/chatview-lint Devin Howard 2016-09-29 15:21:15 +08:00
• ec8dbbb4a7 Merge pull request #687 from metamaps/fix/rack-attack Devin Howard 2016-09-29 15:18:48 +08:00
• 26977d06a8 disable 5 minute request limit on rack attack Devin Howard 2016-09-29 13:15:14 +08:00
• 1bbc72fff0 was destroying and not reinitializing Connor Turland 2016-09-28 22:36:53 -04:00
• bca85337cc add template strings + outdent to chatview Devin Howard 2016-09-29 09:33:13 +08:00
• e858a2a773 update ChatView.js eslint style Devin Howard 2016-09-29 09:24:17 +08:00
• ee9a49d7c6 Merge pull request #683 from metamaps/fix/routes Devin Howard 2016-09-29 08:44:15 +08:00
• 88297b4eaa fix routes.rb Devin Howard 2016-09-29 08:38:02 +08:00
• 93341719a9 Update main_controller.rb (#682) Connor Turland 2016-09-28 20:22:55 -04:00
• 6f8ab1727f Update main_controller.rb Connor Turland 2016-09-28 20:22:23 -04:00
• db3cf0490f fix develop branch bugs (#679) Devin Howard 2016-09-29 08:02:25 +08:00
• 9605b24640 Merge pull request #681 from metamaps/better-contextMenu-fix Robert Best 2016-09-28 15:37:46 -04:00
• e8746ee7d9 Update Create.js Robert Best 2016-09-28 15:32:49 -04:00
• a37f60060c Update JIT.js Robert Best 2016-09-28 15:31:08 -04:00
• 4e506ad290 Update JIT.js Robert Best 2016-09-28 15:18:44 -04:00
• 67c4912c62 Update index.js Robert Best 2016-09-28 13:37:08 -04:00
• 10a2782f85 Update JIT.js Robert Best 2016-09-28 13:03:44 -04:00
• 2c3b387e42 Update index.js Robert Best 2016-09-28 13:00:32 -04:00
• ce1f0332be fix to_json calls Devin Howard 2016-09-28 22:48:02 +08:00
• e6b95ec42b remove unneeded respond_with Devin Howard 2016-09-28 22:45:44 +08:00
• f92ff3283d bugfix - rename SearchController so it works Devin Howard 2016-09-28 22:39:22 +08:00
• d6a239d6b4 Merge pull request #670 from metamaps/feature/explore-controller-simplify Devin Howard 2016-09-28 22:34:34 +08:00
• 466b1716a5 more changes to routes.rb Devin Howard 2016-09-26 01:10:41 +08:00
• 9699b41159 make requestinvite controller method explicit Devin Howard 2016-09-26 01:04:58 +08:00
• c1acaba941 re-order config/routes.rb Devin Howard 2016-09-26 01:02:45 +08:00
• 5b9eedc830 pull search routes into their own controller Devin Howard 2016-09-26 01:00:30 +08:00
• 5065655436 factor stars into their own controller Devin Howard 2016-09-26 00:50:52 +08:00
• 3ee8d41298 maps controller code climate Devin Howard 2016-09-26 00:36:08 +08:00
• f75ad41a82 factor out map_scope function Devin Howard 2016-09-26 00:28:23 +08:00
• bb87c9c2db simplify explore controller a bit Devin Howard 2016-09-26 00:16:18 +08:00
• a8b698b11c Merge pull request #677 from metamaps/feature/node1-topic1-migration Devin Howard 2016-09-28 22:26:50 +08:00
• cc412ac491 Merge pull request #675 from metamaps/feature/no-xls-export Devin Howard 2016-09-28 22:25:04 +08:00
• ac60370d6f Merge pull request #678 from metamaps/prevent-context-menu Robert Best 2016-09-28 05:27:03 -04:00
• 40b7e95b68 Update index.js Robert Best 2016-09-28 04:35:41 -04:00
• 743c9b3af9 node{1,2}_id => topic{1,2}_id migration and code changes Devin Howard 2016-09-28 10:32:28 +08:00
• a86101dda0 remove excel export Devin Howard 2016-09-27 21:10:14 +08:00
• 8f0b350a2d Fix underscore bug (#674) Connor Turland 2016-09-26 20:39:33 -04:00
• f7d3197455 Update ChatView.js Connor Turland 2016-09-26 20:38:02 -04:00
• d29a526e99 Update package.json Connor Turland 2016-09-26 20:34:57 -04:00
• c60e103d97 Update _switchmetacodes.html.erb Connor Turland 2016-09-26 20:28:06 -04:00
• 7150b9fcce Merge pull request #673 from metamaps/fix/eslint-updates Devin Howard 2016-09-26 18:18:31 +08:00
• bc8ce0fee4 topic view bug fix Devin Howard 2016-09-26 14:04:31 +08:00
• 12cb675bb5 switch to using the eslint-standard plugin again Devin Howard 2016-09-26 13:44:23 +08:00
• c9a79468f4 switch to eslint-3 Devin Howard 2016-09-26 13:40:02 +08:00
• ebaae084ae simple eslint fixes Devin Howard 2016-09-26 13:37:42 +08:00
• e646585a7a Merge pull request #672 from metamaps/feature/eslint-config Devin Howard 2016-09-26 10:50:30 +08:00
• 0e17ec11ec fix eslint config for code climate Devin Howard 2016-09-26 00:04:09 +08:00
• 5649798e4b Merge pull request #668 from metamaps/fix/hide-addTopic-message-on-double-click Devin Howard 2016-09-25 23:51:00 +08:00
• c20e503785 show/hide add a topic instructions more consistently Devin Howard 2016-09-25 22:27:11 +08:00
• 17870e7a4c Merge pull request #669 from metamaps/fix/remove-invalid-links Devin Howard 2016-09-25 23:47:30 +08:00
• b49cb7766a Merge pull request #652 from metamaps/feature/explore-controller Devin Howard 2016-09-25 23:47:23 +08:00
• fb563c6eed Merge pull request #648 from metamaps/feature/load-url-title-hack Devin Howard 2016-09-25 23:47:10 +08:00
• 03ba3a89f1 main controller renders by name Devin Howard 2016-09-25 23:37:08 +08:00
• 05495b0224 move explore views to their own folder Devin Howard 2016-09-25 23:35:35 +08:00
• 18d8929bf1 use .or to fix all sorts of @map.mappings bugs Devin Howard 2016-09-25 23:35:26 +08:00
• 50f98aebea explore controller spec Devin Howard 2016-09-24 14:35:23 +08:00
• dad048eb20 rubocop Devin Howard 2016-09-24 12:58:09 +08:00
• c76de5b1d5 refactor map model a bit and fix bugs Devin Howard 2016-09-24 12:54:14 +08:00
• 3f9077b380 clean up Devin Howard 2016-09-24 12:35:06 +08:00
• b722d2d3b0 fix map controller create spec Devin Howard 2016-09-23 18:20:06 +08:00
• 5e180ac10e set up explore controller routes and rename methods Devin Howard 2016-09-23 17:07:06 +08:00
• 686d80e274 move more logic into map model Devin Howard 2016-09-23 17:02:52 +08:00
• 7275beb163 put CRUD at top of maps controller, and alphabetize other actions below Devin Howard 2016-09-23 16:48:43 +08:00
• 40bd9ed95a refactor maps controller a bit Devin Howard 2016-09-23 16:41:15 +08:00
• 1ab8703008 move explore maps methods into their own controller Devin Howard 2016-09-23 16:41:08 +08:00
• eed5ff76ef add rate limiting headers Devin Howard 2016-09-25 23:21:51 +08:00
• 959aa693f3 ok, i guess this is ready Devin Howard 2016-09-25 23:06:09 +08:00
• 7f8110b6be configure rack attack to allow 5r/s for the load_url_title route Devin Howard 2016-09-25 23:00:07 +08:00
• ceb2699760 install rack-attack Devin Howard 2016-09-25 22:54:40 +08:00
• cc2e3b9358 hack to get the <title> tag when importing a url, without CORS issues Devin Howard 2016-09-23 14:29:28 +08:00
• 8c16c60554 show link remover for invalid links too Devin Howard 2016-09-25 22:44:07 +08:00
• cc986368be Merge pull request #667 from metamaps/feature/update-package.json Devin Howard 2016-09-25 22:25:31 +08:00
• dd78c0c379 Merge pull request #665 from metamaps/fix/topic-to-map-transition Devin Howard 2016-09-25 22:25:19 +08:00
• 0df17c4aa0 update deps in package.json Devin Howard 2016-09-25 21:53:40 +08:00
• 2ade375c20 babel-plugin-lodash to slim down bundle size by 300 KB Devin Howard 2016-09-25 21:53:26 +08:00
• 11d13445fb fix authorizeToEdit call Devin Howard 2016-09-25 20:14:45 +08:00
• 7734272737 hide circles when transitioning from topic view to map view Devin Howard 2016-09-25 20:10:18 +08:00
• 43fafb8e6f Merge pull request #663 from metamaps/fix/git-versioning Devin Howard 2016-09-25 19:48:48 +08:00
• 5819447828 fix git versioning Devin Howard 2016-09-25 18:49:16 +08:00
• 997a4b7329 Merge pull request #662 from metamaps/fix/no-add-topic-message-if-logged-out Devin Howard 2016-09-25 18:50:57 +08:00
• 35d6dbd0b4 hide double click to add topic message if can't edit map Devin Howard 2016-09-25 15:04:14 +08:00
• 7635498f14 add xls and xlsx parsing libs feature/import.export.more.parsers Devin Howard 2016-03-26 14:37:32 +08:00
• 1810faacbe Merge pull request #660 from metamaps/feature/csv Devin Howard 2016-09-25 14:27:48 +08:00
• 40f89b1c61 enable csv import using csv-parse module Devin Howard 2016-09-24 15:22:42 +08:00
• 82b7c7e5ac Merge pull request #659 from metamaps/feature/js-fiddling Devin Howard 2016-09-24 23:35:50 +08:00
• 0a0ff2fdab remove fetch api - we don't want no polyfills, and already have jQuery Devin Howard 2016-09-24 23:28:11 +08:00
• 045bd3fd73 Metamaps.Filter bug and use _.omit instead of util function Devin Howard 2016-09-24 23:23:12 +08:00
• 79aa7717ed exact versions in package.json Devin Howard 2016-09-24 14:53:32 +08:00
• 0bb7b1523d Metamaps.ReactComponents isn't needed anymore Devin Howard 2016-09-24 14:40:40 +08:00
• 03eacde753 Merge pull request #656 from metamaps/feature/tech-debt Devin Howard 2016-09-24 13:59:27 +08:00