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

• 95671010eb ugly american notification pagination Devin Howard 2016-12-11 17:29:48 -05:00
• 95860dfc55 handle nil mailers Devin Howard 2016-12-11 17:24:23 -05:00
• 4391be1aa0 temporarily use team@metamaps.cc instead of no-reply Devin Howard 2016-12-09 14:38:05 -05:00
• 37329734be fix bug with invitation to edit after access request is approved Devin Howard 2016-12-11 16:47:18 -05:00
• 2bb8458e07 fix stdout logging for heroku Devin Howard 2016-12-09 14:31:33 -05:00
• 487272584d stylesheet bug Devin Howard 2016-12-09 12:12:17 -05:00
• 8e74ec9a0b grant/deny buttons mark access request notifications as read Devin Howard 2016-12-09 12:04:17 -05:00
• 7aa19365a1 invite to edit notifications marked as read in system once map is visited Devin Howard 2016-12-09 11:59:24 -05:00
• 5eb6435543 fix bug with UserMap notifications Devin Howard 2016-12-09 11:55:53 -05:00
• 9865a1e063 fix invited to edit mailer's notified_object, and fix css/view for notifications#show Devin Howard 2016-12-08 16:48:50 -05:00
• f010bbe6c9 sexy multipart emails pulled from the mailers and re-rendered by mailboxer Devin Howard 2016-12-08 16:22:43 -05:00
• 93af2ec84e include unread count in tooltip Devin Howard 2016-12-08 14:39:41 -05:00
• 09a8e2ae67 reactify notification icon Robert Best 2016-12-04 20:02:24 +00:00
• 309534dcc1 brakeman ignore viw notifications/show line 7 Devin Howard 2016-11-29 13:01:53 -05:00
• 606bfedb91 ok, the mailboxer emails mostly work Devin Howard 2016-11-29 12:52:25 -05:00
• b0e723fe4b hide funky triangle above notifications dot Devin Howard 2016-11-29 11:15:14 -05:00
• 5e27e39f96 little style tweaks to css and content Connor Turland 2016-11-28 17:37:27 -05:00
• 41a2b9bf0f move notification icon to be visible outside the account menu Devin Howard 2016-11-28 13:36:30 -05:00
• 1fabfd832b link entire notification, except read-unread toggler Devin Howard 2016-11-28 13:06:08 -05:00
• 689a965f9d fix some rubocop issues and tweak some code Devin Howard 2016-11-28 12:54:33 -05:00
• 6415725ad6 body chunking??? Devin Howard 2016-11-25 17:21:34 -05:00
• c154716346 add mailboxer templates for overriding their style Devin Howard 2016-11-25 16:41:27 -05:00
• 8267054d89 fugly integration of map mailers into mailboxer Devin Howard 2016-11-25 15:57:12 -05:00
• 1d36ee03b2 send mailboxer notifications as emails if user doesn't have emails disabled Devin Howard 2016-11-25 15:05:07 -05:00
• 99060abbfc add unsubscribe link to emails Devin Howard 2016-11-25 14:58:22 -05:00
• 5698c3bad4 make unsubscribing work even if logged out Devin Howard 2016-11-25 14:34:09 -05:00
• 4629ebf8f9 configurable field to unsubscribe from emails + link to do it yourself Devin Howard 2016-11-25 13:22:23 -05:00
• 79634f8faf code climate fixes Devin Howard 2016-11-25 11:57:20 -05:00
• 4e93b4fce6 back to mapping link shared view Devin Howard 2016-11-25 11:47:29 -05:00
• 2b37f00960 add more styling to the notification pages Devin Howard 2016-11-25 11:39:10 -05:00
• 2db803e496 notifications bar Devin Howard 2016-11-24 17:31:58 -05:00
• 1e6d96fce2 notification dot for mobile Devin Howard 2016-11-24 16:48:44 -05:00
• 93ad92f7e8 bell icon Devin Howard 2016-11-24 16:43:26 -05:00
• 79a3059ca3 update css classes Devin Howard 2016-11-24 15:36:48 -05:00
• 11bbcb242f red dot if there are unread notifications Devin Howard 2016-11-24 15:33:37 -05:00
• dbcd64bfe9 styling on you Devin Howard 2016-11-24 11:43:50 -05:00
• 46c563afb2 start integrating notifications into account menu Devin Howard 2016-11-24 11:07:57 -05:00
• dcb70e86e2 ability to mark as read/unread Devin Howard 2016-11-16 23:50:47 -05:00
• 7dd37c50d3 notifications index/show Devin Howard 2016-11-16 23:04:30 -05:00
• aefab7bc0d notifications route Devin Howard 2016-11-16 22:43:28 -05:00
• 3c1d163984 install mailboxer gem to db + user model Devin Howard 2016-11-01 11:18:27 +08:00
• fe6a8e36f8 auto create synapses if the user drags and holds onto a second topic feature/overhaul-synapse-creation Devin Howard 2016-12-08 12:36:22 -05:00
• b98f9b4bbc left clicking the canvas cancels synapse creation, instead of creating a synapse Devin Howard 2016-12-11 17:07:25 -05:00
• 1ba339b3be subset of synapse creation changes (#970) Devin Howard 2016-12-11 17:15:09 -05:00
• e62ea38c9b close topic/synapse creation on right click Devin Howard 2016-12-08 12:49:44 -05:00
• f27f0ed2e8 hitting tab saves the synapse you're creating Devin Howard 2016-12-11 17:06:52 -05:00
• 677b045850 backspace and delete don't close synapse creation anymore Devin Howard 2016-12-11 17:05:04 -05:00
• 26bf7571c7 esc cancels topic and synapse creation now Devin Howard 2016-12-11 17:04:33 -05:00
• 6129a27ecf hit Ctrl+A a second time to select all synapses, too (#968) Devin Howard 2016-12-11 16:21:36 -05:00
• b20e310cd5 hit Ctrl+A a second time to select all synapses, too Devin Howard 2016-12-09 16:08:23 -05:00
• d51e3f3b52 update npm deps, EXCEPT socket.io and backbone (#950) Devin Howard 2016-12-11 16:09:12 -05:00
• f8112b181f Merge 4794418d74 into 1317186f63 Connor Turland 2016-12-09 19:21:13 +00:00
• 1317186f63 Update ISSUE_TEMPLATE.md Robert Best 2016-12-09 13:40:58 -05:00
• d6527ea80e Create ISSUE_TEMPLATE.md Robert Best 2016-12-09 12:20:30 -05:00
• a6689ca069 non-working streaming, but it has the methods and the iterable. feature/export.streaming Devin Howard 2016-03-26 15:26:49 +08:00
• 67ca2262b1 update autolinker, remove underscore Devin Howard 2016-12-08 11:02:26 -05:00
• 9a05014552 update npm dependencies (with some exceptions) Devin Howard 2016-12-08 10:39:49 -05:00
• a133702be2 Some topics and synapses were hidden from users erroneously (#944) Connor Turland 2016-12-06 16:46:46 -05:00
• d2074ada79 fix policy scope errors in search controller (#947) Devin Howard 2016-12-06 13:09:42 -05:00
• 2cdabf5e78 fix policy scope errors in search controller Devin Howard 2016-12-06 13:07:00 -05:00
• 00286fcc29 tag v3.0.4 v3.0.4 Devin Howard 2016-12-06 12:37:17 -05:00
• 01cd624bfa add polyfill so chrome 49 can upload map thumbnail screenshots (#946) Devin Howard 2016-12-06 12:36:06 -05:00
• b3866a516b add polyfill so chrome 49 can upload map thumbnail screenshots Devin Howard 2016-12-05 14:22:30 -05:00
• f8a3d3e968 rubocop topic.rb Devin Howard 2016-12-02 18:03:38 -05:00
• ca7166c6bc change *_count methods to use delegate to save lines in map.rb model Devin Howard 2016-12-02 17:31:22 -05:00
• 8a3b4983d4 remove unused mk_permission functions Devin Howard 2016-12-02 17:27:08 -05:00
• e0d7f2b133 try enabling count threshold on rubocop Devin Howard 2016-12-02 17:20:14 -05:00
• b09a98184c update permission of topics and synapses as map perm changes, when defer_to_map Connor Turland 2016-12-02 21:12:40 +00:00
• 3c67f68d3b ensure topics and synapses have their permission match the map they're deferring to Connor Turland 2016-12-01 23:03:34 +00:00
• a5f793fe54 fixup topic card template Connor Turland 2016-12-02 21:21:37 +00:00
• 7abd566261 use 27 instead of 25 feature/thinner-topic-titles Devin Howard 2016-11-30 11:43:07 -05:00
• d1aa62d382 fix policy scope error (#941) Devin Howard 2016-11-30 11:46:09 -05:00
• 3e6d1844a6 fix policy scope error Devin Howard 2016-11-30 11:41:30 -05:00
• 0e6e90759c Made the filter box, and carousel close based on clicking or draging the canvas Robert Best 2016-10-26 18:14:11 +00:00
• 3f161c1076 make topic titles have width of 25 chars (#933) Devin Howard 2016-11-29 11:00:14 -05:00
• fdd9a0319a make topic titles have width of 25 chars Devin Howard 2016-11-26 20:18:26 -05:00
• 4da3a9d55f hide mobile menu if browser is resized to full size (#937) Devin Howard 2016-11-28 13:53:29 -05:00
• 8f305d7186 hide mobile menu if browser is resized to full size Devin Howard 2016-11-28 13:41:21 -05:00
• 90c5bc26fc Active.Mapper was being initialized twice, causing errors (#934) Devin Howard 2016-11-27 21:12:05 -05:00
• b407a52ed2 Active.Mapper was being initialized twice, causing errors Devin Howard 2016-11-26 23:28:46 -05:00
• 5d8ff3efce realtime shouldn't poll forever if the dev server isn't up (#931) Devin Howard 2016-11-24 14:40:14 -05:00
• 4794418d74 condense to one line Connor Turland 2016-11-24 14:24:46 -05:00
• acb3775f28 begin homepage dev Connor Turland 2016-11-06 01:12:00 +00:00
• 95b8b52224 fix NoMethodError in topics#autocomplete_topic (#930) Devin Howard 2016-11-24 14:16:58 -05:00
• 1c6aedbdb9 realtime shouldn't poll forever if the dev server isn't up Devin Howard 2016-11-24 11:44:07 -05:00
• e0f133ec84 fix NoMethodError in topics#autocomplete_topic Devin Howard 2016-11-15 21:26:53 -05:00
• 55853c60f4 update user model with fixes, including style and recentMetacodes algorithm (#922) Devin Howard 2016-11-13 14:29:07 -08:00
• bc3af234ba update user model with fixes, including style and recentMetacodes algorithm Devin Howard 2016-11-07 14:53:18 -05:00
• 5b90c38b22 Merge pull request #902 from metamaps/fix/schema Devin Howard 2016-11-13 14:24:31 -08:00
• c03d6dd5f6 remove in_trash from schema to match production Devin Howard 2016-11-13 17:21:42 -05:00
• 51d5d77629 Merge pull request #929 from metamaps/fix/develop-bugs Devin Howard 2016-11-09 21:14:48 -05:00
• ce2d462578 fix bugs on develop branch Devin Howard 2016-11-08 15:51:39 -05:00
• 4533a0f2fe merge changes from metamapscc instance branch (#913) Devin Howard 2016-11-09 09:34:10 -05:00
• 5851d57eef Merge branch 'master' into develop Devin Howard 2016-11-09 09:29:30 -05:00
• 4c6f2cfe31 eslint Devin Howard 2016-11-05 11:10:42 -04:00
• 879400b3f2 remove video file since it's on metamaps.cc server Devin Howard 2016-11-05 11:03:42 -04:00
• d1cd89888e remove blog from public/ html pages Devin Howard 2016-10-31 20:07:13 +08:00
• 3f0359f552 public/50x.html Metamaps on Linode 2016-03-30 22:19:57 -04:00
• 5089485da4 homepage video fallback Metamaps on Linode 2016-03-30 22:19:29 -04:00
• d28bd1b62d show private, shared maps in All Maps Devin Howard 2016-11-08 15:11:24 -05:00